From: <tb...@us...> - 2011-12-29 17:11:02
|
Revision: 19 http://wxdevide.svn.sourceforge.net/wxdevide/?rev=19&view=rev Author: tbreina Date: 2011-12-29 17:10:50 +0000 (Thu, 29 Dec 2011) Log Message: ----------- Changes for building under wxWidgets 2.9. Modified Paths: -------------- trunk/wxdevide/source/DevCfg.cpp trunk/wxdevide/source/DevCpp.dev trunk/wxdevide/source/DevCpp.layout trunk/wxdevide/source/MainFrm.cpp trunk/wxdevide/source/MainFrm.h trunk/wxdevide/source/MainFrm.wxform trunk/wxdevide/source/Makefile.win trunk/wxdevide/source/NewProjectFrm.cpp trunk/wxdevide/source/SplashFrm.wxform trunk/wxdevide/source/ToolEditForm.cpp trunk/wxdevide/source/ToolEditFrm.cpp trunk/wxdevide/source/ToolFrm.cpp trunk/wxdevide/source/Utils.cpp trunk/wxdevide/source/Version.h trunk/wxdevide/source/devcfg.h Modified: trunk/wxdevide/source/DevCfg.cpp =================================================================== --- trunk/wxdevide/source/DevCfg.cpp 2011-12-11 03:29:29 UTC (rev 18) +++ trunk/wxdevide/source/DevCfg.cpp 2011-12-29 17:10:50 UTC (rev 19) @@ -162,11 +162,8 @@ BadDirs = BadDirs.AfterFirst(';'); wxSetWorkingDirectory(currdir); -#ifndef WXW29 - if(badDirs) -#else + if(badDirs.IsEmpty()) -#endif { badDirs.Empty(); badDirs.Append(BadDirs); @@ -1830,60 +1827,49 @@ if(!tempStr.IsEmpty()) //Temp string does not equal '' { msg += wxT("Following Bin directories don't exist:\n"); -#ifndef WXW29 - msg += tempStr.Replace(wxString(wxT(";")).c_str(),wxString(wxT("\r\n")).c_str()); -#else + tempStr.Replace( wxT(";"), wxT("\r\n")); msg += tempStr; -#endif msg += wxT("\r\n\r\n"); } goodCDir = ValidatePaths(fCDir, tempStr); if(!tempStr.IsEmpty()) { msg += wxT("Following C Include directories don't exist:\r\n"); -#ifndef WXW29 - msg += tempStr.Replace(wxString(wxT(";")).c_str(),wxString(wxT("\r\n")).c_str()); -#else + tempStr.Replace( wxT(";"), wxT("\r\n")); msg += tempStr; -#endif + msg += wxT("\r\n\r\n"); } goodCppDir = ValidatePaths(fCppDir, tempStr); if(!tempStr.IsEmpty()) { msg += wxT("Following C++ Include directories don''t exist:\r\n"); -#ifndef WXW29 - msg += tempStr.Replace(wxString(wxT(";")).c_str(),wxString(wxT("\r\n")).c_str()); -#else + tempStr.Replace( wxT(";"), wxT("\r\n")); msg += tempStr; -#endif + msg += wxT("\r\n\r\n"); } goodLibDir = ValidatePaths(fLibDir, tempStr); if(!tempStr.IsEmpty()) { msg += wxT("Following Libs directories don''t exist:\r\n"); -#ifndef WXW29 - msg += tempStr.Replace(wxString(wxT(";")).c_str(),wxString(wxT("\r\n")).c_str()); -#else + tempStr.Replace( wxT(";"), wxT("\r\n")); msg += tempStr; -#endif + msg += wxT("\r\n\r\n"); } goodRCDir = ValidatePaths(fRCDir, tempStr); if(!tempStr.IsEmpty()) { msg += wxT("Following resource compiler directories don''t exist:\r\n"); -#ifndef WXW29 - msg += tempStr.Replace(wxString(wxT(";")).c_str(),wxString(wxT("\r\n")).c_str()); -#else + tempStr.Replace( wxT(";"), wxT("\r\n")); msg += tempStr; -#endif + msg += wxT("\r\n\r\n"); } if(!msg.IsEmpty()) Modified: trunk/wxdevide/source/DevCpp.dev =================================================================== --- trunk/wxdevide/source/DevCpp.dev 2011-12-11 03:29:29 UTC (rev 18) +++ trunk/wxdevide/source/DevCpp.dev 2011-12-29 17:10:50 UTC (rev 19) @@ -1,6 +1,6 @@ [Project] FileName=DevCpp.dev -Name=DevCpp +Name=wxDevIDE UnitCount=99 PchHead=-1 PchSource=-1 @@ -39,8 +39,8 @@ MakeIncludes= Compiler= CppCompiler= -Linker=-mwindows_@@_-l$(WXLIBNAME)_stc_@@_-l$(WXLIBNAME)_@@_-l$(WXLIBNAME)_gl_@@_-lwxtiff_@@_-lwxjpeg_@@_-lwxpng_@@_-lwxzlib_@@_-lwxregexu_@@_-lwxexpat_@@_-lkernel32_@@_-luser32_@@_-lgdi32_@@_-lcomdlg32_@@_-lwinspool_@@_-lwinmm_@@_-lshell32_@@_-lcomctl32_@@_-lole32_@@_-loleaut32_@@_-luuid_@@_-lrpcrt4_@@_-ladvapi32_@@_-lwsock32_@@_-lodbc32_@@_-lopengl32_@@_ -PreprocDefines=__WXMSW___@@___GNUWIN32___@@__UNICODE_@@_ +Linker=-mwindows_@@_-l$(WXLIBNAME)_stc_@@_-l$(WXLIBNAME)_@@_-l$(WXLIBNAME)_gl_@@_-lwxscintilla_@@_-lwxtiff_@@_-lwxjpeg_@@_-lwxpng_@@_-lwxzlib_@@_-lwxregexu_@@_-lwxexpat_@@_-lkernel32_@@_-luser32_@@_-lgdi32_@@_-lcomdlg32_@@_-lwinspool_@@_-lwinmm_@@_-lshell32_@@_-lcomctl32_@@_-lole32_@@_-loleaut32_@@_-luuid_@@_-lrpcrt4_@@_-ladvapi32_@@_-lwsock32_@@_-lodbc32_@@_-lopengl32_@@_ +PreprocDefines=__WXMSW___@@___GNUWIN32___@@__UNICODE_@@_wxNO_RTTI_@@__@@_ CompilerSettings=0000000001001000000000 Icon= ExeOutput=Output\MingW Modified: trunk/wxdevide/source/DevCpp.layout =================================================================== --- trunk/wxdevide/source/DevCpp.layout 2011-12-11 03:29:29 UTC (rev 18) +++ trunk/wxdevide/source/DevCpp.layout 2011-12-29 17:10:50 UTC (rev 19) @@ -20,8 +20,8 @@ Open=0 Top=0 [Editors] -Focused=90 -Order=61,59,60,68,73,75,76,77,79,78,88,89,87,85,84,90,5,96,97,98,11,92,22,21,-1,18 +Focused=64 +Order=61,60,59,11,21,20,84,86,87,90,64 [Editor_3] Open=0 Top=0 @@ -37,7 +37,7 @@ TopLine=1 LeftChar=1 [Editor_5] -Open=1 +Open=0 Top=0 CursorCol=6 CursorRow=38 @@ -81,9 +81,9 @@ [Editor_11] Open=1 Top=0 -CursorCol=19 -CursorRow=1857 -TopLine=1848 +CursorCol=1 +CursorRow=13 +TopLine=7 LeftChar=1 [Editor_12] Open=0 @@ -128,7 +128,7 @@ TopLine=74 LeftChar=1 [Editor_18] -Open=1 +Open=0 Top=0 CursorCol=17 CursorRow=17 @@ -142,21 +142,21 @@ TopLine=4 LeftChar=1 [Editor_20] -Open=0 +Open=1 Top=0 -CursorCol=7 -CursorRow=70 -TopLine=55 +CursorCol=1 +CursorRow=1872 +TopLine=2331 LeftChar=1 [Editor_21] Open=1 Top=0 -CursorCol=1 -CursorRow=49 -TopLine=394 +CursorCol=23 +CursorRow=29 +TopLine=19 LeftChar=1 [Editor_22] -Open=1 +Open=0 Top=0 CursorCol=1 CursorRow=25 @@ -417,16 +417,16 @@ [Editor_59] Open=1 Top=0 -CursorCol=1 -CursorRow=5608 -TopLine=5596 +CursorCol=23 +CursorRow=6247 +TopLine=6231 LeftChar=1 [Editor_60] Open=1 Top=0 -CursorCol=2 -CursorRow=54 -TopLine=46 +CursorCol=23 +CursorRow=35 +TopLine=25 LeftChar=1 [Editor_61] Open=1 @@ -450,11 +450,11 @@ TopLine=46 LeftChar=1 [Editor_64] -Open=0 -Top=0 -CursorCol=1 -CursorRow=1 -TopLine=1 +Open=1 +Top=1 +CursorCol=39 +CursorRow=247 +TopLine=229 LeftChar=1 [Editor_65] Open=0 @@ -478,10 +478,10 @@ TopLine=1 LeftChar=1 [Editor_68] -Open=1 +Open=0 Top=0 -CursorCol=2 -CursorRow=93 +CursorCol=7 +CursorRow=85 TopLine=79 LeftChar=1 [Editor_69] @@ -513,10 +513,10 @@ TopLine=1 LeftChar=1 [Editor_73] -Open=1 +Open=0 Top=0 -CursorCol=7 -CursorRow=1832 +CursorCol=2 +CursorRow=1827 TopLine=1825 LeftChar=1 [Editor_74] @@ -527,35 +527,35 @@ TopLine=86 LeftChar=1 [Editor_75] -Open=1 +Open=0 Top=0 CursorCol=1 -CursorRow=10 +CursorRow=9 TopLine=1 LeftChar=1 [Editor_76] -Open=1 +Open=0 Top=0 CursorCol=32 CursorRow=72 TopLine=57 LeftChar=1 [Editor_77] -Open=1 +Open=0 Top=0 CursorCol=1 CursorRow=55 TopLine=72 LeftChar=1 [Editor_78] -Open=1 +Open=0 Top=0 CursorCol=1 -CursorRow=1 -TopLine=1 +CursorRow=12 +TopLine=56 LeftChar=1 [Editor_79] -Open=1 +Open=0 Top=0 CursorCol=1 CursorRow=1 @@ -592,40 +592,40 @@ [Editor_84] Open=1 Top=0 -CursorCol=23 -CursorRow=15 -TopLine=12 +CursorCol=1 +CursorRow=58 +TopLine=34 LeftChar=1 [Editor_85] -Open=1 +Open=0 Top=0 CursorCol=1 CursorRow=1 TopLine=1 LeftChar=1 [Editor_86] -Open=0 +Open=1 Top=0 -CursorCol=18 -CursorRow=9 -TopLine=87 +CursorCol=1 +CursorRow=79 +TopLine=68 LeftChar=1 [Editor_87] Open=1 Top=0 -CursorCol=2 -CursorRow=422 -TopLine=403 +CursorCol=21 +CursorRow=450 +TopLine=433 LeftChar=1 [Editor_88] -Open=1 +Open=0 Top=0 CursorCol=1 CursorRow=1 TopLine=1 LeftChar=1 [Editor_89] -Open=1 +Open=0 Top=0 CursorCol=1 CursorRow=1 @@ -633,10 +633,10 @@ LeftChar=1 [Editor_90] Open=1 -Top=1 -CursorCol=5 -CursorRow=571 -TopLine=562 +Top=0 +CursorCol=47 +CursorRow=1486 +TopLine=1470 LeftChar=1 [Editor_91] Open=0 @@ -646,11 +646,11 @@ TopLine=1 LeftChar=1 [Editor_92] -Open=1 +Open=0 Top=0 -CursorCol=20 -CursorRow=38 -TopLine=28 +CursorCol=1 +CursorRow=41 +TopLine=32 LeftChar=1 [Editor_93] Open=0 @@ -666,21 +666,21 @@ Open=0 Top=0 [Editor_96] -Open=1 +Open=0 Top=0 CursorCol=1 CursorRow=1 TopLine=1 LeftChar=1 [Editor_97] -Open=1 +Open=0 Top=0 CursorCol=1 CursorRow=1 TopLine=1 LeftChar=1 [Editor_98] -Open=1 +Open=0 Top=0 CursorCol=1 CursorRow=1 Modified: trunk/wxdevide/source/MainFrm.cpp =================================================================== --- trunk/wxdevide/source/MainFrm.cpp 2011-12-11 03:29:29 UTC (rev 18) +++ trunk/wxdevide/source/MainFrm.cpp 2011-12-29 17:10:50 UTC (rev 19) @@ -13,7 +13,7 @@ //Header Include Start and Header Include End //wxDev-C++ desig1ner will remove them ////Header Include Start -#include "Images/Self_MainFrm_XPM.xpm" +#include "Images/MainFrm_frmNewForm_XPM.xpm" #include "Images/MainFrm_BtnDebugStepInto_XPM.xpm" #include "Images/MainFrm_BtnDebugStepOver_XPM.xpm" #include "Images/MainFrm_BtnDebugRestart_XPM.xpm" @@ -83,6 +83,36 @@ EVT_CLOSE(MainFrm::OnClose) EVT_ACTIVATE(MainFrm::MainFrmActivate) + EVT_MENU(wxID_UNDO , MainFrm::ActionUndoExecute) + EVT_UPDATE_UI(wxID_UNDO , MainFrm::ActionUndoUpdate) + EVT_MENU(wxID_REDO , MainFrm::ActionRedoExecute) + EVT_UPDATE_UI(wxID_REDO , MainFrm::ActionRedoUpdate) + EVT_MENU(wxID_CUT , MainFrm::ActionCutExecute) + EVT_UPDATE_UI(wxID_CUT , MainFrm::ActionCutUpdate) + EVT_MENU(wxID_COPY , MainFrm::ActionCopyExecute) + EVT_UPDATE_UI(wxID_COPY , MainFrm::ActionCopyUpdate) + EVT_MENU(wxID_PASTE , MainFrm::ActionPasteExecute) + EVT_UPDATE_UI(wxID_PASTE , MainFrm::ActionPasteUpdate) + EVT_MENU(wxID_SELECTALL , MainFrm::ActionSelectAllExecute) + EVT_MENU(wxID_DELETE , MainFrm::ActionDeleteExecute) + EVT_MENU(ID_MNU_SWAPHEADER_SOURCE_1105 , MainFrm::ActionSwapHeaderSourceExecute) + EVT_UPDATE_UI(ID_MNU_SWAPHEADER_SOURCE_1105 , MainFrm::ActionSwapHeaderSourceUpdate) + EVT_MENU(INT_TRY_CATCH , MainFrm::SurroundWithClick) + EVT_MENU(INT_TRY_FINALLY , MainFrm::SurroundWithClick) + EVT_MENU(INT_TRY_CATCH_FINALLY , MainFrm::SurroundWithClick) + EVT_MENU(INT_FOR , MainFrm::SurroundWithClick) + EVT_MENU(INT_FOR_I , MainFrm::SurroundWithClick) + EVT_MENU(INT_WHILE , MainFrm::SurroundWithClick) + EVT_MENU(INT_DO_WHILE , MainFrm::SurroundWithClick) + EVT_MENU(INT_IF , MainFrm::SurroundWithClick) + EVT_MENU(INT_IF_ELSE , MainFrm::SurroundWithClick) + EVT_MENU(INT_SWITCH , MainFrm::SurroundWithClick) + EVT_MENU(INT_BRACES , MainFrm::SurroundWithClick) + EVT_MENU(INT_C_COMMENT , MainFrm::SurroundWithClick) + EVT_MENU(INT_CPP_COMMENT , MainFrm::SurroundWithClick) + EVT_MENU(ID_MNU_TOGGLEBREAKPOINT_1145 , MainFrm::ActionBreakPointExecute) + EVT_MENU(ID_MNU_ADDTO_DOITEM____TSHIFT_CTRL_T_1149 , MainFrm::ActionAddToDoExecute) + EVT_MENU(wxID_PROPERTIES , MainFrm::ActionFilePropertiesExecute) EVT_MENU(ID_MNU_SOURCEFILE_1410, MainFrm::ActionNewSourceExecute) EVT_MENU(ID_MNU_PROJECT_1412, MainFrm::ActionNewProjectExecute) EVT_MENU(ID_MNU_RESOURCE_1414, MainFrm::ActionNewResExecute) @@ -166,36 +196,6 @@ EVT_MENU(ID_MNU_HELPONWXDEV_C___1168 , MainFrm::ActionShowMainHelpFile) EVT_MENU(ID_MNU_ADDFILE____1231 , MainFrm::ActionProjectAddExecute) EVT_MENU(ID_MNU_PROPERTIES_1443 , MainFrm::ActionFilePropertiesExecute) - EVT_MENU(wxID_UNDO , MainFrm::ActionUndoExecute) - EVT_UPDATE_UI(wxID_UNDO , MainFrm::ActionUndoUpdate) - EVT_MENU(wxID_REDO , MainFrm::ActionRedoExecute) - EVT_UPDATE_UI(wxID_REDO , MainFrm::ActionRedoUpdate) - EVT_MENU(wxID_CUT , MainFrm::ActionCutExecute) - EVT_UPDATE_UI(wxID_CUT , MainFrm::ActionCutUpdate) - EVT_MENU(wxID_COPY , MainFrm::ActionCopyExecute) - EVT_UPDATE_UI(wxID_COPY , MainFrm::ActionCopyUpdate) - EVT_MENU(wxID_PASTE , MainFrm::ActionPasteExecute) - EVT_UPDATE_UI(wxID_PASTE , MainFrm::ActionPasteUpdate) - EVT_MENU(wxID_SELECTALL , MainFrm::ActionSelectAllExecute) - EVT_MENU(wxID_DELETE , MainFrm::ActionDeleteExecute) - EVT_MENU(ID_MNU_SWAPHEADER_SOURCE_1105 , MainFrm::ActionSwapHeaderSourceExecute) - EVT_UPDATE_UI(ID_MNU_SWAPHEADER_SOURCE_1105 , MainFrm::ActionSwapHeaderSourceUpdate) - EVT_MENU(INT_TRY_CATCH , MainFrm::SurroundWithClick) - EVT_MENU(INT_TRY_FINALLY , MainFrm::SurroundWithClick) - EVT_MENU(INT_TRY_CATCH_FINALLY , MainFrm::SurroundWithClick) - EVT_MENU(INT_FOR , MainFrm::SurroundWithClick) - EVT_MENU(INT_FOR_I , MainFrm::SurroundWithClick) - EVT_MENU(INT_WHILE , MainFrm::SurroundWithClick) - EVT_MENU(INT_DO_WHILE , MainFrm::SurroundWithClick) - EVT_MENU(INT_IF , MainFrm::SurroundWithClick) - EVT_MENU(INT_IF_ELSE , MainFrm::SurroundWithClick) - EVT_MENU(INT_SWITCH , MainFrm::SurroundWithClick) - EVT_MENU(INT_BRACES , MainFrm::SurroundWithClick) - EVT_MENU(INT_C_COMMENT , MainFrm::SurroundWithClick) - EVT_MENU(INT_CPP_COMMENT , MainFrm::SurroundWithClick) - EVT_MENU(ID_MNU_TOGGLEBREAKPOINT_1145 , MainFrm::ActionBreakPointExecute) - EVT_MENU(ID_MNU_ADDTO_DOITEM____TSHIFT_CTRL_T_1149 , MainFrm::ActionAddToDoExecute) - EVT_MENU(wxID_PROPERTIES , MainFrm::ActionFilePropertiesExecute) EVT_MENU(ID_BTNGOTOLINE,MainFrm::ActionGotoExecute) EVT_MENU(wxID_REDO,MainFrm::ActionRedoExecute) EVT_UPDATE_UI(wxID_REDO,MainFrm::ActionRedoUpdate) @@ -501,131 +501,14 @@ StbStatusBar_Widths[3] = -1; StbStatusBar->SetStatusWidths(4,StbStatusBar_Widths); - MnuMessagePopup = new wxMenu(wxT(""));MnuMessagePopup->Append(ID_MNU_COPY_1253, wxT("&Copy"), wxT(""), wxITEM_NORMAL); - MnuMessagePopup->Append(ID_MNU_CLEAR_1254, wxT("C&lear"), wxT(""), wxITEM_NORMAL); - - /* Main popup menu for the editor + /* Debug popup menu */ - MnuEditorPopup = new wxMenu(wxT(""));MnuEditorPopup->Append(ID_MNU_CLOSE_1092, wxT("C&lose\tCtrl+F4"), wxT("Close current page"), wxITEM_NORMAL); - MnuEditorPopup->Append(ID_MNU_CLOSEALL_1093, wxT("Close All"), wxT("Close all pages"), wxITEM_NORMAL); - MnuEditorPopup->Append(ID_MNU_CLOSEALLEXCEPTTHIS_1094, wxT("Close all except this"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->AppendSeparator(); - MnuEditorPopup->Append(wxID_UNDO, wxT("&Undo\tCtrl+Z"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->Append(wxID_REDO, wxT("&Redo\tShift+Ctrl+Z"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->AppendSeparator(); - MnuEditorPopup->Append(wxID_CUT, wxT("C&ut\tCtrl+X"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->Append(wxID_COPY, wxT("&Copy\tCtrl+C"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->Append(wxID_PASTE, wxT("&Paste\tCtrl+V"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->Append(wxID_SELECTALL, wxT("&Select All\tCtrl+A"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->Append(wxID_DELETE, wxT("Delete"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->AppendSeparator(); - MnuEditorPopup->Append(ID_MNU_SWAPHEADER_SOURCE_1105, wxT("Swap header/source"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->AppendSeparator(); - wxMenu *ID_MNU_INSERT_1107_Obj = new wxMenu(); - ID_MNU_INSERT_1107_Obj->Append(ID_MNU_COMMENTHEADER_1108, wxT("Comment header"), wxT(""), wxITEM_NORMAL); - ID_MNU_INSERT_1107_Obj->Append(ID_MNU_DATEANDTIME_1109, wxT("Date and time"), wxT(""), wxITEM_NORMAL); - ID_MNU_INSERT_1107_Obj->AppendSeparator(); - ID_MNU_INSERT_1107_Obj->Append(ID_MNU_MAINFUNCTION_1111, wxT("Main function"), wxT(""), wxITEM_NORMAL); - ID_MNU_INSERT_1107_Obj->Append(ID_MNU_WINMAINFUNCTION_1112, wxT("WinMain function"), wxT(""), wxITEM_NORMAL); - ID_MNU_INSERT_1107_Obj->AppendSeparator(); - ID_MNU_INSERT_1107_Obj->Append(ID_MNU__IFDEF_1114, wxT("#ifdef"), wxT(""), wxITEM_NORMAL); - ID_MNU_INSERT_1107_Obj->Append(ID_MNU__IFNDEF_1115, wxT("#ifndef"), wxT(""), wxITEM_NORMAL); - ID_MNU_INSERT_1107_Obj->Append(ID_MNU__INCLUDE_1116, wxT("#include"), wxT(""), wxITEM_NORMAL); - ID_MNU_INSERT_1107_Obj->AppendSeparator(); - ID_MNU_INSERT_1107_Obj->Append(ID_MNU_IF___1118, wxT("if()"), wxT(""), wxITEM_NORMAL); - ID_MNU_INSERT_1107_Obj->Append(ID_MNU_WHILE___1119, wxT("while()"), wxT(""), wxITEM_NORMAL); - ID_MNU_INSERT_1107_Obj->Append(ID_MNU_DO___WHILE___1120, wxT("do...while()"), wxT(""), wxITEM_NORMAL); - ID_MNU_INSERT_1107_Obj->Append(ID_MNU_FOR___1121, wxT("for()"), wxT(""), wxITEM_NORMAL); - ID_MNU_INSERT_1107_Obj->AppendSeparator(); - ID_MNU_INSERT_1107_Obj->Append(ID_MNU_MESSAGEBOX_1123, wxT("MessageBox"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->Append(ID_MNU_INSERT_1107, wxT("&Insert"), ID_MNU_INSERT_1107_Obj); - wxMenu *ID_MNU_SURROUNDWITH_1124_Obj = new wxMenu(); - ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_TRY_CATCH, wxT("try...catch"), wxT(""), wxITEM_NORMAL); - ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_TRY_FINALLY, wxT("t&ry...finally"), wxT(""), wxITEM_NORMAL); - ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_TRY_CATCH_FINALLY, wxT("tr&y...catch...finally"), wxT(""), wxITEM_NORMAL); - ID_MNU_SURROUNDWITH_1124_Obj->AppendSeparator(); - ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_FOR, wxT("for"), wxT(""), wxITEM_NORMAL); - ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_FOR_I, wxT("for(int i..."), wxT(""), wxITEM_NORMAL); - ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_WHILE, wxT("while"), wxT(""), wxITEM_NORMAL); - ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_DO_WHILE, wxT("do...while"), wxT(""), wxITEM_NORMAL); - ID_MNU_SURROUNDWITH_1124_Obj->AppendSeparator(); - ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_IF, wxT("if"), wxT(""), wxITEM_NORMAL); - ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_IF_ELSE, wxT("if...else"), wxT(""), wxITEM_NORMAL); - ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_SWITCH, wxT("switch"), wxT(""), wxITEM_NORMAL); - ID_MNU_SURROUNDWITH_1124_Obj->AppendSeparator(); - ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_BRACES, wxT("{...}"), wxT(""), wxITEM_NORMAL); - ID_MNU_SURROUNDWITH_1124_Obj->AppendSeparator(); - ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_C_COMMENT, wxT("C Style Comment"), wxT(""), wxITEM_NORMAL); - ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_CPP_COMMENT, wxT("C++ Style Comment"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->Append(ID_MNU_SURROUNDWITH_1124, wxT("Surround with"), ID_MNU_SURROUNDWITH_1124_Obj); - MnuEditorPopup->AppendSeparator(); - MnuEditorPopup->Append(ID_MNU_TOGGLEBOOKMARKS_1141, wxT("&Toggle bookmarks"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->Append(ID_MNU_GOTOBOOKMARKS_1142, wxT("&Goto bookmarks"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->AppendSeparator(); - MnuEditorPopup->Append(ID_MNU_TOGGLEBREAKPOINT_1145, wxT("Toggle Breakpoint"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->Append(ID_MNU_ADDWATCH_1146, wxT("&Add Watch"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->Append(ID_MNU_RUNTOCURSOR_1147, wxT("&Run to cursor"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->AppendSeparator(); - MnuEditorPopup->Append(ID_MNU_ADDTO_DOITEM____TSHIFT_CTRL_T_1149, wxT("Add To-Do Item...\tShift+Ctrl+T"), wxT(""), wxITEM_NORMAL); - MnuEditorPopup->AppendSeparator(); - wxMenu *ID_MNU_VERSIONCONTROL_1151_Obj = new wxMenu(); - - wxMenu *ID_MNU_CVS_1255_Obj = new wxMenu(); - ID_MNU_CVS_1255_Obj->Append(ID_MNU_UPDATE_1256, wxT("Update"), wxT(""), wxITEM_NORMAL); - ID_MNU_CVS_1255_Obj->Append(ID_MNU_DIFF_1258, wxT("Diff"), wxT(""), wxITEM_NORMAL); - ID_MNU_CVS_1255_Obj->AppendSeparator(); - ID_MNU_CVS_1255_Obj->Append(ID_MNU_COMMIT_1260, wxT("Commit"), wxT(""), wxITEM_NORMAL); - ID_MNU_CVS_1255_Obj->AppendSeparator(); - ID_MNU_CVS_1255_Obj->Append(ID_MNU_LOG_1262, wxT("Log"), wxT(""), wxITEM_NORMAL); - ID_MNU_VERSIONCONTROL_1151_Obj->Append(ID_MNU_CVS_1255, wxT("CVS"), ID_MNU_CVS_1255_Obj); - - wxMenu *ID_MNU_SVN_1263_Obj = new wxMenu(); - ID_MNU_SVN_1263_Obj->Append(ID_MNU_UPDATE_1264, wxT("Update"), wxT(""), wxITEM_NORMAL); - ID_MNU_SVN_1263_Obj->Append(ID_MNU_DIFF_1265, wxT("Diff"), wxT(""), wxITEM_NORMAL); - ID_MNU_SVN_1263_Obj->AppendSeparator(); - ID_MNU_SVN_1263_Obj->Append(ID_MNU_COMMIT_1267, wxT("Commit"), wxT(""), wxITEM_NORMAL); - ID_MNU_SVN_1263_Obj->AppendSeparator(); - ID_MNU_SVN_1263_Obj->Append(ID_MNU_LOG_1269, wxT("Log"), wxT(""), wxITEM_NORMAL); - ID_MNU_VERSIONCONTROL_1151_Obj->Append(ID_MNU_SVN_1263, wxT("SVN"), ID_MNU_SVN_1263_Obj); - MnuEditorPopup->Append(ID_MNU_VERSIONCONTROL_1151, wxT("Version Control"), ID_MNU_VERSIONCONTROL_1151_Obj); - MnuEditorPopup->AppendSeparator(); - MnuEditorPopup->Append(wxID_PROPERTIES, wxT("Properties"), wxT(""), wxITEM_NORMAL); + MnuDebugPopup = new wxMenu(wxT(""));MnuDebugPopup->Append(ID_MNU_ADDWATCH_TF4_1189, wxT("&Add watch\tF4"), wxT(""), wxITEM_NORMAL); + MnuDebugPopup->Append(ID_MNU_MODIFYVALUE_1190, wxT("&Modify value"), wxT(""), wxITEM_NORMAL); + MnuDebugPopup->AppendSeparator(); + MnuDebugPopup->Append(ID_MNU_REMOVEWATCH_1192, wxT("&Remove Watch"), wxT(""), wxITEM_NORMAL); + MnuDebugPopup->Append(ID_MNU_CLEARALLWATCHES_1193, wxT("&Clear all Watches"), wxT(""), wxITEM_NORMAL); - /* Project popup menu - */ - MnuProjectPopup = new wxMenu(wxT(""));MnuProjectPopup->Append(ID_MNU_NEWUNIT_1230, wxT("&New Unit"), wxT(""), wxITEM_NORMAL); - MnuProjectPopup->Append(ID_MNU_ADDFILE____1231, wxT("&Add file..."), wxT(""), wxITEM_NORMAL); - MnuProjectPopup->Append(ID_MNU_REMOVEFILE____1233, wxT("&Remove file..."), wxT(""), wxITEM_NORMAL); - MnuProjectPopup->AppendSeparator(); - MnuProjectPopup->Append(ID_MNU_ADDFOLDER_1234, wxT("Add &folder"), wxT(""), wxITEM_NORMAL); - MnuProjectPopup->AppendSeparator(); - MnuProjectPopup->Append(ID_MNU_OPTIONS_1236, wxT("&Options"), wxT(""), wxITEM_NORMAL); - MnuProjectPopup->AppendSeparator(); - wxMenu *ID_MNU_VERSIONCONTROL_1238_Obj = new wxMenu(); - - wxMenu *ID_MNU_CVS_1290_Obj = new wxMenu(); - ID_MNU_CVS_1290_Obj->Append(ID_MNU_UPDATE_1291, wxT("Update"), wxT(""), wxITEM_NORMAL); - ID_MNU_CVS_1290_Obj->Append(ID_MNU_DIFF_1292, wxT("Diff"), wxT(""), wxITEM_NORMAL); - ID_MNU_CVS_1290_Obj->AppendSeparator(); - ID_MNU_CVS_1290_Obj->Append(ID_MNU_COMMIT_1294, wxT("Commit"), wxT(""), wxITEM_NORMAL); - ID_MNU_CVS_1290_Obj->AppendSeparator(); - ID_MNU_CVS_1290_Obj->Append(ID_MNU_LOG_1296, wxT("Log"), wxT(""), wxITEM_NORMAL); - ID_MNU_VERSIONCONTROL_1238_Obj->Append(ID_MNU_CVS_1290, wxT("CVS"), ID_MNU_CVS_1290_Obj); - - wxMenu *ID_MNU_SVN_1297_Obj = new wxMenu(); - ID_MNU_SVN_1297_Obj->Append(ID_MNU_UPDATE_1298, wxT("Update"), wxT(""), wxITEM_NORMAL); - ID_MNU_SVN_1297_Obj->Append(ID_MNU_DIFF_1299, wxT("Diff"), wxT(""), wxITEM_NORMAL); - ID_MNU_SVN_1297_Obj->AppendSeparator(); - ID_MNU_SVN_1297_Obj->Append(ID_MNU_COMMIT_1301, wxT("Commit"), wxT(""), wxITEM_NORMAL); - ID_MNU_SVN_1297_Obj->AppendSeparator(); - ID_MNU_SVN_1297_Obj->Append(ID_MNU_LOG_1303, wxT("Log"), wxT(""), wxITEM_NORMAL); - ID_MNU_VERSIONCONTROL_1238_Obj->Append(ID_MNU_SVN_1297, wxT("SVN"), ID_MNU_SVN_1297_Obj); - MnuProjectPopup->Append(ID_MNU_VERSIONCONTROL_1238, wxT("Version Control"), ID_MNU_VERSIONCONTROL_1238_Obj); - MnuProjectPopup->AppendSeparator(); - MnuProjectPopup->Append(ID_MNU_PROPERTIES_1443, wxT("Proper&ties"), wxT(""), wxITEM_NORMAL); - - WxPopupMenu1 = new wxMenu(wxT("")); - /* Browser popup menu */ MnuBrowserPopup = new wxMenu(wxT(""));MnuBrowserPopup->Append(ID_MNU_GOTODECLARATION_1170, wxT("Goto declaration"), wxT(""), wxITEM_NORMAL); @@ -649,16 +532,6 @@ ID_MNU_VIEWMODE_1182_Obj->Append(ID_MNU_SHOWINHERITED_1188, wxT("Show inherited members"), wxT(""), wxITEM_NORMAL); MnuBrowserPopup->Append(ID_MNU_VIEWMODE_1182, wxT("View mode"), ID_MNU_VIEWMODE_1182_Obj); - DlgOpenDialog = new wxFileDialog(this, wxT("Choose a file"), wxT(""), wxT(""), wxT("*.*"), wxOPEN | wxMULTIPLE); - - /* Debug popup menu - */ - MnuDebugPopup = new wxMenu(wxT(""));MnuDebugPopup->Append(ID_MNU_ADDWATCH_TF4_1189, wxT("&Add watch\tF4"), wxT(""), wxITEM_NORMAL); - MnuDebugPopup->Append(ID_MNU_MODIFYVALUE_1190, wxT("&Modify value"), wxT(""), wxITEM_NORMAL); - MnuDebugPopup->AppendSeparator(); - MnuDebugPopup->Append(ID_MNU_REMOVEWATCH_1192, wxT("&Remove Watch"), wxT(""), wxITEM_NORMAL); - MnuDebugPopup->Append(ID_MNU_CLEARALLWATCHES_1193, wxT("&Clear all Watches"), wxT(""), wxITEM_NORMAL); - /* Unit popup menu */ MnuUnitPopup = new wxMenu(wxT(""));MnuUnitPopup->Append(ID_MNU_REMOVEFROMPROJECT_1194, wxT("&Remove from project"), wxT(""), wxITEM_NORMAL); @@ -703,6 +576,46 @@ MnuUnitPopup->AppendSeparator(); MnuUnitPopup->Append(wxID_PROPERTIES, wxT("Properties"), wxT(""), wxITEM_NORMAL); + DlgOpenDialog = new wxFileDialog(this, wxT("Choose a file"), wxT(""), wxT(""), wxT("*.*"), wxFD_OPEN | wxFD_MULTIPLE); + + /* Project popup menu + */ + MnuProjectPopup = new wxMenu(wxT(""));MnuProjectPopup->Append(ID_MNU_NEWUNIT_1230, wxT("&New Unit"), wxT(""), wxITEM_NORMAL); + MnuProjectPopup->Append(ID_MNU_ADDFILE____1231, wxT("&Add file..."), wxT(""), wxITEM_NORMAL); + MnuProjectPopup->Append(ID_MNU_REMOVEFILE____1233, wxT("&Remove file..."), wxT(""), wxITEM_NORMAL); + MnuProjectPopup->AppendSeparator(); + MnuProjectPopup->Append(ID_MNU_ADDFOLDER_1234, wxT("Add &folder"), wxT(""), wxITEM_NORMAL); + MnuProjectPopup->AppendSeparator(); + MnuProjectPopup->Append(ID_MNU_OPTIONS_1236, wxT("&Options"), wxT(""), wxITEM_NORMAL); + MnuProjectPopup->AppendSeparator(); + wxMenu *ID_MNU_VERSIONCONTROL_1238_Obj = new wxMenu(); + + wxMenu *ID_MNU_CVS_1290_Obj = new wxMenu(); + ID_MNU_CVS_1290_Obj->Append(ID_MNU_UPDATE_1291, wxT("Update"), wxT(""), wxITEM_NORMAL); + ID_MNU_CVS_1290_Obj->Append(ID_MNU_DIFF_1292, wxT("Diff"), wxT(""), wxITEM_NORMAL); + ID_MNU_CVS_1290_Obj->AppendSeparator(); + ID_MNU_CVS_1290_Obj->Append(ID_MNU_COMMIT_1294, wxT("Commit"), wxT(""), wxITEM_NORMAL); + ID_MNU_CVS_1290_Obj->AppendSeparator(); + ID_MNU_CVS_1290_Obj->Append(ID_MNU_LOG_1296, wxT("Log"), wxT(""), wxITEM_NORMAL); + ID_MNU_VERSIONCONTROL_1238_Obj->Append(ID_MNU_CVS_1290, wxT("CVS"), ID_MNU_CVS_1290_Obj); + + wxMenu *ID_MNU_SVN_1297_Obj = new wxMenu(); + ID_MNU_SVN_1297_Obj->Append(ID_MNU_UPDATE_1298, wxT("Update"), wxT(""), wxITEM_NORMAL); + ID_MNU_SVN_1297_Obj->Append(ID_MNU_DIFF_1299, wxT("Diff"), wxT(""), wxITEM_NORMAL); + ID_MNU_SVN_1297_Obj->AppendSeparator(); + ID_MNU_SVN_1297_Obj->Append(ID_MNU_COMMIT_1301, wxT("Commit"), wxT(""), wxITEM_NORMAL); + ID_MNU_SVN_1297_Obj->AppendSeparator(); + ID_MNU_SVN_1297_Obj->Append(ID_MNU_LOG_1303, wxT("Log"), wxT(""), wxITEM_NORMAL); + ID_MNU_VERSIONCONTROL_1238_Obj->Append(ID_MNU_SVN_1297, wxT("SVN"), ID_MNU_SVN_1297_Obj); + MnuProjectPopup->Append(ID_MNU_VERSIONCONTROL_1238, wxT("Version Control"), ID_MNU_VERSIONCONTROL_1238_Obj); + MnuProjectPopup->AppendSeparator(); + MnuProjectPopup->Append(ID_MNU_PROPERTIES_1443, wxT("Proper&ties"), wxT(""), wxITEM_NORMAL); + + DlgSaveDialog = new wxFileDialog(this, wxT("Choose a file"), wxT(""), wxT(""), wxT("*.*"), wxFD_SAVE); + + MnuMessagePopup = new wxMenu(wxT(""));MnuMessagePopup->Append(ID_MNU_COPY_1253, wxT("&Copy"), wxT(""), wxITEM_NORMAL); + MnuMessagePopup->Append(ID_MNU_CLEAR_1254, wxT("C&lear"), wxT(""), wxITEM_NORMAL); + /* Help popup menu */ MnuHelpPopup = new wxMenu(wxT(""));MnuHelpPopup->Append(ID_MNU_HELPONWXDEV_C___1168, wxT("&Help on wxDev-C++"), wxT(""), wxITEM_NORMAL); @@ -903,8 +816,95 @@ WxMenuBar1->Append(ID_MNU_HELP_1011_Mnu_Obj, wxT("&Help")); SetMenuBar(WxMenuBar1); - DlgSaveDialog = new wxFileDialog(this, wxT("Choose a file"), wxT(""), wxT(""), wxT("*.*"), wxSAVE); + /* Main popup menu for the editor + */ + MnuEditorPopup = new wxMenu(wxT(""));MnuEditorPopup->Append(ID_MNU_CLOSE_1092, wxT("C&lose\tCtrl+F4"), wxT("Close current page"), wxITEM_NORMAL); + MnuEditorPopup->Append(ID_MNU_CLOSEALL_1093, wxT("Close All"), wxT("Close all pages"), wxITEM_NORMAL); + MnuEditorPopup->Append(ID_MNU_CLOSEALLEXCEPTTHIS_1094, wxT("Close all except this"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->AppendSeparator(); + MnuEditorPopup->Append(wxID_UNDO, wxT("&Undo\tCtrl+Z"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->Append(wxID_REDO, wxT("&Redo\tShift+Ctrl+Z"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->AppendSeparator(); + MnuEditorPopup->Append(wxID_CUT, wxT("C&ut\tCtrl+X"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->Append(wxID_COPY, wxT("&Copy\tCtrl+C"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->Append(wxID_PASTE, wxT("&Paste\tCtrl+V"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->Append(wxID_SELECTALL, wxT("&Select All\tCtrl+A"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->Append(wxID_DELETE, wxT("Delete"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->AppendSeparator(); + MnuEditorPopup->Append(ID_MNU_SWAPHEADER_SOURCE_1105, wxT("Swap header/source"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->AppendSeparator(); + wxMenu *ID_MNU_INSERT_1107_Obj = new wxMenu(); + ID_MNU_INSERT_1107_Obj->Append(ID_MNU_COMMENTHEADER_1108, wxT("Comment header"), wxT(""), wxITEM_NORMAL); + ID_MNU_INSERT_1107_Obj->Append(ID_MNU_DATEANDTIME_1109, wxT("Date and time"), wxT(""), wxITEM_NORMAL); + ID_MNU_INSERT_1107_Obj->AppendSeparator(); + ID_MNU_INSERT_1107_Obj->Append(ID_MNU_MAINFUNCTION_1111, wxT("Main function"), wxT(""), wxITEM_NORMAL); + ID_MNU_INSERT_1107_Obj->Append(ID_MNU_WINMAINFUNCTION_1112, wxT("WinMain function"), wxT(""), wxITEM_NORMAL); + ID_MNU_INSERT_1107_Obj->AppendSeparator(); + ID_MNU_INSERT_1107_Obj->Append(ID_MNU__IFDEF_1114, wxT("#ifdef"), wxT(""), wxITEM_NORMAL); + ID_MNU_INSERT_1107_Obj->Append(ID_MNU__IFNDEF_1115, wxT("#ifndef"), wxT(""), wxITEM_NORMAL); + ID_MNU_INSERT_1107_Obj->Append(ID_MNU__INCLUDE_1116, wxT("#include"), wxT(""), wxITEM_NORMAL); + ID_MNU_INSERT_1107_Obj->AppendSeparator(); + ID_MNU_INSERT_1107_Obj->Append(ID_MNU_IF___1118, wxT("if()"), wxT(""), wxITEM_NORMAL); + ID_MNU_INSERT_1107_Obj->Append(ID_MNU_WHILE___1119, wxT("while()"), wxT(""), wxITEM_NORMAL); + ID_MNU_INSERT_1107_Obj->Append(ID_MNU_DO___WHILE___1120, wxT("do...while()"), wxT(""), wxITEM_NORMAL); + ID_MNU_INSERT_1107_Obj->Append(ID_MNU_FOR___1121, wxT("for()"), wxT(""), wxITEM_NORMAL); + ID_MNU_INSERT_1107_Obj->AppendSeparator(); + ID_MNU_INSERT_1107_Obj->Append(ID_MNU_MESSAGEBOX_1123, wxT("MessageBox"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->Append(ID_MNU_INSERT_1107, wxT("&Insert"), ID_MNU_INSERT_1107_Obj); + wxMenu *ID_MNU_SURROUNDWITH_1124_Obj = new wxMenu(); + ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_TRY_CATCH, wxT("try...catch"), wxT(""), wxITEM_NORMAL); + ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_TRY_FINALLY, wxT("t&ry...finally"), wxT(""), wxITEM_NORMAL); + ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_TRY_CATCH_FINALLY, wxT("tr&y...catch...finally"), wxT(""), wxITEM_NORMAL); + ID_MNU_SURROUNDWITH_1124_Obj->AppendSeparator(); + ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_FOR, wxT("for"), wxT(""), wxITEM_NORMAL); + ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_FOR_I, wxT("for(int i..."), wxT(""), wxITEM_NORMAL); + ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_WHILE, wxT("while"), wxT(""), wxITEM_NORMAL); + ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_DO_WHILE, wxT("do...while"), wxT(""), wxITEM_NORMAL); + ID_MNU_SURROUNDWITH_1124_Obj->AppendSeparator(); + ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_IF, wxT("if"), wxT(""), wxITEM_NORMAL); + ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_IF_ELSE, wxT("if...else"), wxT(""), wxITEM_NORMAL); + ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_SWITCH, wxT("switch"), wxT(""), wxITEM_NORMAL); + ID_MNU_SURROUNDWITH_1124_Obj->AppendSeparator(); + ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_BRACES, wxT("{...}"), wxT(""), wxITEM_NORMAL); + ID_MNU_SURROUNDWITH_1124_Obj->AppendSeparator(); + ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_C_COMMENT, wxT("C Style Comment"), wxT(""), wxITEM_NORMAL); + ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_CPP_COMMENT, wxT("C++ Style Comment"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->Append(ID_MNU_SURROUNDWITH_1124, wxT("Surround with"), ID_MNU_SURROUNDWITH_1124_Obj); + MnuEditorPopup->AppendSeparator(); + MnuEditorPopup->Append(ID_MNU_TOGGLEBOOKMARKS_1141, wxT("&Toggle bookmarks"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->Append(ID_MNU_GOTOBOOKMARKS_1142, wxT("&Goto bookmarks"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->AppendSeparator(); + MnuEditorPopup->Append(ID_MNU_TOGGLEBREAKPOINT_1145, wxT("Toggle Breakpoint"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->Append(ID_MNU_ADDWATCH_1146, wxT("&Add Watch"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->Append(ID_MNU_RUNTOCURSOR_1147, wxT("&Run to cursor"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->AppendSeparator(); + MnuEditorPopup->Append(ID_MNU_ADDTO_DOITEM____TSHIFT_CTRL_T_1149, wxT("Add To-Do Item...\tShift+Ctrl+T"), wxT(""), wxITEM_NORMAL); + MnuEditorPopup->AppendSeparator(); + wxMenu *ID_MNU_VERSIONCONTROL_1151_Obj = new wxMenu(); + + wxMenu *ID_MNU_CVS_1255_Obj = new wxMenu(); + ID_MNU_CVS_1255_Obj->Append(ID_MNU_UPDATE_1256, wxT("Update"), wxT(""), wxITEM_NORMAL); + ID_MNU_CVS_1255_Obj->Append(ID_MNU_DIFF_1258, wxT("Diff"), wxT(""), wxITEM_NORMAL); + ID_MNU_CVS_1255_Obj->AppendSeparator(); + ID_MNU_CVS_1255_Obj->Append(ID_MNU_COMMIT_1260, wxT("Commit"), wxT(""), wxITEM_NORMAL); + ID_MNU_CVS_1255_Obj->AppendSeparator(); + ID_MNU_CVS_1255_Obj->Append(ID_MNU_LOG_1262, wxT("Log"), wxT(""), wxITEM_NORMAL); + ID_MNU_VERSIONCONTROL_1151_Obj->Append(ID_MNU_CVS_1255, wxT("CVS"), ID_MNU_CVS_1255_Obj); + + wxMenu *ID_MNU_SVN_1263_Obj = new wxMenu(); + ID_MNU_SVN_1263_Obj->Append(ID_MNU_UPDATE_1264, wxT("Update"), wxT(""), wxITEM_NORMAL); + ID_MNU_SVN_1263_Obj->Append(ID_MNU_DIFF_1265, wxT("Diff"), wxT(""), wxITEM_NORMAL); + ID_MNU_SVN_1263_Obj->AppendSeparator(); + ID_MNU_SVN_1263_Obj->Append(ID_MNU_COMMIT_1267, wxT("Commit"), wxT(""), wxITEM_NORMAL); + ID_MNU_SVN_1263_Obj->AppendSeparator(); + ID_MNU_SVN_1263_Obj->Append(ID_MNU_LOG_1269, wxT("Log"), wxT(""), wxITEM_NORMAL); + ID_MNU_VERSIONCONTROL_1151_Obj->Append(ID_MNU_SVN_1263, wxT("SVN"), ID_MNU_SVN_1263_Obj); + MnuEditorPopup->Append(ID_MNU_VERSIONCONTROL_1151, wxT("Version Control"), ID_MNU_VERSIONCONTROL_1151_Obj); + MnuEditorPopup->AppendSeparator(); + MnuEditorPopup->Append(wxID_PROPERTIES, wxT("Properties"), wxT(""), wxITEM_NORMAL); + WxPopupMenu1 = new wxMenu(wxT("")); + TlbMain->SetToolBitmapSize(wxSize(16,16)); TlbMain->Realize(); SetToolBar(TlbMain); @@ -1886,18 +1886,7 @@ { /*?*//* WITH Lang */ // Menus -#ifndef WXW29 - WxMenuBar1->SetLabelTop(0,Lang()->GetString(ID_MNU_FILE)); - WxMenuBar1->SetLabelTop(1,Lang()->GetString(ID_MNU_EDIT)); - WxMenuBar1->SetLabelTop(2,Lang()->GetString(ID_MNU_SEARCH)); - WxMenuBar1->SetLabelTop(3,Lang()->GetString(ID_MNU_VIEW)); - WxMenuBar1->SetLabelTop(4,Lang()->GetString(ID_MNU_PROJECT)); - WxMenuBar1->SetLabelTop(5,Lang()->GetString(ID_MNU_EXECUTE)); - WxMenuBar1->SetLabelTop(6,Lang()->GetString(ID_MNU_DEBUG)); - WxMenuBar1->SetLabelTop(7,Lang()->GetString(ID_MNU_TOOLS)); - WxMenuBar1->SetLabelTop(9,Lang()->GetString(ID_MNU_WINDOW)); - WxMenuBar1->SetLabelTop(10,Lang()->GetString(ID_MNU_HELP)); -#else + WxMenuBar1->SetMenuLabel(0,Lang()->GetString(ID_MNU_FILE)); WxMenuBar1->SetMenuLabel(1,Lang()->GetString(ID_MNU_EDIT)); WxMenuBar1->SetMenuLabel(2,Lang()->GetString(ID_MNU_SEARCH)); @@ -1908,7 +1897,6 @@ WxMenuBar1->SetMenuLabel(7,Lang()->GetString(ID_MNU_TOOLS)); WxMenuBar1->SetMenuLabel(9,Lang()->GetString(ID_MNU_WINDOW)); WxMenuBar1->SetMenuLabel(10,Lang()->GetString(ID_MNU_HELP)); -#endif // file menu /*mnuNew.Caption = Strings[ ID_SUB_NEW ]; @@ -5604,11 +5592,9 @@ ClassBrowser1.ProjectDir = ExtractFilePath( e.Filename );else ClassBrowser1.ProjectDir = ""; }*/ -#ifndef WXW29 - ::wxStartTimer(); -#else + wxStopWatch sw; -#endif + // WITH CppParser1 { /*Reset; if( !! fProject ) { @@ -5634,11 +5620,9 @@ ClassBrowser1.CurrentFile = e.Filename; } }*/ -#ifndef WXW29 - StbStatusBar->SetStatusText(wxString::Format(wxT("Done parsing in %3.2f seconds"), ::wxGetElapsedTime() *1.0/ 1000 ),3); -#else + StbStatusBar->SetStatusText(wxString::Format(wxT("Done parsing in %3.2f seconds"), sw.Time() ),3); -#endif + } @@ -6259,7 +6243,7 @@ } else { - NbkMessageControl->SetSelection(-1); + NbkMessageControl->SetSelection(0); CloseSheet->Hide(); int Stop,SheetHeight, Height; NbkMessageControl->GetSize(NULL,&Stop); Modified: trunk/wxdevide/source/MainFrm.h =================================================================== --- trunk/wxdevide/source/MainFrm.h 2011-12-11 03:29:29 UTC (rev 18) +++ trunk/wxdevide/source/MainFrm.h 2011-12-29 17:10:50 UTC (rev 19) @@ -37,6 +37,8 @@ #include <wx/aui/aui.h> #include <wx/aui/auibook.h> +#include <wx/filename.h> + //Project file includes go here #include "SplashFrm.h" #include "Compiler.h" @@ -72,17 +74,17 @@ //GUI Control Declaration Start and GUI Control Declaration End. //wxDev-C++ will remove them. Add custom code after the block. ////GUI Control Declaration Start - wxFileDialog *DlgSaveDialog; + wxMenu *WxPopupMenu1; + wxMenu *MnuEditorPopup; wxMenuBar *WxMenuBar1; wxMenu *MnuHelpPopup; + wxMenu *MnuMessagePopup; + wxFileDialog *DlgSaveDialog; + wxMenu *MnuProjectPopup; + wxFileDialog *DlgOpenDialog; wxMenu *MnuUnitPopup; + wxMenu *MnuBrowserPopup; wxMenu *MnuDebugPopup; - wxFileDialog *DlgOpenDialog; - wxMenu *MnuBrowserPopup; - wxMenu *WxPopupMenu1; - wxMenu *MnuProjectPopup; - wxMenu *MnuEditorPopup; - wxMenu *MnuMessagePopup; wxStatusBar *StbStatusBar; wxPanel *CloseSheet; wxPanel *WxNoteBookPage7; @@ -127,6 +129,55 @@ enum { ////GUI Enum Control ID Start + ID_MNU_CLOSE_1092 = 1092, + ID_MNU_CLOSEALL_1093 = 1093, + ID_MNU_CLOSEALLEXCEPTTHIS_1094 = 1094, + ID_MNU_SWAPHEADER_SOURCE_1105 = 1105, + ID_MNU_INSERT_1107 = 1107, + ID_MNU_COMMENTHEADER_1108 = 1108, + ID_MNU_DATEANDTIME_1109 = 1109, + ID_MNU_MAINFUNCTION_1111 = 1111, + ID_MNU_WINMAINFUNCTION_1112 = 1112, + ID_MNU__IFDEF_1114 = 1114, + ID_MNU__IFNDEF_1115 = 1115, + ID_MNU__INCLUDE_1116 = 1116, + ID_MNU_IF___1118 = 1118, + ID_MNU_WHILE___1119 = 1119, + ID_MNU_DO___WHILE___1120 = 1120, + ID_MNU_FOR___1121 = 1121, + ID_MNU_MESSAGEBOX_1123 = 1123, + ID_MNU_SURROUNDWITH_1124 = 1124, + INT_TRY_CATCH = 1125, + INT_TRY_FINALLY = 1440, + INT_TRY_CATCH_FINALLY = 1441, + INT_FOR = 1127, + INT_FOR_I = 1128, + INT_WHILE = 1129, + INT_DO_WHILE = 1130, + INT_IF = 1132, + INT_IF_ELSE = 1133, + INT_SWITCH = 1134, + INT_BRACES = 1136, + INT_C_COMMENT = 1138, + INT_CPP_COMMENT = 1139, + ID_MNU_TOGGLEBOOKMARKS_1141 = 1141, + ID_MNU_GOTOBOOKMARKS_1142 = 1142, + ID_MNU_TOGGLEBREAKPOINT_1145 = 1145, + ID_MNU_ADDWATCH_1146 = 1146, + ID_MNU_RUNTOCURSOR_1147 = 1147, + ID_MNU_ADDTO_DOITEM____TSHIFT_CTRL_T_1149 = 1149, + ID_MNU_VERSIONCONTROL_1151 = 1151, + ID_MNU_CVS_1255 = 1255, + ID_MNU_UPDATE_1256 = 1256, + ID_MNU_DIFF_1258 = 1258, + ID_MNU_COMMIT_1260 = 1260, + ID_MNU_LOG_1262 = 1262, + ID_MNU_SVN_1263 = 1263, + ID_MNU_UPDATE_1264 = 1264, + ID_MNU_DIFF_1265 = 1265, + ID_MNU_COMMIT_1267 = 1267, + ID_MNU_LOG_1269 = 1269, + ID_MNU_FILE_1001 = 1001, ID_MNU_NEW_1091 = 1091, ID_MNU_SOURCEFILE_1410 = 1410, @@ -243,6 +294,27 @@ ID_MNU_HELPONWXDEV_C___1168 = 1168, + ID_MNU_COPY_1253 = 1253, + ID_MNU_CLEAR_1254 = 1254, + + ID_MNU_NEWUNIT_1230 = 1230, + ID_MNU_ADDFILE____1231 = 1231, + ID_MNU_REMOVEFILE____1233 = 1233, + ID_MNU_ADDFOLDER_1234 = 1234, + ID_MNU_OPTIONS_1236 = 1236, + ID_MNU_VERSIONCONTROL_1238 = 1238, + ID_MNU_CVS_1290 = 1290, + ID_MNU_UPDATE_1291 = 1291, + ID_MNU_DIFF_1292 = 1292, + ID_MNU_COMMIT_1294 = 1294, + ID_MNU_LOG_1296 = 1296, + ID_MNU_SVN_1297 = 1297, + ID_MNU_UPDATE_1298 = 1298, + ID_MNU_DIFF_1299 = 1299, + ID_MNU_COMMIT_1301 = 1301, + ID_MNU_LOG_1303 = 1303, + ID_MNU_PROPERTIES_1443 = 1443, + ID_MNU_REMOVEFROMPROJECT_1194 = 1194, ID_MNU_RENAMEFILE_1195 = 1195, ID_MNU_OPEN_1197 = 1197, @@ -268,11 +340,6 @@ ID_MNU_ADD_1288 = 1288, ID_MNU_REMOVE_1289 = 1289, - ID_MNU_ADDWATCH_TF4_1189 = 1189, - ID_MNU_MODIFYVALUE_1190 = 1190, - ID_MNU_REMOVEWATCH_1192 = 1192, - ID_MNU_CLEARALLWATCHES_1193 = 1193, - ID_MNU_GOTODECLARATION_1170 = 1170, ID_MNU_GOTOIMPLEMENTATION_1171 = 1171, ID_MNU_NEWCLASS_1173 = 1173, @@ -288,76 +355,11 @@ ID_MNU_USECOLORS_1187 = 1187, ID_MNU_SHOWINHERITED_1188 = 1188, - ID_MNU_NEWUNIT_1230 = 1230, - ID_MNU_ADDFILE____1231 = 1231, - ID_MNU_REMOVEFILE____1233 = 1233, - ID_MNU_ADDFOLDER_1234 = 1234, - ID_MNU_OPTIONS_1236 = 1236, - ID_MNU_VERSIONCONTROL_1238 = 1238, - ID_MNU_CVS_1290 = 1290, - ID_MNU_UPDATE_1291 = 1291, - ID_MNU_DIFF_1292 = 1292, - ID_MNU_COMMIT_1294 = 1294, - ID_MNU_LOG_1296 = 1296, - ID_MNU_SVN_1297 = 1297, - ID_MNU_UPDATE_1298 = 1298, - ID_MNU_DIFF_1299 = 1299, - ID_MNU_COMMIT_1301 = 1301, - ID_MNU_LOG_1303 = 1303, - ID_MNU_PROPERTIES_1443 = 1443, + ID_MNU_ADDWATCH_TF4_1189 = 1189, + ID_MNU_MODIFYVALUE_1190 = 1190, + ID_MNU_REMOVEWATCH_1192 = 1192, + ID_MNU_CLEARALLWATCHES_1193 = 1193, - ID_MNU_CLOSE_1092 = 1092, - ID_MNU_CLOSEALL_1093 = 1093, - ID_MNU_CLOSEALLEXCEPTTHIS_1094 = 1094, - ID_MNU_SWAPHEADER_SOURCE_1105 = 1105, - ID_MNU_INSERT_1107 = 1107, - ID_MNU_COMMENTHEADER_1108 = 1108, - ID_MNU_DATEANDTIME_1109 = 1109, - ID_MNU_MAINFUNCTION_1111 = 1111, - ID_MNU_WINMAINFUNCTION_1112 = 1112, - ID_MNU__IFDEF_1114 = 1114, - ID_MNU__IFNDEF_1115 = 1115, - ID_MNU__INCLUDE_1116 = 1116, - ID_MNU_IF___1118 = 1118, - ID_MNU_WHILE___1119 = 1119, - ID_MNU_DO___WHILE___1120 = 1120, - ID_MNU_FOR___1121 = 1121, - ID_MNU_MESSAGEBOX_1123 = 1123, - ID_MNU_SURROUNDWITH_1124 = 1124, - INT_TRY_CATCH = 1125, - INT_TRY_FINALLY = 1440, - INT_TRY_CATCH_FINALLY = 1441, - INT_FOR = 1127, - INT_FOR_I = 1128, - INT_WHILE = 1129, - INT_DO_WHILE = 1130, - INT_IF = 1132, - INT_IF_ELSE = 1133, - INT_SWITCH = 1134, - INT_BRACES = 1136, - INT_C_COMMENT = 1138, - INT_CPP_COMMENT = 1139, - ID_MNU_TOGGLEBOOKMARKS_1141 = 1141, - ID_MNU_GOTOBOOKMARKS_1142 = 1142, - ID_MNU_TOGGLEBREAKPOINT_1145 = 1145, - ID_MNU_ADDWATCH_1146 = 1146, - ID_MNU_RUNTOCURSOR_1147 = 1147, - ID_MNU_ADDTO_DOITEM____TSHIFT_CTRL_T_1149 = 1149, - ID_MNU_VERSIONCONTROL_1151 = 1151, - ID_MNU_CVS_1255 = 1255, - ID_MNU_UPDATE_1256 = 1256, - ID_MNU_DIFF_1258 = 1258, - ID_MNU_COMMIT_1260 = 1260, - ID_MNU_LOG_1262 = 1262, - ID_MNU_SVN_1263 = 1263, - ID_MNU_UPDATE_1264 = 1264, - ID_MNU_DIFF_1265 = 1265, - ID_MNU_COMMIT_1267 = 1267, - ID_MNU_LOG_1269 = 1269, - - ID_MNU_COPY_1253 = 1253, - ID_MNU_CLEAR_1254 = 1254, - ID_STBSTATUSBAR = 1031, ID_CLOSESHEET = 1043, ID_WXNOTEBOOKPAGE7 = 1042, Modified: trunk/wxdevide/source/MainFrm.wxform =================================================================== --- trunk/wxdevide/source/MainFrm.wxform 2011-12-11 03:29:29 UTC (rev 18) +++ trunk/wxdevide/source/MainFrm.wxform 2011-12-29 17:10:50 UTC (rev 19) @@ -1,4 +1,4 @@ -object frmNewForm_3: TfrmNewForm +object frmNewForm: TfrmNewForm Left = 8 Top = 8 AutoScroll = False @@ -160,7 +160,7 @@ Wx_Center = True Wx_Hidden = False Wx_SizeToContents = True - Wx_Filename = 'Images/Self_MainFrm_XPM.xpm' + Wx_Filename = 'Images/MainFrm_frmNewForm_XPM.xpm' Wx_GeneralStyle = [] Wx_DialogStyle = [wxCAPTION, wxRESIZE_BORDER, wxSYSTEM_MENU, wxDIALOG_NO_PARENT, wxMINIMIZE_BOX, wxMAXIMIZE_BOX, wxCLOSE_BOX] Wx_DesignerType = dtWxFrame @@ -4245,1633 +4245,6 @@ Wx_Enabled = True Wx_Border = 0 end - object MnuMessagePopup: TWxPopupMenu - Left = 548 - Top = 3 - Width = 28 - Height = 27 - TabOrder = 19 - Glyph.Data = { - 36090000424D3609000000000000360000002800000018000000180000000100 - 2000000000000009000000000000000000000000000000000000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000000000000000 - 0000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000000000FFFFFF00FFFF - FF00000000000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000000000000808000008080000080800000000000FFFFFF00FFFF - FF00000000000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 80000080800000000000000000000080800000000000FFFFFF00FFFFFF000000 - 0000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 80000080800000000000FFFFFF000000000000000000FFFFFF00FFFFFF000000 - 0000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 80000080800000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 80000080800000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000000 - 0000000000000000000000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 80000080800000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 80000080800000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000 - 0000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000000000000000000000000000000000000000 - 00000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF0000000000FFFFFF00FFFFFF00FFFFFF0000000000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000FFFFFF008000000080000000800000008000 - 00008000000000000000FFFFFF00FFFFFF000000000000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000800000008000000080000000800000008000 - 00008000000000000000FFFFFF00000000000000000000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 800000808000008080008080800080000000FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF000000000000000000800000000000000000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000800000008000000080000000800000008000 - 0000800000008000000080000000800000000000000000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000FFFFFF008000000080000000800000008000 - 000080000000FFFFFF00FFFFFF00FFFFFF000000000000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000FFFFFF008000000080000000800000008000 - 0000FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000FFFFFF008000000080000000800000008000 - 000080000000FFFFFF00FFFFFF00FFFFFF000000000000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000808080008080800080808000808080008080 - 8000808080008080800080808000808080008080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000} - Wx_Class = 'wxMenu' - Wx_MenuItems.IsSubMenu = False - Wx_MenuItems.Wx_Enabled = True - Wx_MenuItems.Wx_Hidden = False - Wx_MenuItems.Wx_IDValue = 0 - Wx_MenuItems.Wx_MenuItemStyle = wxMnuItm_Normal - Wx_MenuItems.Wx_Checked = False - Wx_MenuItems.KeepFormat = False - Wx_MenuItems.Wx_FileHistory = False - Wx_MenuItems.WxCustomMenuItem = { - 11000000545778437573746F6D4D656E754974656D5450463018547778437573 - 746F6D4D656E754974656D577261707065720011436172726965642E49735375 - 624D656E750812436172726965642E57785F456E61626C656409114361727269 - 65642E57785F48696464656E0811436172726965642E57785F49444E616D6506 - 1049445F4D4E555F434F50595F3132353312436172726965642E57785F494456 - 616C756503E50418436172726965642E57785F4D656E754974656D5374796C65 - 070F77784D6E7549746D5F4E6F726D616C12436172726965642E57785F436170 - 74696F6E060526436F707912436172726965642E57785F436865636B65640816 - 436172726965642E57585F4249544D41502E446174610A0C0000000754426974 - 6D61700000000012436172726965642E4B656570466F726D6174081643617272 - 6965642E57785F46696C65486973746F72790800001100000054577843757374 - 6F6D4D656E754974656D5450463018547778437573746F6D4D656E754974656D - 577261707065720011436172726965642E49735375624D656E75081243617272 - 6965642E57785F456E61626C65640911436172726965642E57785F4869646465 - 6E0811436172726965642E57785F49444E616D65061149445F4D4E555F434C45 - 41525F3132353412436172726965642E57785F494456616C756503E604184361 - 72726965642E57785F4D656E754974656D5374796C65070F77784D6E7549746D - 5F4E6F726D616C12436172726965642E57785F43617074696F6E060643266C65 - 617212436172726965642E57785F436865636B65640816436172726965642E57 - 585F4249544D41502E446174610A0C00000007544269746D6170000000001243 - 6172726965642E4B656570466F726D61740816436172726965642E57785F4669 - 6C65486973746F7279080000} - end - object DlgSaveDialog: TWxSaveFileDialog - Left = 411 - Top = 236 - Width = 28 - Height = 27 - TabOrder = 21 - Glyph.Data = { - 36090000424D3609000000000000360000002800000018000000180000000100 - 2000000000000009000000000000000000000000000000000000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080008080 - 8000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0 - C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0 - C000C0C0C000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C000C0C0C0000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000C0C0C000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C00000000000FFFF0000FFFFFF0000000000C0C0 - C000FFFF0000FFFF0000FFFFFF00C0C0C000C0C0C00000000000FFFF0000FFFF - FF0000000000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C00000000000FFFFFF00FFFF000000000000C0C0 - C000FFFF0000FFFF0000FFFFFF00C0C0C000C0C0C00000000000FFFFFF00FFFF - 000000000000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C00000000000FFFF0000FFFFFF0000000000C0C0 - C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C00000000000FFFF0000FFFF - FF0000000000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C00000000000FFFFFF00FFFF0000808000000000 - 0000000000000000000000000000000000000000000080800000FFFFFF00FFFF - 000000000000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C00000000000FFFF0000FFFFFF00FFFF0000FFFF - FF00FFFF0000FFFFFF00FFFF0000FFFFFF00FFFF0000FFFFFF00FFFF0000FFFF - FF0000000000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C00000000000FFFFFF0080800000000000000000 - 000000000000000000000000000000000000000000000000000080800000FFFF - 000000000000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C00000000000FFFF000000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000FFFF - FF0000000000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C00000000000FFFFFF0000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000FFFF - 000000000000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C00000000000FFFF000000000000FFFFFF008000 - 00008000000080000000FFFFFF008000000080000000FFFFFF0000000000FFFF - FF0000000000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C00000000000FFFFFF0000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000FFFF - 000000000000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C000000000000000000000000000FFFFFF008000 - 00008000000080000000800000008000000080000000FFFFFF00000000000000 - 000000000000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C00000000000C0C0C00000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000C0C0 - C00000000000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C000C0C0C0000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000C0C0C000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0 - C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0C000C0C0 - C000C0C0C000C0C0C000C0C0C000C0C0C0000000000000808000008080008080 - 8000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000808000008080008080 - 8000FFFFFF0000000000FF000000FF000000FF000000FF000000FF000000FF00 - 0000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF00 - 000000000000FFFFFF0000000000FFFFFF000000000000808000008080008080 - 8000808080008080800080808000808080008080800080808000808080008080 - 8000808080008080800080808000808080008080800080808000808080008080 - 8000808080008080800080808000808080008080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000} - Wx_Class = 'wxFileDialog' - Wx_Message = 'Choose a file' - Wx_Extensions = '*.*' - Wx_DialogStyle = [] - end - object MnuProjectPopup: TWxPopupMenu - Left = 520 - Top = 2 - Width = 28 - Height = 27 - TabOrder = 18 - Glyph.Data = { - 36090000424D3609000000000000360000002800000018000000180000000100 - 2000000000000009000000000000000000000000000000000000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000000000000000 - 0000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000000000FFFFFF00FFFF - FF00000000000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000000000000808000008080000080800000000000FFFFFF00FFFF - FF00000000000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 80000080800000000000000000000080800000000000FFFFFF00FFFFFF000000 - 0000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 80000080800000000000FFFFFF000000000000000000FFFFFF00FFFFFF000000 - 0000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 80000080800000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 80000080800000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000000 - 0000000000000000000000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 80000080800000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00000000000080800000808000008080000080800000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 80000080800000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000 - 0000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000000000000000000000000000000000000000 - 00000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF0000000000FFFFFF00FFFFFF00FFFFFF0000000000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000FFFFFF008000000080000000800000008000 - 00008000000000000000FFFFFF00FFFFFF000000000000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000800000008000000080000000800000008000 - 00008000000000000000FFFFFF00000000000000000000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 800000808000008080008080800080000000FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF000000000000000000800000000000000000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000800000008000000080000000800000008000 - 0000800000008000000080000000800000000000000000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000FFFFFF008000000080000000800000008000 - 000080000000FFFFFF00FFFFFF00FFFFFF000000000000808000008080000080 - 8000008080000080800000808000008080000080800000808000008080000080 - 8000008080000080800080808000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000000000808000008080000080 - 80000080800000808000008080000080800000808000008080000080... [truncated message content] |