Menu
▾
▴
[Wxdevide-svn] SF.net SVN: wxdevide:[15] trunk/wxdevide/source
|
From: <ni...@us...> - 2010-09-05 18:22:44
|
Revision: 15
http://wxdevide.svn.sourceforge.net/wxdevide/?rev=15&view=rev
Author: ninjanl
Date: 2010-09-05 18:22:36 +0000 (Sun, 05 Sep 2010)
Log Message:
-----------
Small changes needed to build using wxWidgets SVN build. Don't forget to add WXW29 to the compiler defines to support the build.
Modified Paths:
--------------
trunk/wxdevide/source/Compiler.cpp
trunk/wxdevide/source/DevCfg.cpp
trunk/wxdevide/source/Editor.cpp
trunk/wxdevide/source/EnviroFrm.cpp
trunk/wxdevide/source/LangFrm.cpp
trunk/wxdevide/source/LangFrm.h
trunk/wxdevide/source/MainFrm.cpp
trunk/wxdevide/source/NewProjectFrm.cpp
trunk/wxdevide/source/SearchCenter.cpp
trunk/wxdevide/source/ToolEditForm.cpp
trunk/wxdevide/source/ToolEditFrm.cpp
trunk/wxdevide/source/Utils.cpp
trunk/wxdevide/source/devcppApp.cpp
trunk/wxdevide/source/devcppApp.h
trunk/wxdevide/source/oysUtils.cpp
Modified: trunk/wxdevide/source/Compiler.cpp
===================================================================
--- trunk/wxdevide/source/Compiler.cpp 2009-09-16 20:17:38 UTC (rev 14)
+++ trunk/wxdevide/source/Compiler.cpp 2010-09-05 18:22:36 UTC (rev 15)
@@ -108,6 +108,10 @@
Objects = wxT("");
+ //MN REMOVE ME
+ return RetVal; //here to get program to compile
+ //MN REMOVE ME
+
// create the object output directory if we have to
/*if( ( fProject.CurrentProfile.ObjectOutput != "" ) && ( !DirectoryExists( fProject.CurrentProfile.ObjectOutput ) ) )
ForceDirectories( GetRealPath( SubstituteMakeParams( fProject.CurrentProfile.ObjectOutput ) , fProject.Directory ) );
Modified: trunk/wxdevide/source/DevCfg.cpp
===================================================================
--- trunk/wxdevide/source/DevCfg.cpp 2009-09-16 20:17:38 UTC (rev 14)
+++ trunk/wxdevide/source/DevCfg.cpp 2010-09-05 18:22:36 UTC (rev 15)
@@ -162,7 +162,11 @@
BadDirs = BadDirs.AfterFirst(';');
wxSetWorkingDirectory(currdir);
+#ifndef WXW29
if(badDirs)
+#else
+ if(badDirs.IsEmpty())
+#endif
{
badDirs.Empty();
badDirs.Append(BadDirs);
@@ -174,7 +178,7 @@
void InitializeOptions()
{
DevDirs = TdevDirs::GetInstance();
-
+
DevCompilerSet = TdevCompilerSet::GetInstance();
DevCompiler = TdevCompiler::GetInstance();
@@ -245,7 +249,7 @@
DevDirs->SetCompilerType(1);
DevDirs->SetToDefaults();
//Guru: todo: Add More Compiler default sets here
-
+
//DevCompilerSet->LoadSet(DevCompiler->GetCompilerSet());
DevCompiler->AddDefaultOptions();
DevCompilerSet->AssignToCompiler();
@@ -284,7 +288,7 @@
wxLogError(wxT("Function FinalizeOptions - devcfg.cpp is a stub"));
#endif
//DevData->Free;
-
+
DevCompiler->SaveSettings();
//devCompiler.Free;
@@ -375,7 +379,7 @@
fDblFiles = LoadBoolSetting(wxT("DblFiles"), false); // double click opens files out of project manager
//bool fLangChange = LoadBoolSetting(wxT("MsgTabs"), true); // flag for language change
//bool fThemeChange = LoadBoolSetting(wxT("MsgTabs"), true); // did the theme changed
-
+
#ifdef DEBUG
wxLogError(wxT("Function LoadSettings - devcfg.cpp is incomplete"));
#endif
@@ -433,11 +437,11 @@
// Debug variable browser
fWatchHint = LoadBoolSetting(wxT("WatchHint"), true); // watch variable under mouse
fWatchError = LoadBoolSetting(wxT("WatchError"), true); // report watch errors
-
+
//Alt config file
fUseAltConfigFile = LoadBoolSetting(wxT("UseAltConfigFile"),false);
fAltConfigFile = LoadSetting(wxT("AltConfigFile"));
-
+
//'Position'
//LoadPerspective(fWinPlace);*/
}
@@ -630,7 +634,7 @@
// TCompilerOpts }
void TdevCompiler::AddDefaultOptions()
{
-
+
wxArrayString sl;
TProjTypeSet ProjTypeSet, NullProjSet;
// WARNING: do *not* re-arrange the options. Their values are written to the ini file
@@ -1283,7 +1287,7 @@
wxString _Setting,wxString _Section,TProjTypeSet ExcludeFromTypes, wxArrayString Choices)
{
struct TCompilerOption TempCompilerOption;
-
+
//Fill the structure with the options passed in
TempCompilerOption.optName = _Name;
TempCompilerOption.optIsGroup = _IsGroup;
@@ -1295,7 +1299,7 @@
TempCompilerOption.optSection = _Section;
TempCompilerOption.optExcludeFromTypes = ExcludeFromTypes;
TempCompilerOption.optChoices = Choices;
-
+
fOptions.Add(TempCompilerOption);
}
@@ -1355,7 +1359,7 @@
{
DevData->SetKey(wxT("Compiler"));
TCompilerOption opt;
-
+
wxString TempString;
fUseParams = DevData->LoadBoolSetting(wxT("UseParams"));
fRunParams = DevData->LoadSetting(wxT("RunParams"));
@@ -1393,7 +1397,7 @@
void TdevCompiler::SaveSettings()
{
wxString TempString;
-
+
DevData->SetKey(wxT("Compiler"));
DevData->SaveBoolSetting(wxT("UseParams"), fUseParams);
DevData->SaveSetting(wxT("RunParams"), fRunParams);
@@ -1414,9 +1418,9 @@
{
TempString += BoolVal10[fOptions[i].optValue];
DevData->SaveSetting(wxT("Options"), TempString);
- /* TODO (SofT#1#): Check with original .pas file and make sure the
+ /* TODO (SofT#1#): Check with original .pas file and make sure the
translation is understood */
-
+
}
DevData->SaveBoolSetting(wxT("Makefile"), wxT("FastDep"), fFastDep);
@@ -1433,11 +1437,11 @@
// Programs
fCompilerSet = Value;
if(DevDirs->GetOriginalPath().Cmp(wxT(""))==0) // first time only
- /* TODO (SofT#1#): Check that this is correct. Do we want to get the path
+ /* TODO (SofT#1#): Check that this is correct. Do we want to get the path
only or path and executable name */
DevDirs->SetOriginalPath(wxStandardPaths::Get().GetExecutablePath());
SetPath(DevDirs->GetBins());
-
+
DevCompilerSet->LoadSet(Value);
fgccName = DevCompilerSet->GetgccName();
fgppName = DevCompilerSet->GetgppName();
@@ -1483,7 +1487,7 @@
RetVal = 1;
else
RetVal = 0;
-
+
return RetVal;
}
@@ -1548,7 +1552,7 @@
fLibDir = ValidatePaths(LIB_DIR(fCompilerType), tempstr);
fRCDir = ValidatePaths(RC_INCLUDE_DIR(fCompilerType), tempstr);
fRCDir = wxT("");
-
+
fExec = wxFileName(wxStandardPaths::Get().GetExecutablePath()).GetPath() + wxString(PATH_SEP);
fConfig = fExec;
fHelp = fExec + HELP_DIR;
@@ -1562,7 +1566,7 @@
void TdevDirs::LoadSettings()
{
DevData->SetKey(wxT("Directories"));
-
+
//Load Settings
fCompilerType = DevData->LoadIntSetting(wxT("CompilerType"));
fBinDir = DevData->LoadSetting(wxT("Bins"));
@@ -1622,7 +1626,7 @@
//Perform the following check if running windows
//Linux, etc don't have the concept of drive letters
/* TODO (SofT#1#): Do we need to perform a similar check for Linux? */
-
+
#if defined (__WXMSW__)
// if we are called by double-clicking a .dev file in explorer,
// we must perform the next checks or else the dirs are
@@ -1677,14 +1681,14 @@
fCompression = (wxByte) DevData->LoadIntSetting(wxT("Compression"));
fExecutable = DevData->LoadSetting(wxT("Executable"));
/* TODO (SofT#1#): Do we want to save and load repositories? */
-
+
}
void TdevCVSHandler::SaveSettings()
{
//devData.SaveObject(Self);
DevData->SetKey(StrName);
-
+
DevData->SaveBoolSetting(wxT("UseSSH"), fUseSSH);
DevData->SaveIntSetting(wxT("Compression"), (int) fCompression);
DevData->SaveSetting(wxT("Executable"), fExecutable);
@@ -1826,35 +1830,60 @@
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");
- msg += tempStr.Replace(wxString(wxT(";")).mb_str(),wxString(wxT("\r\n")).mb_str());
+#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())
@@ -2353,7 +2382,7 @@
TempFont.SetFamily(wxFONTFAMILY_MODERN);
TempFont.SetPointSize(DevData->LoadIntSetting(wxT("Size")));
fFont.SetChosenFont(TempFont);
-
+
DevData->SetKey(wxT("Editor.GutterFont"));
TempColourString = DevData->LoadSetting(wxT("Color"));
if(TempColourString.find(wxT("cl")) != wxString::npos)
@@ -2370,12 +2399,12 @@
TempFont.SetFamily(wxFONTFAMILY_MODERN);
TempFont.SetPointSize(DevData->LoadIntSetting(wxT("Size")));
fGutterFont.SetChosenFont(TempFont);
-
+
//wxString fActiveSyn; // Active syntax highlighting set
-
+
//Load the syntax colourizing
DevData->SetKey(wxT("Editor.Syntax"));
-
+
fSyntax.Add(wxString(wxT("Assembler=")) + DevData->LoadSetting(wxT("Assembler")));
fSyntax.Add(wxString(wxT("Character=")) + DevData->LoadSetting(wxT("Character")));
fSyntax.Add(wxString(wxT("Comment=")) + DevData->LoadSetting(wxT("Comment")));
@@ -2408,7 +2437,7 @@
void TdevEditor::SetToDefaults()
{
- wxFont TempFont;
+ wxFont TempFont;
TempFont.SetFaceName(wxT("Courier New"));
TempFont.SetFamily(wxFONTFAMILY_MODERN);
TempFont.SetPointSize(10);
@@ -2474,7 +2503,7 @@
void TdevEditor::AssignEditor(wxStyledTextCtrl * Editor)
{
-
+
#ifdef DEBUG
wxLogError(wxT("Function AssignEditor - Devcfg.cpp is incomplete"));
#endif
@@ -2487,7 +2516,7 @@
Editor->SetUseTabs(fTabtoSpaces);
Editor->SetFont(fFont.GetChosenFont());
-
+
if(fShowGutter)
{
// do we need to show line numbers?
@@ -2501,9 +2530,9 @@
else
Editor->SetMarginWidth(0, 0);
}
-
+
// Margin for debugging symbols and such
-
+
Editor->SetMarginWidth(1, 16); //margin 1 16 px wide
Editor->SetMarginType(1, wxSTC_MARGIN_SYMBOL); //margin 1 for symbols,
Editor->SetMarginSensitive(2,true); //Make this margin sensitive to mouse clicks
@@ -2539,7 +2568,7 @@
}
else
- Editor->SetMarginWidth(2, 0);
+ Editor->SetMarginWidth(2, 0);
//Editor->SetMarginWidth(3, 0); //Not used yet
//Editor->SetMarginWidth(4, 0); //Not used yet
@@ -2802,12 +2831,12 @@
{
//Result := fPrograms.Values[fPrograms.Names[Index]];
return fPrograms[Index].AfterLast('=');
- /* TODO (SofT#1#): Need to check what a TStrings object does and if this
+ /* TODO (SofT#1#): Need to check what a TStrings object does and if this
is a correct interpretation */
//I think this finds the string held in program.name and then locates the
//the value held by this name. I think this interpretation is correct to check
//Second thoughts maybe wxHashMap is closer to this.
-
+
}
void TdevExternalPrograms::LoadSettings()
Modified: trunk/wxdevide/source/Editor.cpp
===================================================================
--- trunk/wxdevide/source/Editor.cpp 2009-09-16 20:17:38 UTC (rev 14)
+++ trunk/wxdevide/source/Editor.cpp 2010-09-05 18:22:36 UTC (rev 15)
@@ -657,6 +657,10 @@
}
else
fText.Invalidate;*/
+
+ //MN REMOVE ME
+ return false;
+ //MN REMOVE ME
}
int TEditor::HasBreakPoint(int line_number)
Modified: trunk/wxdevide/source/EnviroFrm.cpp
===================================================================
--- trunk/wxdevide/source/EnviroFrm.cpp 2009-09-16 20:17:38 UTC (rev 14)
+++ trunk/wxdevide/source/EnviroFrm.cpp 2010-09-05 18:22:36 UTC (rev 15)
@@ -26,7 +26,7 @@
BEGIN_EVENT_TABLE(TEnviroForm,wxDialog)
////Manual Code Start
////Manual Code End
-
+
EVT_CLOSE(TEnviroForm::OnClose)
END_EVENT_TABLE()
////Event Table End
@@ -39,7 +39,7 @@
TEnviroForm::~TEnviroForm()
{
-}
+}
void TEnviroForm::CreateGUIControls()
{
@@ -55,142 +55,142 @@
this->SetSizer(EnvOptDlgSizer);
this->SetAutoLayout(true);
- PagesMain = XRCCTRL(*this, wxT("PagesMain"), wxNotebook);
+ PagesMain = XRCCTRL(*this, "PagesMain", wxNotebook);
- tabGeneral = XRCCTRL(*PagesMain, wxT("tabGeneral"), wxPanel);
+ tabGeneral = XRCCTRL(*PagesMain, "tabGeneral", wxPanel);
- cbSingleInstance = XRCCTRL(*tabGeneral, wxT("cbSingleInstance"), wxCheckBox);
+ cbSingleInstance = XRCCTRL(*tabGeneral, "cbSingleInstance", wxCheckBox);
- cbBackups = XRCCTRL(*tabGeneral, wxT("cbBackups"), wxCheckBox);
+ cbBackups = XRCCTRL(*tabGeneral, "cbBackups", wxCheckBox);
- cbMinOnRun = XRCCTRL(*tabGeneral, wxT("cbMinOnRun"), wxCheckBox);
+ cbMinOnRun = XRCCTRL(*tabGeneral, "cbMinOnRun", wxCheckBox);
- cbShowBars = XRCCTRL(*tabGeneral, wxT("cbShowBars"), wxCheckBox);
+ cbShowBars = XRCCTRL(*tabGeneral, "cbShowBars", wxCheckBox);
- cbShowMenu = XRCCTRL(*tabGeneral, wxT("cbShowMenu"), wxCheckBox);
+ cbShowMenu = XRCCTRL(*tabGeneral, "cbShowMenu", wxCheckBox);
- cbDblFiles = XRCCTRL(*tabGeneral, wxT("cbDblFiles"), wxCheckBox);
+ cbDblFiles = XRCCTRL(*tabGeneral, "cbDblFiles", wxCheckBox);
- rgbAutoOpen = XRCCTRL(*tabGeneral, wxT("rgbAutoOpen"), wxRadioBox);
+ rgbAutoOpen = XRCCTRL(*tabGeneral, "rgbAutoOpen", wxRadioBox);
rgbAutoOpen->SetSelection(0);
- cbWatchHint = XRCCTRL(*tabGeneral, wxT("cbWatchHint"), wxCheckBox);
+ cbWatchHint = XRCCTRL(*tabGeneral, "cbWatchHint", wxCheckBox);
- cbWatchError = XRCCTRL(*tabGeneral, wxT("cbWatchError"), wxCheckBox);
+ cbWatchError = XRCCTRL(*tabGeneral, "cbWatchError", wxCheckBox);
- tabInterface = XRCCTRL(*PagesMain, wxT("tabInterface"), wxPanel);
+ tabInterface = XRCCTRL(*PagesMain, "tabInterface", wxPanel);
- lblMRU = XRCCTRL(*tabInterface, wxT("lblMRU"), wxStaticText);
+ lblMRU = XRCCTRL(*tabInterface, "lblMRU", wxStaticText);
- lblMRU = XRCCTRL(*tabInterface, wxT("lblMRU"), wxStaticText);
+ lblMRU = XRCCTRL(*tabInterface, "lblMRU", wxStaticText);
- seMRUMax = XRCCTRL(*tabInterface, wxT("seMRUMax"), wxSpinCtrl);
+ seMRUMax = XRCCTRL(*tabInterface, "seMRUMax", wxSpinCtrl);
- lblmsgTabs = XRCCTRL(*tabInterface, wxT("lblmsgTabs"), wxStaticText);
+ lblmsgTabs = XRCCTRL(*tabInterface, "lblmsgTabs", wxStaticText);
- cboTabsTop = XRCCTRL(*tabInterface, wxT("cboTabsTop"), wxComboBox);
+ cboTabsTop = XRCCTRL(*tabInterface, "cboTabsTop", wxComboBox);
- lblLang = XRCCTRL(*tabInterface, wxT("lblLang"), wxStaticText);
+ lblLang = XRCCTRL(*tabInterface, "lblLang", wxStaticText);
- cboLang = XRCCTRL(*tabInterface, wxT("cboLang"), wxComboBox);
+ cboLang = XRCCTRL(*tabInterface, "cboLang", wxComboBox);
- lblTheme = XRCCTRL(*tabInterface, wxT("lblTheme"), wxStaticText);
+ lblTheme = XRCCTRL(*tabInterface, "lblTheme", wxStaticText);
- cboTheme = XRCCTRL(*tabInterface, wxT("cboTheme"), wxComboBox);
+ cboTheme = XRCCTRL(*tabInterface, "cboTheme", wxComboBox);
- cbNoSplashScreen = XRCCTRL(*tabInterface, wxT("cbNoSplashScreen"), wxCheckBox);
+ cbNoSplashScreen = XRCCTRL(*tabInterface, "cbNoSplashScreen", wxCheckBox);
- cbXPTheme = XRCCTRL(*tabInterface, wxT("cbXPTheme"), wxCheckBox);
+ cbXPTheme = XRCCTRL(*tabInterface, "cbXPTheme", wxCheckBox);
- cbNativeDocks = XRCCTRL(*tabInterface, wxT("cbNativeDocks"), wxCheckBox);
+ cbNativeDocks = XRCCTRL(*tabInterface, "cbNativeDocks", wxCheckBox);
- rgbOpenStyle = XRCCTRL(*tabInterface, wxT("rgbOpenStyle"), wxRadioBox);
+ rgbOpenStyle = XRCCTRL(*tabInterface, "rgbOpenStyle", wxRadioBox);
rgbOpenStyle->SetSelection(0);
- cbShowProgress = XRCCTRL(*tabInterface, wxT("cbShowProgress"), wxCheckBox);
+ cbShowProgress = XRCCTRL(*tabInterface, "cbShowProgress", wxCheckBox);
- cbAutoCloseProgress = XRCCTRL(*tabInterface, wxT("cbAutoCloseProgress"), wxCheckBox);
+ cbAutoCloseProgress = XRCCTRL(*tabInterface, "cbAutoCloseProgress", wxCheckBox);
- tabPaths = XRCCTRL(*PagesMain, wxT("tabPaths"), wxPanel);
+ tabPaths = XRCCTRL(*PagesMain, "tabPaths", wxPanel);
- chkAltConfig = XRCCTRL(*tabPaths, wxT("chkAltConfig"), wxCheckBox);
+ chkAltConfig = XRCCTRL(*tabPaths, "chkAltConfig", wxCheckBox);
- edAltConfig = XRCCTRL(*tabPaths, wxT("edAltConfig"), wxTextCtrl);
+ edAltConfig = XRCCTRL(*tabPaths, "edAltConfig", wxTextCtrl);
- btnAltConfig = XRCCTRL(*tabPaths, wxT("btnAltConfig"), wxBitmapButton);
+ btnAltConfig = XRCCTRL(*tabPaths, "btnAltConfig", wxBitmapButton);
- lblUserDir = XRCCTRL(*tabPaths, wxT("lblUserDir"), wxStaticText);
+ lblUserDir = XRCCTRL(*tabPaths, "lblUserDir", wxStaticText);
- edUserDir = XRCCTRL(*tabPaths, wxT("edUserDir"), wxTextCtrl);
+ edUserDir = XRCCTRL(*tabPaths, "edUserDir", wxTextCtrl);
- btnDefBrws = XRCCTRL(*tabPaths, wxT("btnDefBrws"), wxBitmapButton);
+ btnDefBrws = XRCCTRL(*tabPaths, "btnDefBrws", wxBitmapButton);
- lblTemplatesDir = XRCCTRL(*tabPaths, wxT("lblTemplatesDir"), wxStaticText);
+ lblTemplatesDir = XRCCTRL(*tabPaths, "lblTemplatesDir", wxStaticText);
- edTemplatesDir = XRCCTRL(*tabPaths, wxT("edTemplatesDir"), wxTextCtrl);
+ edTemplatesDir = XRCCTRL(*tabPaths, "edTemplatesDir", wxTextCtrl);
- btnOutputbrws = XRCCTRL(*tabPaths, wxT("btnOutputbrws"), wxBitmapButton);
+ btnOutputbrws = XRCCTRL(*tabPaths, "btnOutputbrws", wxBitmapButton);
- lblIcoLib = XRCCTRL(*tabPaths, wxT("lblIcoLib"), wxStaticText);
+ lblIcoLib = XRCCTRL(*tabPaths, "lblIcoLib", wxStaticText);
- edIcoLib = XRCCTRL(*tabPaths, wxT("edIcoLib"), wxTextCtrl);
+ edIcoLib = XRCCTRL(*tabPaths, "edIcoLib", wxTextCtrl);
- btnBrwIcon = XRCCTRL(*tabPaths, wxT("btnBrwIcon"), wxBitmapButton);
+ btnBrwIcon = XRCCTRL(*tabPaths, "btnBrwIcon", wxBitmapButton);
- lblLangPath = XRCCTRL(*tabPaths, wxT("lblLangPath"), wxStaticText);
+ lblLangPath = XRCCTRL(*tabPaths, "lblLangPath", wxStaticText);
- edLang = XRCCTRL(*tabPaths, wxT("edLang"), wxTextCtrl);
+ edLang = XRCCTRL(*tabPaths, "edLang", wxTextCtrl);
- btnBrwLang = XRCCTRL(*tabPaths, wxT("btnBrwLang"), wxBitmapButton);
+ btnBrwLang = XRCCTRL(*tabPaths, "btnBrwLang", wxBitmapButton);
- lblSplash = XRCCTRL(*tabPaths, wxT("lblSplash"), wxStaticText);
+ lblSplash = XRCCTRL(*tabPaths, "lblSplash", wxStaticText);
- edSplash = XRCCTRL(*tabPaths, wxT("edSplash"), wxTextCtrl);
+ edSplash = XRCCTRL(*tabPaths, "edSplash", wxTextCtrl);
- btnBrwSplash = XRCCTRL(*tabPaths, wxT("btnBrwSplash"), wxBitmapButton);
+ btnBrwSplash = XRCCTRL(*tabPaths, "btnBrwSplash", wxBitmapButton);
- tabExternal = XRCCTRL(*PagesMain, wxT("tabExternal"), wxPanel);
+ tabExternal = XRCCTRL(*PagesMain, "tabExternal", wxPanel);
- lblExternal = XRCCTRL(*tabExternal, wxT("lblExternal"), wxStaticText);
+ lblExternal = XRCCTRL(*tabExternal, "lblExternal", wxStaticText);
- vleExternal = XRCCTRL(*tabExternal, wxT("vleExternal"), wxListCtrl);
- vleExternal->InsertColumn(0,wxT("External Program"),wxLIST_FORMAT_LEFT,393 );
- vleExternal->InsertColumn(0,wxT("Extension"),wxLIST_FORMAT_LEFT,50 );
+ vleExternal = XRCCTRL(*tabExternal, "vleExternal", wxListCtrl);
+ vleExternal->InsertColumn(0,"External Program",wxLIST_FORMAT_LEFT,393 );
+ vleExternal->InsertColumn(0,"Extension",wxLIST_FORMAT_LEFT,50 );
- btnExtAdd = XRCCTRL(*tabExternal, wxT("btnExtAdd"), wxButton);
+ btnExtAdd = XRCCTRL(*tabExternal, "btnExtAdd", wxButton);
- btnExtDel = XRCCTRL(*tabExternal, wxT("btnExtDel"), wxButton);
+ btnExtDel = XRCCTRL(*tabExternal, "btnExtDel", wxButton);
- tabAssocs = XRCCTRL(*PagesMain, wxT("tabAssocs"), wxPanel);
+ tabAssocs = XRCCTRL(*PagesMain, "tabAssocs", wxPanel);
- lblAssocFileTypes = XRCCTRL(*tabAssocs, wxT("lblAssocFileTypes"), wxStaticText);
+ lblAssocFileTypes = XRCCTRL(*tabAssocs, "lblAssocFileTypes", wxStaticText);
- lstAssocFileTypes = XRCCTRL(*tabAssocs, wxT("lstAssocFileTypes"), wxCheckListBox);
+ lstAssocFileTypes = XRCCTRL(*tabAssocs, "lstAssocFileTypes", wxCheckListBox);
- lblAssocDesc = XRCCTRL(*tabAssocs, wxT("lblAssocDesc"), wxStaticText);
+ lblAssocDesc = XRCCTRL(*tabAssocs, "lblAssocDesc", wxStaticText);
- tabCVS = XRCCTRL(*PagesMain, wxT("tabCVS"), wxPanel);
+ tabCVS = XRCCTRL(*PagesMain, "tabCVS", wxPanel);
- lblCVSExec = XRCCTRL(*tabCVS, wxT("lblCVSExec"), wxStaticText);
+ lblCVSExec = XRCCTRL(*tabCVS, "lblCVSExec", wxStaticText);
- edCVSExec = XRCCTRL(*tabCVS, wxT("edCVSExec"), wxTextCtrl);
+ edCVSExec = XRCCTRL(*tabCVS, "edCVSExec", wxTextCtrl);
- WxBitmapButton1 = XRCCTRL(*tabCVS, wxT("WxBitmapButton1"), wxBitmapButton);
+ WxBitmapButton1 = XRCCTRL(*tabCVS, "WxBitmapButton1", wxBitmapButton);
- lblCVSCompression = XRCCTRL(*tabCVS, wxT("lblCVSCompression"), wxStaticText);
+ lblCVSCompression = XRCCTRL(*tabCVS, "lblCVSCompression", wxStaticText);
- spnCVSCompression = XRCCTRL(*tabCVS, wxT("spnCVSCompression"), wxSpinCtrl);
+ spnCVSCompression = XRCCTRL(*tabCVS, "spnCVSCompression", wxSpinCtrl);
- chkCVSUseSSH = XRCCTRL(*tabCVS, wxT("chkCVSUseSSH"), wxCheckBox);
+ chkCVSUseSSH = XRCCTRL(*tabCVS, "chkCVSUseSSH", wxCheckBox);
- SetTitle(wxT("Environment Options"));
+ SetTitle("Environment Options");
SetIcon(wxNullIcon);
-
+
GetSizer()->Layout();
GetSizer()->Fit(this);
GetSizer()->SetSizeHints(this);
Center();
-
+
////GUI Items Creation End
// lblAssocDesc->Wrap(GetSizer()->GetSize().GetWidth());
}
@@ -215,7 +215,7 @@
{
extern TdevData * DevData;
extern TdevDirs * DevDirs;
-
+
//General Info First
cbSingleInstance->SetValue(DevData->GetSingleInstance());
cbBackups->SetValue(DevData->GetBackUps());
@@ -226,7 +226,7 @@
rgbAutoOpen->SetSelection(DevData->GetAutoOpen());
cbWatchHint->SetValue(DevData->GetWatchHint());
cbWatchError->SetValue(DevData->GetWatchError());
-
+
//Interface Window Next
seMRUMax->SetValue(DevData->GetMRUMax());
// cboTabsTop->SetValue(DevData->GetMsgTabs());
@@ -234,14 +234,14 @@
// Fill the Language combo with the language list here
// Fill the Theme Combobox here
cboTheme->Clear();
-
+
cbNoSplashScreen->SetValue(DevData->GetNoSplashScreen());
cbXPTheme->SetValue(DevData->GetXPTheme());
cbNativeDocks->SetValue(DevData->GetNativeDocks());
rgbOpenStyle->SetSelection(DevData->GetOpenStyle());
cbShowProgress->SetValue(DevData->GetShowProgress());
cbAutoCloseProgress->SetValue(DevData->GetAutoCloseProgress());
-
+
//Files and Directories
chkAltConfig->SetValue(DevData->GetUseAltConfigFile());
edAltConfig->SetValue(DevData->GetAltConfigFile());
@@ -250,17 +250,17 @@
edIcoLib->SetValue(DevDirs->GetIcons());
edLang->SetValue(DevDirs->GetLang());
edSplash->SetValue(DevData->GetSplash());
-
+
//External programs
//fill the view with our data
//vleExternal->
-
+
//File Associations
//lstAssocFileTypes->
-
+
//Source Code Control
//edCVSExec->
-
+
return true;
}
/*!
@@ -270,7 +270,7 @@
{
extern TdevData * DevData;
extern TdevDirs * DevDirs;
-
+
//General Info First
DevData->SetSingleInstance(cbSingleInstance->GetValue());
DevData->SetBackUps(cbBackups->GetValue());
@@ -281,7 +281,7 @@
DevData->SetAutoOpen(rgbAutoOpen->GetSelection());
DevData->SetWatchHint(cbWatchHint->GetValue());
DevData->SetWatchError(cbWatchError->GetValue());
-
+
//Interface Window Next
seMRUMax->SetValue(DevData->GetMRUMax());
// cboTabsTop->SetValue(DevData->GetMsgTabs());
@@ -316,6 +316,6 @@
//Source Code Control
//edCVSExec->
-
+
return true;
}
Modified: trunk/wxdevide/source/LangFrm.cpp
===================================================================
--- trunk/wxdevide/source/LangFrm.cpp 2009-09-16 20:17:38 UTC (rev 14)
+++ trunk/wxdevide/source/LangFrm.cpp 2010-09-05 18:22:36 UTC (rev 15)
@@ -13,6 +13,8 @@
#include "Utils.h"
#include "devcfg.h" //To access singleton data objects
#include "DevTheme.h" //To access DevTheme
+#include <wx/tokenzr.h> //Used in StrToList
+
//Do not add custom headers
//wxDev-C++ designer will remove them
////Header Include Start
@@ -34,7 +36,7 @@
BEGIN_EVENT_TABLE(LangFrm,wxDialog)
////Manual Code Start
////Manual Code End
-
+
EVT_CLOSE(LangFrm::OnClose)
EVT_BUTTON(ID_OKBTN,LangFrm::OkBtnClick)
EVT_CHECKBOX(ID_XPCHECKBOX,LangFrm::XPCheckBoxClick)
@@ -52,7 +54,7 @@
LangFrm::~LangFrm()
{
-}
+}
void LangFrm::CreateGUIControls()
{
@@ -187,12 +189,12 @@
SetTitle(_("wxDev-C++ First-Run Configuration"));
SetIcon(wxNullIcon);
-
+
GetSizer()->Layout();
GetSizer()->Fit(this);
GetSizer()->SetSizeHints(this);
Center();
-
+
////GUI Items Creation End
OkBtnTag = 0;
FormActivate();
@@ -331,13 +333,13 @@
//MainForm.ClassBrowser1.SetUpdateOff;
if( ( DirCheckBox->IsChecked() ) )
- StrToList( DirEdit->GetValue() , s );
+ ;//mn StrToList( DirEdit->GetValue() , s );
else
{
//we add the wx's MSW dir because lot of wx classes get screwed up
//by the forward declaration. Stupid C++ Forward declarations!
- StrToList( DevDirs->GetCpp() + wxT(";"), s );
+ ;//mn StrToList( (DevDirs->GetCpp() + wxT(";")), s );
}
for( i = 0 ; i < s.Count() ; ++i )
@@ -348,7 +350,7 @@
GetParent()->SetCursor(*wxHOURGLASS_CURSOR);
wxSafeYield(GetParent());
for( j = 0 ; j < f.Count() ; ++j )
- {
+ {
//MainForm.CppParser1.AddFileToScan( f[ j ] );
}
}
@@ -371,7 +373,7 @@
//s.Free;
//f.Free;
}
- else
+ else
{
DevClassBrowsing->SetEnabled(true);
DevClassBrowsing->SetParseLocalHeaders(true);
@@ -410,7 +412,7 @@
}
void LangFrm::FormActivate()
-{
+{
wxString s;
wxArrayString sl;
@@ -422,7 +424,7 @@
Image2->SetBitmap(_wxGetBitmapFromMemory(themeblue_bmp,sizeof(themenewlook_bmp)));
s = wxGetUserName();
#ifdef BETAVERSION
- wxMessageBox(wxString(wxT("This is a beta version of wxDev-C++.\n))
+ wxMessageBox(wxString(wxT("This is a beta version of wxDev-C++.\n"))
+wxT("Please report bugs to https://sourceforge.net/tracker/?group_id=95606&atid=611982.\n")
+wxT("Your configuration files will be stored in ") + ExtractFileDir( devData.INIFile ) + wxT(".\n")
+wxT("You can change the directory in Tools > Environment Options > Files & Directories or \n")
Modified: trunk/wxdevide/source/LangFrm.h
===================================================================
--- trunk/wxdevide/source/LangFrm.h 2009-09-16 20:17:38 UTC (rev 14)
+++ trunk/wxdevide/source/LangFrm.h 2010-09-05 18:22:36 UTC (rev 15)
@@ -21,7 +21,7 @@
#include <wx/wxprec.h>
#endif
-//Do not add custom headers between
+//Do not add custom headers between
//Header Include Start and Header Include End.
//wxDev-C++ designer will remove them. Add custom headers after the block.
////Header Include Start
@@ -39,6 +39,8 @@
#include <wx/statbmp.h>
#include <wx/panel.h>
#include <wx/sizer.h>
+#include <wx/tokenzr.h> //Used in StrToList
+
////Header Include End
#include "oysUtils.h" //To access ToysStringList
////Dialog Style Start
@@ -50,7 +52,7 @@
{
private:
DECLARE_EVENT_TABLE();
-
+
public:
LangFrm(wxWindow *parent, wxWindowID id = 1, const wxString &title = wxT("wxDev-C++ First-Run Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = LangFrm_STYLE);
virtual ~LangFrm();
@@ -59,9 +61,9 @@
void ThemeBoxSelected(wxCommandEvent& event );
void XPCheckBoxClick(wxCommandEvent& event);
void OkBtnClick(wxCommandEvent& event);
-
+
private:
- //Do not add custom control declarations between
+ //Do not add custom control declarations between
//GUI Control Declaration Start and GUI Control Declaration End.
//wxDev-C++ will remove them. Add custom code after the block.
////GUI Control Declaration Start
@@ -104,7 +106,7 @@
////GUI Control Declaration End
int OkBtnTag;
bool HasProgressStarted;
-
+
private:
//Note: if you receive any error with these enum IDs, then you need to
//change your old form code that are based on the #define control IDs.
@@ -150,7 +152,7 @@
////GUI Enum Control ID End
ID_DUMMY_VALUE_ //don't remove this value unless you have other enum values
};
-
+
private:
void OnClose(wxCloseEvent& event);
void CreateGUIControls();
Modified: trunk/wxdevide/source/MainFrm.cpp
===================================================================
--- trunk/wxdevide/source/MainFrm.cpp 2009-09-16 20:17:38 UTC (rev 14)
+++ trunk/wxdevide/source/MainFrm.cpp 2010-09-05 18:22:36 UTC (rev 15)
@@ -80,7 +80,7 @@
////Manual Code Start
EVT_AUINOTEBOOK_PAGE_CHANGED(ID_NBKMESSAGECONTROL, MainFrm::MessageControlChange)
////Manual Code End
-
+
EVT_CLOSE(MainFrm::OnClose)
EVT_ACTIVATE(MainFrm::MainFrmActivate)
EVT_MENU(ID_MNU_HELPONWXDEV_C___1168 , MainFrm::ActionShowMainHelpFile)
@@ -495,7 +495,7 @@
MnuUnitPopup->Append(ID_MNU_REMOVEFOLDER_1205, _("Remove folder"), _(""), wxITEM_NORMAL);
MnuUnitPopup->AppendSeparator();
wxMenu *ID_MNU_VERSIONCONTROL_1207_Obj = new wxMenu();
-
+
wxMenu *ID_MNU_CVS_1270_Obj = new wxMenu();
ID_MNU_CVS_1270_Obj->Append(ID_MNU_UPDATE_1271, _("Update"), _(""), wxITEM_NORMAL);
ID_MNU_CVS_1270_Obj->Append(ID_MNU_DIFF_1272, _("Diff"), _(""), wxITEM_NORMAL);
@@ -507,7 +507,7 @@
ID_MNU_CVS_1270_Obj->Append(ID_MNU_ADD_1278, _("Add"), _(""), wxITEM_NORMAL);
ID_MNU_CVS_1270_Obj->Append(ID_MNU_REMOVE_1279, _("Remove"), _(""), wxITEM_NORMAL);
ID_MNU_VERSIONCONTROL_1207_Obj->Append(ID_MNU_CVS_1270, _("CVS"), ID_MNU_CVS_1270_Obj);
-
+
wxMenu *ID_MNU_SVN_1280_Obj = new wxMenu();
ID_MNU_SVN_1280_Obj->Append(ID_MNU_UPDATE_1281, _("Update"), _(""), wxITEM_NORMAL);
ID_MNU_SVN_1280_Obj->Append(ID_MNU_DIFF_1282, _("Diff"), _(""), wxITEM_NORMAL);
@@ -523,7 +523,11 @@
MnuUnitPopup->AppendSeparator();
MnuUnitPopup->Append(wxID_PROPERTIES, _("Properties"), _(""), wxITEM_NORMAL);
+#ifndef WXW29
DlgOpenDialog = new wxFileDialog(this, _("Choose a file"), _(""), _(""), _("*.*"), wxOPEN | wxMULTIPLE);
+#else
+ DlgOpenDialog = new wxFileDialog(this, _("Choose a file"), _(""), _(""), _("*.*"), wxFD_OPEN | wxFD_MULTIPLE);
+#endif
/* Project popup menu
*/
@@ -536,7 +540,7 @@
MnuProjectPopup->Append(ID_MNU_OPTIONS_1236, _("&Options"), _(""), 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, _("Update"), _(""), wxITEM_NORMAL);
ID_MNU_CVS_1290_Obj->Append(ID_MNU_DIFF_1292, _("Diff"), _(""), wxITEM_NORMAL);
@@ -545,7 +549,7 @@
ID_MNU_CVS_1290_Obj->AppendSeparator();
ID_MNU_CVS_1290_Obj->Append(ID_MNU_LOG_1296, _("Log"), _(""), wxITEM_NORMAL);
ID_MNU_VERSIONCONTROL_1238_Obj->Append(ID_MNU_CVS_1290, _("CVS"), ID_MNU_CVS_1290_Obj);
-
+
wxMenu *ID_MNU_SVN_1297_Obj = new wxMenu();
ID_MNU_SVN_1297_Obj->Append(ID_MNU_UPDATE_1298, _("Update"), _(""), wxITEM_NORMAL);
ID_MNU_SVN_1297_Obj->Append(ID_MNU_DIFF_1299, _("Diff"), _(""), wxITEM_NORMAL);
@@ -581,7 +585,11 @@
ID_MNU_VIEWMODE_1182_Obj->Append(ID_MNU_SHOWINHERITED_1188, _("Show inherited members"), _(""), wxITEM_NORMAL);
MnuBrowserPopup->Append(ID_MNU_VIEWMODE_1182, _("View mode"), ID_MNU_VIEWMODE_1182_Obj);
+#ifndef WXW29
DlgSaveDialog = new wxFileDialog(this, _("Choose a file"), _(""), _(""), _("*.*"), wxSAVE);
+#else
+ DlgSaveDialog = new wxFileDialog(this, _("Choose a file"), _(""), _(""), _("*.*"), wxFD_SAVE);
+#endif
MnuMessagePopup = new wxMenu(_(""));MnuMessagePopup->Append(ID_MNU_COPY_1253, _("&Copy"), _(""), wxITEM_NORMAL);
MnuMessagePopup->Append(ID_MNU_CLEAR_1254, _("C&lear"), _(""), wxITEM_NORMAL);
@@ -596,7 +604,7 @@
WxMenuBar1 = new wxMenuBar();
wxMenu *ID_MNU_FILE_1001_Mnu_Obj = new wxMenu(0);
-
+
wxMenu *ID_MNU_NEW_1091_Mnu_Obj = new wxMenu(0);
ID_MNU_NEW_1091_Mnu_Obj->Append(ID_MNU_SOURCEFILE_1410, _("&Source File\tCtrl+N"), _(""), wxITEM_NORMAL);
ID_MNU_NEW_1091_Mnu_Obj->AppendSeparator();
@@ -607,7 +615,7 @@
ID_MNU_FILE_1001_Mnu_Obj->Append(ID_MNU_NEW_1091, _("New"), ID_MNU_NEW_1091_Mnu_Obj);
ID_MNU_FILE_1001_Mnu_Obj->AppendSeparator();
ID_MNU_FILE_1001_Mnu_Obj->Append(ID_MNU_OPENPROJECTORFILE____1383, _("&Open project or file...\tCtrl+O"), _(""), wxITEM_NORMAL);
-
+
wxMenu *ID_MNU_REOPEN_1384_Mnu_Obj = new wxMenu(0);
ID_MNU_REOPEN_1384_Mnu_Obj->Append(ID_MNU_CLEARHISTORY_1444, _("&Clear History"), _("Deletes the list of recently opened files"), wxITEM_NORMAL);
ID_MNU_REOPEN_1384_Mnu_Obj->AppendSeparator();
@@ -622,11 +630,11 @@
ID_MNU_FILE_1001_Mnu_Obj->Append(ID_MNU_CLOSEPROJECT_1423, _("Close Project"), _(""), wxITEM_NORMAL);
ID_MNU_FILE_1001_Mnu_Obj->AppendSeparator();
ID_MNU_FILE_1001_Mnu_Obj->Append(ID_MNU_PROPERTIES_1425, _("Properties"), _(""), wxITEM_NORMAL);
-
+
wxMenu *ID_MNU_IMPORT_1426_Mnu_Obj = new wxMenu(0);
ID_MNU_IMPORT_1426_Mnu_Obj->Append(ID_MNU_IMPORTMSVISUALC__PROJECT_1433, _("Import MS Visual C++ project"), _(""), wxITEM_NORMAL);
ID_MNU_FILE_1001_Mnu_Obj->Append(ID_MNU_IMPORT_1426, _("&Import"), ID_MNU_IMPORT_1426_Mnu_Obj);
-
+
wxMenu *ID_MNU_EXPORT_1427_Mnu_Obj = new wxMenu(0);
ID_MNU_EXPORT_1427_Mnu_Obj->Append(ID_MNU_TOHTML_1434, _("to &Html"), _(""), wxITEM_NORMAL);
ID_MNU_EXPORT_1427_Mnu_Obj->Append(ID_MNU_TORTF_1435, _("to &RTF"), _(""), wxITEM_NORMAL);
@@ -641,7 +649,7 @@
ID_MNU_FILE_1001_Mnu_Obj->AppendSeparator();
ID_MNU_FILE_1001_Mnu_Obj->Append(ID_MNU_EXITDEV_C___1432, _("E&xit Dev-C++"), _(""), wxITEM_NORMAL);
WxMenuBar1->Append(ID_MNU_FILE_1001_Mnu_Obj, _("&File"));
-
+
wxMenu *ID_MNU_EDIT_1002_Mnu_Obj = new wxMenu(0);
ID_MNU_EDIT_1002_Mnu_Obj->Append(ID_MNU_UNDO_1338, _("&Undo\tCtrl+Z"), _(""), wxITEM_NORMAL);
ID_MNU_EDIT_1002_Mnu_Obj->Append(ID_MNU_REDO_1340, _("&Redo\tShift+Ctrl+Z"), _(""), wxITEM_NORMAL);
@@ -652,7 +660,7 @@
ID_MNU_EDIT_1002_Mnu_Obj->AppendSeparator();
ID_MNU_EDIT_1002_Mnu_Obj->Append(ID_MNU_SWAPHEADER_SOURCE_1346, _("&Swap header/Source"), _(""), wxITEM_NORMAL);
ID_MNU_EDIT_1002_Mnu_Obj->AppendSeparator();
-
+
wxMenu *ID_MNU_INSERTITEM_1348_Mnu_Obj = new wxMenu(0);
ID_MNU_INSERTITEM_1348_Mnu_Obj->Append(ID_MNU_DATE_TIME_1349, _("&Date/Time"), _(""), wxITEM_NORMAL);
ID_MNU_INSERTITEM_1348_Mnu_Obj->Append(ID_MNU_COMMENTHEADER_1350, _("&Comment header"), _(""), wxITEM_NORMAL);
@@ -668,7 +676,7 @@
ID_MNU_EDIT_1002_Mnu_Obj->Append(ID_MNU_INDENT_1359, _("Indent\tShift+Ctrl+I"), _(""), wxITEM_NORMAL);
ID_MNU_EDIT_1002_Mnu_Obj->Append(ID_MNU_UNINDENT_1360, _("Unindent\tShift+Ctrl+U"), _(""), wxITEM_NORMAL);
WxMenuBar1->Append(ID_MNU_EDIT_1002_Mnu_Obj, _("&Edit"));
-
+
wxMenu *ID_MNU_SEARCH_1003_Mnu_Obj = new wxMenu(0);
ID_MNU_SEARCH_1003_Mnu_Obj->Append(ID_MNU_FIND_1361, _("&Find\tCtrl+F"), _(""), wxITEM_NORMAL);
ID_MNU_SEARCH_1003_Mnu_Obj->Append(ID_MNU_FINDINALLFILES_1362, _("Fin&d in all Files"), _(""), wxITEM_NORMAL);
@@ -679,13 +687,13 @@
ID_MNU_SEARCH_1003_Mnu_Obj->Append(ID_MNU_GOTOFUNCTION_1367, _("Goto Function\tShift+Ctrl+G"), _(""), wxITEM_NORMAL);
ID_MNU_SEARCH_1003_Mnu_Obj->Append(ID_MNU_GOTOTHELINE____1368, _("&Goto the line...\tCtrl+G"), _(""), wxITEM_NORMAL);
WxMenuBar1->Append(ID_MNU_SEARCH_1003_Mnu_Obj, _("&Search"));
-
+
wxMenu *ID_MNU_VIEW_1004_Mnu_Obj = new wxMenu(0);
ID_MNU_VIEW_1004_Mnu_Obj->Append(ID_MNU_PROJECT_CLASSBROWSER_1306, _("&Project/Class Browser"), _(""), wxITEM_CHECK);
ID_MNU_VIEW_1004_Mnu_Obj->Check(ID_MNU_PROJECT_CLASSBROWSER_1306,false);
ID_MNU_VIEW_1004_Mnu_Obj->Append(ID_MNU_STATUSBAR_1304, _("&StatusBar"), _(""), wxITEM_CHECK);
ID_MNU_VIEW_1004_Mnu_Obj->Check(ID_MNU_STATUSBAR_1304,false);
-
+
wxMenu *ID_MNU_COMPILEROUTPUT_1308_Mnu_Obj = new wxMenu(0);
ID_MNU_COMPILEROUTPUT_1308_Mnu_Obj->Append(ID_MNU_ALWAYSVISIBLE_1307, _("&Always Visible"), _(""), wxITEM_CHECK);
ID_MNU_COMPILEROUTPUT_1308_Mnu_Obj->Check(ID_MNU_ALWAYSVISIBLE_1307,false);
@@ -693,7 +701,7 @@
ID_MNU_COMPILEROUTPUT_1308_Mnu_Obj->Append(ID_MNU_ONLYWHENNEEDED_1310, _("&Only when needed"), _(""), wxITEM_CHECK);
ID_MNU_COMPILEROUTPUT_1308_Mnu_Obj->Check(ID_MNU_ONLYWHENNEEDED_1310,false);
ID_MNU_VIEW_1004_Mnu_Obj->Append(ID_MNU_COMPILEROUTPUT_1308, _("&Compiler Output"), ID_MNU_COMPILEROUTPUT_1308_Mnu_Obj);
-
+
wxMenu *ID_MNU_TOOLBARS_1311_Mnu_Obj = new wxMenu(0);
ID_MNU_TOOLBARS_1311_Mnu_Obj->Append(ID_MNU_SUBMENUITEM25_1312, _("&Main"), _(""), wxITEM_CHECK);
ID_MNU_TOOLBARS_1311_Mnu_Obj->Check(ID_MNU_SUBMENUITEM25_1312,true);
@@ -724,7 +732,7 @@
ID_MNU_VIEW_1004_Mnu_Obj->Append(ID_MNU_GOTOPROJECTMANAGER_1328, _("Go to Project &Manager\tCtrl+F2"), _(""), wxITEM_NORMAL);
ID_MNU_VIEW_1004_Mnu_Obj->Append(ID_MNU_GOTOCLASSBROWSER_1329, _("Go to Class &Browser\tCtrl+F3"), _(""), wxITEM_NORMAL);
WxMenuBar1->Append(ID_MNU_VIEW_1004_Mnu_Obj, _("&View"));
-
+
wxMenu *ID_MNU_PROJECT_1005_Mnu_Obj = new wxMenu(0);
ID_MNU_PROJECT_1005_Mnu_Obj->Append(ID_MNU_NEWUNIT_1369, _("&New Unit"), _(""), wxITEM_NORMAL);
ID_MNU_PROJECT_1005_Mnu_Obj->Append(ID_MNU_ADDFILE____1370, _("&Add file..."), _(""), wxITEM_NORMAL);
@@ -732,7 +740,7 @@
ID_MNU_PROJECT_1005_Mnu_Obj->AppendSeparator();
ID_MNU_PROJECT_1005_Mnu_Obj->Append(ID_MNU_OPTIONS_1373, _("&Options\tAlt+P"), _(""), wxITEM_NORMAL);
WxMenuBar1->Append(ID_MNU_PROJECT_1005_Mnu_Obj, _("&Project"));
-
+
wxMenu *ID_MNU_EXECUTE_1006_Mnu_Obj = new wxMenu(0);
WxMenuBar1->Append(ID_MNU_EXECUTE_1006_Mnu_Obj, _("E&xecute"));
wxMenu *ID_MNU_DEBUG_1007_Mnu_Obj = new wxMenu(0);
@@ -751,7 +759,7 @@
ID_MNU_DEBUG_1007_Mnu_Obj->Append(ID_MNU_WATCHVARIABLES_1408, _("&Watch variables\tCtrl+W"), _(""), wxITEM_NORMAL);
ID_MNU_DEBUG_1007_Mnu_Obj->Append(ID_MNU_VIEWCPUWINDOW_1409, _("&View CPU Window"), _(""), wxITEM_NORMAL);
WxMenuBar1->Append(ID_MNU_DEBUG_1007_Mnu_Obj, _("&Debug"));
-
+
wxMenu *ID_MNU_TOOLS_1008_Mnu_Obj = new wxMenu(0);
ID_MNU_TOOLS_1008_Mnu_Obj->Append(ID_MNU_COMPILEROPTIONS_1386, _("&Compiler Options..."), _(""), wxITEM_NORMAL);
ID_MNU_TOOLS_1008_Mnu_Obj->Append(ID_MNU_ENVIRONMENTOPTIONS_1387, _("&Environment Options..."), _(""), wxITEM_NORMAL);
@@ -764,7 +772,7 @@
ID_MNU_TOOLS_1008_Mnu_Obj->AppendSeparator();
ID_MNU_TOOLS_1008_Mnu_Obj->Append(ID_MNU_PACKAGEMANAGER_1395, _("&Package Manager"), _(""), wxITEM_NORMAL);
WxMenuBar1->Append(ID_MNU_TOOLS_1008_Mnu_Obj, _("&Tools"));
-
+
wxMenu *ID_MNU_VERSIONCONTROL_1009_Mnu_Obj = new wxMenu(0);
WxMenuBar1->Append(ID_MNU_VERSIONCONTROL_1009_Mnu_Obj, _("Version &Control"));
wxMenu *ID_MNU_WINDOW_1010_Mnu_Obj = new wxMenu(0);
@@ -778,7 +786,7 @@
ID_MNU_WINDOW_1010_Mnu_Obj->AppendSeparator();
ID_MNU_WINDOW_1010_Mnu_Obj->Append(ID_MNU_LIST_1381, _("&List..."), _(""), wxITEM_NORMAL);
WxMenuBar1->Append(ID_MNU_WINDOW_1010_Mnu_Obj, _("&Window"));
-
+
wxMenu *ID_MNU_HELP_1011_Mnu_Obj = new wxMenu(0);
ID_MNU_HELP_1011_Mnu_Obj->Append(ID_MNU_HELPONWXDEV_C___1331, _("Help on wxDev-C++"), _(""), wxITEM_NORMAL);
ID_MNU_HELP_1011_Mnu_Obj->AppendSeparator();
@@ -854,7 +862,7 @@
MnuEditorPopup->Append(ID_MNU_ADDTO_DOITEM____TSHIFT_CTRL_T_1149, _("Add To-Do Item...\tShift+Ctrl+T"), _(""), 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, _("Update"), _(""), wxITEM_NORMAL);
ID_MNU_CVS_1255_Obj->Append(ID_MNU_DIFF_1258, _("Diff"), _(""), wxITEM_NORMAL);
@@ -863,7 +871,7 @@
ID_MNU_CVS_1255_Obj->AppendSeparator();
ID_MNU_CVS_1255_Obj->Append(ID_MNU_LOG_1262, _("Log"), _(""), wxITEM_NORMAL);
ID_MNU_VERSIONCONTROL_1151_Obj->Append(ID_MNU_CVS_1255, _("CVS"), ID_MNU_CVS_1255_Obj);
-
+
wxMenu *ID_MNU_SVN_1263_Obj = new wxMenu();
ID_MNU_SVN_1263_Obj->Append(ID_MNU_UPDATE_1264, _("Update"), _(""), wxITEM_NORMAL);
ID_MNU_SVN_1263_Obj->Append(ID_MNU_DIFF_1265, _("Diff"), _(""), wxITEM_NORMAL);
@@ -912,16 +920,16 @@
SetIcon(Self_MainFrm_XPM);
SetSize(8,8,872,603);
Center();
-
+
////GUI Items Creation End
-
+
//We need to set the features here for the compiler window since we cannot
//insert as a notebook page in the form designer
LsvCompilerOutput->SetWindowStyleFlag(wxLC_REPORT);
LsvCompilerOutput->InsertColumn(0,wxT("Message"),wxLIST_FORMAT_LEFT,200 );
LsvCompilerOutput->InsertColumn(0,wxT("Unit"),wxLIST_FORMAT_LEFT,200 );
LsvCompilerOutput->InsertColumn(0,wxT("Line"),wxLIST_FORMAT_LEFT,50 );
-
+
SetToolBar(NULL);
//Remove close buttons from notebook tabs
DockManager.AddPane(TlbMain, wxAuiPaneInfo().
@@ -968,7 +976,7 @@
Name(wxT("NbkProjectInspector")).Caption(wxT("Project Inspector")).
Left().PinButton(true).LeftDockable(true).RightDockable(true).
CloseButton(true).MaximizeButton(true));
- NbkProjectInspector->SetWindowStyleFlag(NoteBook_STYLE);
+ NbkProjectInspector->SetWindowStyleFlag(NoteBook_STYLE);
DockManager.AddPane(NbkRightNotebook, wxAuiPaneInfo().
Name(wxT("NbkRightNotebook")).Caption(wxT("Project Editor")).
Centre().LeftDockable(true).RightDockable(true).CloseButton(true).
@@ -979,10 +987,10 @@
CloseButton(true).MaximizeButton(true));
NbkMessageControl->SetWindowStyleFlag(NoteBook_STYLE);
NbkRightNotebook->SetWindowStyleFlag(EditorBook_STYLE);
-
+
// "commit" all changes made to wxAuiManager
DockManager.Update();
-
+
//Rebuild AUI Manager here?
extern TdevData * DevData;
if(DevData->GetWinManData().Cmp(wxT("")))
@@ -1598,7 +1606,7 @@
dmMain.CodeClick = CodeInsClick;
dmMain.CodeOffset = 2;
dmMain.LoadDataMod;*/
-
+
if(wxGetApp().argc > 0 )
ParseCmdLine();
@@ -1682,7 +1690,7 @@
{
//Removed docking related stuff, this is all handled by AUI
-
+
BolFirstShow = true;
/*ToDoList := TList.Create;
fToDoSortColumn := 0;*/
@@ -1710,8 +1718,8 @@
if(DevData->GetClassView())
NbkProjectInspector->SetSelection(1);
else
- NbkProjectInspector->SetSelection(0);
-
+ NbkProjectInspector->SetSelection(0);
+
//actProjectManagerExecute(nil);
//NbkProjectInspector->SetSize(DevData->GetProjectWidth(),wxDefaultCoord);
//Check if we need these two lines or if we can handle this in wxAUI
@@ -1729,8 +1737,8 @@
InitializeDebugger();
SearchCenter.SearchProc := MainSearchProc;
SearchCenter.PageControl := PageControl;*/
-
-
+
+
//NbkMessageControl->SetSize(wxDefaultCoord,DevData->GetOutputHeight());
NbkMessageControl->GetSize(NULL,&fmsgHeight);
@@ -1829,21 +1837,21 @@
TempMenu->FindItem(ID_MNU_DEBUG_1330)->Check(DockManager.GetPane(TlbDebug).IsShown());
}
}*/
-
-
+
+
//ToolbarClick(nil);
//All the toolbar positioning code has been removed, this should be saved
//and reloaded by the window manager.
SetMaxSize(wxGetDisplaySize());
-
+
//fCompiler->SetRunParams(wxT(""));
DevCompiler->SetUseExecParams(true);
//Removed all the docking related stuff for the bottom notepad. This is all handled
//by AUI at creation time
-
+
//Show the compiler output list-view
//ShowDockForm(frmReportDocks[0]);
@@ -1862,6 +1870,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));
@@ -1872,6 +1881,18 @@
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));
+ WxMenuBar1->SetMenuLabel(3,Lang()->GetString(ID_MNU_VIEW));
+ WxMenuBar1->SetMenuLabel(4,Lang()->GetString(ID_MNU_PROJECT));
+ WxMenuBar1->SetMenuLabel(5,Lang()->GetString(ID_MNU_EXECUTE));
+ WxMenuBar1->SetMenuLabel(6,Lang()->GetString(ID_MNU_DEBUG));
+ 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 ];
@@ -2151,7 +2172,7 @@
SetHints;*/
/* TODO (SofT#1#): Need to implement Language build for main form */
Layout();
-
+
}
void MainFrm::OnClose(wxCloseEvent& event)
@@ -2206,8 +2227,8 @@
wxString aFile;
int idx, idx2;
wxMenuItem * Item, Item2;
-
-
+
+
extern TdevDirs * DevDirs;
if(DevDirs)
{
@@ -2249,14 +2270,14 @@
//SearchWord=1
//AffectF1=1
//Pop=0
-
+
// enumeration variables
wxString str;
long dummy;
// now all groups...
bool bCont = ini.GetFirstGroup(str, dummy);
- while ( bCont )
+ while ( bCont )
{
fHelpfiles.Add(str);
bCont = ini.GetNextGroup(str, dummy);
@@ -2290,7 +2311,7 @@
ShortCut := TextToShortcut('F1');
Tag := idx;
ImageIndex := ini.ReadInteger(fHelpFiles.Names[idx], 'Icon', 0);*/
- TempMenu->Insert(idx2, Item);
+ TempMenu->Insert(idx2, Item);
/*
if ini.ReadBool(fHelpFiles.Names[idx], 'Pop', false) then
begin
@@ -2303,12 +2324,12 @@
ImageIndex := ini.ReadInteger(fHelpFiles.Names[idx], 'Icon', 0);
end;
HelpPop.Items.Add(Item2);
- end;*/
+ end;*/
}
}
}
}
-
+
}
}
}
@@ -2439,7 +2460,7 @@
}
bool MainFrm::SaveFile(TEditor *e)
-{
+{
bool RetVal;
/*std::string EditorFilename; std::string hfile; std::string cppFile;
TEditor eX;
@@ -2453,9 +2474,9 @@
return result;
//Bug fix for 1123460 : Save the files first and the do a re-parse.
-//If you dont save all the files first then cpp functions and header functions of save class
+//If you dont save all the files first then cpp functions and header functions of save class
//will be added in the class browser and duplicates will be there.
-//Some times the functions will be not associated with the class and
+//Some times the functions will be not associated with the class and
//there by will not be shown in the function assignment drop down box of the events.
#ifdef WX_BUILD
@@ -2533,7 +2554,7 @@
}
bool MainFrm::SaveFileAs(TEditor * e)
-{
+{
bool RetVal;
/*
int I;
@@ -2692,12 +2713,12 @@
e.Text.Lines.SaveToFile( s );
e.Modified = false;
e.new = false;
-
+
} catch(...) {MessageDlg( Lang[ ID_ERR_SAVEFILE ] + " \"" + s + "\"" , mtError , [ mbOk ] , 0 );
result = false;
}
//Bug fix for 1337392 : This fix Parse the Cpp file when we save the header file provided
-//the Cpp file is already saved.
+//the Cpp file is already saved.
//Dont change the way steps by which the file is parsed.
if( !! fProject )
@@ -2714,7 +2735,7 @@
//then we need to reparse the Cpp file to make sure the intialially
//parsed cpp file is reset
if( ( ( GetFileTyp( e.Filename ) == utHead ) ) )
- {
+ {
CppParser1.GetSourcePair( ExtractFileName( e.Filename ), ccFile, hfile );
if( trim( ccFile ) != "" )
{
@@ -2788,7 +2809,7 @@
{
#ifdef DEBUG
wxLogError(wxString(wxT("This is a stub function, in the future it will show the webupdate dialog")));
-#endif
+#endif
//WebUpdateForm.Show;
}
void MainFrm::ActionNewSourceExecute(wxCommandEvent & event)
@@ -2797,16 +2818,16 @@
if(fProject)
{
- switch(wxMessageBox( Lang()->GetString(ID_MSG_NEWFILE), wxT(""), wxICON_INFORMATION | wxYES_NO | wxCANCEL ) )
+ switch(wxMessageBox( Lang()->GetString(ID_MSG_NEWFILE), wxT(""), wxICON_INFORMATION | wxYES_NO | wxCANCEL ) )
{
- case wxYES:
+ case wxYES:
{
NewEditor = ActionProjectNewExecute(/*event*/); //Should this be assigned to NewEditor?
//The above function has been altered to return TEditor * function instead of void
//This function needs checking to accuracy
return;
}
- case wxCANCEL:
+ case wxCANCEL:
return;
}
}
@@ -2866,7 +2887,7 @@
return;
}
}
-
+
fProject = new TProject(s,TempNewProjectForm.GetProjectName());
if(!fProject->AssignTemplate(s,TempNewProjectForm.GetTemplate()));
{
@@ -2940,7 +2961,7 @@
WITH NewTemplateForm {
TempProject = fProject;
ShowModal;
- }*/
+ }*/
}
void MainFrm::ActionOpenExecute(wxCommandEvent & event)
@@ -2965,7 +2986,7 @@
FilterArray.Add(FLT_WXFORMS);
FilterArray.Add(FLT_XRC);
#endif
-
+
if(!BuildFilter( flt , FilterArray))
{
flt = FLT_ALLFILES;
@@ -2974,7 +2995,7 @@
flt = FLT_PROJECTS;
}
}
-
+
DlgOpenDialog->SetWildcard(flt);
DlgOpenDialog->SetTitle(Lang()->GetString(ID_NV_OPENFILE));
if(DlgOpenDialog->ShowModal() == wxID_OK)
@@ -3052,7 +3073,7 @@
}
}}
}
-
+
if( !! fProject ) {
fProject.Save;
UpdateAppTitle;
@@ -3090,7 +3111,7 @@
void MainFrm::ActionCloseAllExecute(wxCommandEvent &event)
{
for(int idx = NbkRightNotebook->GetPageCount() -1; idx >= 0 ; --idx )
- {
+ {
if(!CloseEditor( 0 , true ) )
break;
}
@@ -3137,7 +3158,7 @@
switch(wxMessageBox(wxString::Format(Lang()->GetString(ID_MSG_SAVEPROJECT), s.c_str() ), wxT("Please Confirm"), wxYES_NO|wxCANCEL|wxICON_QUESTION))
{
- case wxYES:
+ case wxYES:
fProject->Save();
break;
case wxNO:
@@ -3235,7 +3256,7 @@
devData.PrintWordWrap = cbWordWrap.Checked;
devData.PrintLineNumbers = rbLN.Checked;
devData.PrintLineNumbersMargins = rbLNMargin.Checked;
- }
+ }
} catch(...) {
free;
}*/
@@ -3245,7 +3266,7 @@
{
/*try {
dmMain.PrinterSetupDialog.Execute;
-
+
} catch(...) {MessageDlg( "An error occured while trying to load the printer setup dialog. You probably have no printer installed yet" , mtError , [ mbOk ] , 0 );
}*/
}
@@ -3292,7 +3313,7 @@
void MainFrm::ActionCopyExecute(wxCommandEvent & event)
{
TEditor * e = GetEditor();
-
+
if(e)
{
/*if( e.isForm )
@@ -3306,7 +3327,7 @@
void MainFrm::ActionPasteExecute(wxCommandEvent & event)
{
TEditor * e = GetEditor();
-
+
if(e)
{
/*if( e.isForm )
@@ -3435,7 +3456,7 @@
void MainFrm::ActionEditorOptionsExecute(wxCommandEvent &event)
{
TEditorOptForm EditorOptForm(this);
-
+
if(EditorOptForm.ShowModal() == wxID_OK)
{
}
@@ -3531,7 +3552,7 @@
devFileMonitor1.Deactivate;// deactivate for renaming or a message will raise
Renamefile( oldName , NewName );
devFileMonitor1.Activate;
-
+
} catch(...) {MessageDlg( format( Lang[ ID_ERR_RENAMEFILE ] , [ oldName ] ) , mtError , [ mbOk ] , 0 );
}*/
}
@@ -3624,7 +3645,7 @@
#endif
if(!BuildFilter(flt, FilterList));
BuildFilter(flt, ftAll);
-
+
DlgOpenDialog->SetMessage(Lang()->GetString(ID_NV_OPENADD));
DlgOpenDialog->SetWildcard(flt);
if(DlgOpenDialog->ShowModal() == wxID_OK)
@@ -3809,7 +3830,7 @@
ShowMessage( "Debugging is Disabled for Non-MingW compilers." );
return;
}
-
+
if( fCompiler.Compiling )
{
MessageDlg( Lang[ ID_MSG_ALREADYCOMP ] , mtInformation , [ mbOk ] , 0 );
@@ -3937,7 +3958,7 @@
if(EnvirOptForm.ShowModal() == wxID_OK)
{
}
-
+
/*WITH TEnviroForm.Create( self )
try {
if( ShowModal == mrOk )
@@ -4008,7 +4029,7 @@
//Some weird error pops when doing an Update
try {
( Sender as TAction ).Enabled = ( e.Text.Text != "" );
-
+
} catch(...) {}
}
else
@@ -4030,23 +4051,23 @@
void MainFrm::ActionMsgCopyExecute( )
{
/*switch( MessageControl.ActivePageIndex ) {
- case cCompTab:
+ case cCompTab:
if( !! CompilerOutput.Selected ) {
Clipboard.AsText = StringReplace
( StringReplace
( CompilerOutput.Selected.Caption +" " +
CompilerOutput.Selected.SubItems.Text , (char)13(char)10 , " " , [ rfReplaceAll ] ) , (char)10 , " " , [ rfReplaceAll ] );}
- case cResTab:
+ case cResTab:
if( ResourceOutput.ItemIndex != -1 )
Clipboard.AsText = ResourceOutput.Items[ ResourceOutput.ItemIndex ];
- case cLogTab:
+ case cLogTab:
if( LogOutput.Lines.Text != "" )
if( Length( LogOutput.SelText ) > 0 )
Clipboard.AsText = LogOutput.SelText;else
Clipboard.AsText = LogOutput.Lines.Text;
- case cFindTab:
+ case cFindTab:
if( !! FindOutput.Selected )
Clipboard.AsText = FindOutput.Selected.Caption + " " +
FindOutput.Selected.SubItems.Text;
@@ -4154,7 +4175,7 @@
if( ( !! Node ) ) {
try {
fDebugger.SendCommand( GDB_UNDISPLAY , inttostr( int( Node.Data ) ) );
-
+
} catch(...) {}
DebugTree.Items.Delete( Node );
}*/
@@ -4255,7 +4276,7 @@
void MainFrm::ActionSaveUpdate(wxUpdateUIEvent &event)
{
TEditor * e;
-
+
e = GetEditor();
if(e)
{
@@ -4277,9 +4298,9 @@
void MainFrm::ActionFindNextUpdate(wxUpdateUIEvent &event)
{
TEditor * e;
-
+
e = GetEditor();
-
+
event.Enable(e && (!e->GetText()->GetText().IsEmpty()));
}
@@ -4341,12 +4362,12 @@
{
TEditor * e;
wxFileName FileName;
-
+
e = GetEditor();
if(e)
{
FileName = wxFileName(e->GetFileName());
-
+
if(fProject)
{
if(GetFileTyp(FileName.GetFullName()) == utSrc)
@@ -4433,9 +4454,9 @@
{
if(GetFileTyp(FileName.GetFullName()) == utSrc)
{
- if((FileName.GetExt().CmpNoCase(CPP_EXT)) || (FileName.GetExt().CmpNoCase(CC_EXT)) ||
- (FileName.GetExt().CmpNoCase(CXX_EXT)) || (FileName.GetExt().CmpNoCase(CP2_EXT)) ||
- (FileName.GetExt().CmpNoCase(CP_EXT)))
+ if((FileName.GetExt().CmpNoCase(CPP_EXT)) || (FileName.GetExt().CmpNoCase(CC_EXT)) ||
+ (FileName.GetExt().CmpNoCase(CXX_EXT)) || (FileName.GetExt().CmpNoCase(CP2_EXT)) ||
+ (FileName.GetExt().CmpNoCase(CP_EXT)))
{
FileName.SetExt(HPP_EXT);
if(!wxFileExists(FileName.GetFullPath()))
@@ -4554,7 +4575,7 @@
void MainFrm::ActionIndentExecute(wxCommandEvent &event)
{
TEditor * e;
-
+
e = GetEditor();
if(e)
e->IndentSelection();
@@ -4600,9 +4621,9 @@
void MainFrm::ActionBrowserGotoImplUpdate(wxUpdateUIEvent &event)
{
- /*if( !! ClassBrowser1
+ /*if( !! ClassBrowser1
&& ClassBrowser1.Enabled
- && !! ClassBrowser1.Selected
+ && !! ClassBrowser1.Selected
&& !! ClassBrowser1.Selected.Data )
//check if node.data still in statements
if( CppParser1.Statements.Indexof( ClassBrowser1.Selected.Data ) >=0 )
@@ -4624,7 +4645,7 @@
void MainFrm::ActionBrowserNewMemberUpdate(wxUpdateUIEvent &event)
{
- /*if( !! ClassBrowser1.Selected
+ /*if( !! ClassBrowser1.Selected
&& !! ClassBrowser1.Selected.Data )
//check if node.data still in statements
if( CppParser1.Statements.Indexof( ClassBrowser1.Selected.Data ) >= 0 )
@@ -4640,7 +4661,7 @@
void MainFrm::ActionBrowserNewVarUpdate(wxUpdateUIEvent &event)
{
- /*if( !! ClassBrowser1.Selected
+ /*if( !! ClassBrowser1.Selected
&& !! ClassBrowser1.Selected.Data )
//check if node.data still in statements
if( CppParser1.Statements.Indexof( ClassBrowser1.Selected.Data ) >= 0 )
@@ -4949,7 +4970,7 @@
/* begin XXXKF */
void MainFrm::ActionWindowMenuExecute( )
-{
+{
/*TMenuItem Item;
TEditor e;
int I;
@@ -5091,7 +5112,7 @@
void MainFrm::ActionCompileCurrentFileExecute(wxCommandEvent &event)
{
TEditor * e;
-
+
if(fCompiler->GetCompiling())
{
wxMessageBox(Lang()->GetString(ID_MSG_ALREADYCOMP),wxT("Information"),wxOK|wxICON_INFORMATION);
@@ -5114,12 +5135,12 @@
{
bool RetVal = false;
TEditor * e = NULL;
-
+
if((fProject) && (fProject->GetUnits().GetCount() == 0))
{
wxMessageBox(wxT("Why in the world are you trying to compile an empty project? ;-)"),
wxT("Warning - Empty Project"),wxOK|wxICON_INFORMATION);
-
+
}
else
{
@@ -5129,31 +5150,31 @@
ResSheet.Highlighted := false;
SizeFile.Text := '';
TotalErrors.Text := '0';*/
-
+
extern TdevData * DevData;
-
+
if(!DevData->GetShowProgress())
{
// if no compile progress window, open the compiler output
OpenCloseMessageSheet(true);
NbkMessageControl->SetSelection(NbkMessageControl->GetPageIndex(LogSheet));
}
-
+
e = GetEditor();
fCompiler->SetTarget(ctNone);
-
+
if(fProject)
{
// no matter if the editor file is not in project,
// the target is ctProject since we have a project open...
fCompiler->SetTarget(ctProject);
}
- else if(e && ((GetFileTyp(e->GetFileName()) == utSrc) ||
+ else if(e && ((GetFileTyp(e->GetFileName()) == utSrc) ||
(GetFileTyp(...
[truncated message content] |
