timw4mail/Tyro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better PHP Support for other embedded languages

Browse Source
This commit is contained in:
Tim Warren 2015-04-28 16:59:19 -04:00
parent 4d81c04151
commit 251fa33282
3 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
config/languages.json
View File

File diff suppressed because one or more lines are too long

4
src/widgets/EditPane.cpp
View File

@ -28,7 +28,7 @@ EditPane::EditPane(
lexerMap["lua"] = wxSTC_LEX_LUA;
lexerMap["makefile"] = wxSTC_LEX_MAKEFILE;
lexerMap["markdown"] = wxSTC_LEX_MARKDOWN;
lexerMap["php"] = wxSTC_LEX_PHPSCRIPT;
lexerMap["php"] = wxSTC_LEX_HTML;
lexerMap["perl"] = wxSTC_LEX_PERL;
lexerMap["python"] = wxSTC_LEX_PYTHON;
lexerMap["ruby"] = wxSTC_LEX_RUBY;
@ -151,7 +151,7 @@ void EditPane::ApplyTheme(string lang, string theme)
wxLogDebug(output.str().c_str());
}
int offset_count = (lang == "php") ? 103 : 0;
int offset_count = 0;
// Do the appropriate mappings to load the selected theme
this->_ApplyTheme(lexer_map, offset_count);

25
src/widgets/MainFrame.cpp
View File

@ -122,11 +122,11 @@ void MainFrame::SetupMenu()
this->mbar = new wxMenuBar();
// Create Base menus
fileMenu = new wxMenu("");
editMenu = new wxMenu("");
viewMenu = new wxMenu("");
langMenu = new wxMenu("");
helpMenu = new wxMenu("");
fileMenu = new wxMenu();
editMenu = new wxMenu();
viewMenu = new wxMenu();
langMenu = new wxMenu();
helpMenu = new wxMenu();
// Add items to top-level menus
fileMenu->Append(wxID_NEW, "&New\tCtrl+N", "Create a new file");
@ -158,21 +158,6 @@ void MainFrame::SetupMenu()
helpMenu->Append(wxID_ABOUT, "&About...\tF1", "Show info about this application");
// Setup Menu Images
#ifndef __WXMAC__
fileMenu->FindChildItem(wxID_NEW)->SetBitmap(wxArtProvider::GetBitmap(wxART_NEW, wxART_MENU));
fileMenu->FindChildItem(wxID_OPEN)->SetBitmap(wxArtProvider::GetBitmap(wxART_FILE_OPEN, wxART_MENU));
fileMenu->FindChildItem(wxID_SAVE)->SetBitmap(wxArtProvider::GetBitmap(wxART_FILE_SAVE, wxART_MENU));
fileMenu->FindChildItem(wxID_SAVEAS)->SetBitmap(wxArtProvider::GetBitmap(wxART_FILE_SAVE_AS, wxART_MENU));
fileMenu->FindChildItem(wxID_EXIT)->SetBitmap(wxArtProvider::GetBitmap(wxART_QUIT, wxART_MENU));
editMenu->FindChildItem(wxID_UNDO)->SetBitmap(wxArtProvider::GetBitmap(wxART_UNDO, wxART_MENU));
editMenu->FindChildItem(wxID_REDO)->SetBitmap(wxArtProvider::GetBitmap(wxART_REDO, wxART_MENU));
editMenu->FindChildItem(wxID_CUT)->SetBitmap(wxArtProvider::GetBitmap(wxART_CUT, wxART_MENU));
editMenu->FindChildItem(wxID_COPY)->SetBitmap(wxArtProvider::GetBitmap(wxART_COPY, wxART_MENU));
editMenu->FindChildItem(wxID_PASTE)->SetBitmap(wxArtProvider::GetBitmap(wxART_PASTE, wxART_MENU));
#endif
// Add the menus to the menubar
this->mbar->Append(fileMenu, "&File");
this->mbar->Append(editMenu, "&Edit");