You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(24) |
Dec
(90) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(67) |
Feb
(30) |
Mar
(11) |
Apr
(20) |
May
(6) |
Jun
(27) |
Jul
(6) |
Aug
(13) |
Sep
(21) |
Oct
|
Nov
|
Dec
|
2008 |
Jan
(7) |
Feb
(10) |
Mar
(10) |
Apr
(5) |
May
(7) |
Jun
(6) |
Jul
|
Aug
|
Sep
(37) |
Oct
(58) |
Nov
(30) |
Dec
(19) |
2009 |
Jan
(16) |
Feb
(8) |
Mar
(11) |
Apr
(5) |
May
(4) |
Jun
(3) |
Jul
(11) |
Aug
(31) |
Sep
(14) |
Oct
(5) |
Nov
(4) |
Dec
(9) |
2010 |
Jan
(12) |
Feb
(14) |
Mar
(5) |
Apr
(1) |
May
(4) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
(7) |
2011 |
Jan
(10) |
Feb
(2) |
Mar
(13) |
Apr
(1) |
May
(5) |
Jun
(13) |
Jul
|
Aug
|
Sep
(14) |
Oct
(20) |
Nov
(4) |
Dec
(9) |
2012 |
Jan
(17) |
Feb
(19) |
Mar
(8) |
Apr
(3) |
May
(1) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <tb...@us...> - 2012-06-04 19:00:19
|
Revision: 1495 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1495&view=rev Author: tbreina Date: 2012-06-04 19:00:09 +0000 (Mon, 04 Jun 2012) Log Message: ----------- Removed extraneous ShowMessage Updated some bitmap graphic file names. Modified Paths: -------------- trunk/wxdevcpp/source/plugins/wxdsgn/Designerfrm.pas trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res Modified: trunk/wxdevcpp/source/plugins/wxdsgn/Designerfrm.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/Designerfrm.pas 2012-06-04 18:45:18 UTC (rev 1494) +++ trunk/wxdevcpp/source/plugins/wxdsgn/Designerfrm.pas 2012-06-04 19:00:09 UTC (rev 1495) @@ -762,7 +762,7 @@ if frmNewForm.Wx_ICON.Bitmap.handle <> 0 then begin - ShowMessage( xpmFileDir + frmNewForm.GetGraphicFileName ); + if onlyForForm then DeleteFile(xpmFileDir + frmNewForm.GetGraphicFileName); //xpmFileDir + 'Self_' + frmNewForm.Wx_Name + '_XPM.xpm'); @@ -1950,10 +1950,12 @@ end; end; end; - strXPMFileName := 'Images\Self_' + wx_Name + '.xpm'; + + + strXPMFileName := GetGraphicFilename(); //'Images\Self_' + wx_Name + '.xpm'; if FileExists(strXPMFileName) and (Wx_ICON.Bitmap <> NIL) then begin - GenerateXPMDirectly(Wx_ICON.Bitmap, 'Self', wx_Name, strFileName); + GenerateXPMDirectly(Wx_ICON.Bitmap, GetDesignerFormName(self), wx_Name, strFileName); end; end; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-06-04 18:45:18 UTC (rev 1494) +++ trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-06-04 19:00:09 UTC (rev 1495) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=71 +Build=73 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName= FileDescription=wxDev-C++ RAD add-on -FileVersion=7.4.2.71 +FileVersion=7.4.2.73 InternalName= LegalCopyright= LegalTrademarks= Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-06-04 18:45:27
|
Revision: 1494 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1494&view=rev Author: tbreina Date: 2012-06-04 18:45:18 +0000 (Mon, 04 Jun 2012) Log Message: ----------- Re-enabled code- completion form release on exit. Modified Paths: -------------- trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-06-04 18:41:51 UTC (rev 1493) +++ trunk/wxdevcpp/source/devcpp.dof 2012-06-04 18:45:18 UTC (rev 1494) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=569 +Build=570 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.569 +FileVersion=7.4.2.570 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas =================================================================== --- trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas 2012-06-04 18:41:51 UTC (rev 1493) +++ trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas 2012-06-04 18:45:18 UTC (rev 1494) @@ -196,10 +196,10 @@ // GAR 3/26/2012 // Do we need to explicitly Release the TForm? - // if Assigned(CodeComplForm) then - // CodeComplForm.Release - // else - // CodeComplForm := NIL; + if Assigned(CodeComplForm) then + CodeComplForm.Release + else + CodeComplForm := NIL; inherited Destroy; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-06-04 18:41:51 UTC (rev 1493) +++ trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-06-04 18:45:18 UTC (rev 1494) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=69 +Build=71 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName= FileDescription=wxDev-C++ RAD add-on -FileVersion=7.4.2.69 +FileVersion=7.4.2.71 InternalName= LegalCopyright= LegalTrademarks= Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-06-04 18:41:58
|
Revision: 1493 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1493&view=rev Author: tbreina Date: 2012-06-04 18:41:51 +0000 (Mon, 04 Jun 2012) Log Message: ----------- Updated VistaAltFixUnit code with Marc Durdin's re-write. The old AltFix code caused a random crash on exiting the IDE. For some reason, TWndProc was still called AFTER the window had closed and caused a invalid pointer access. I've also corrected (?) the bitmap file name for the form icon. It was previously set to 'Self_' component name, but referred to as parent + component name XPM in the code. Finally, string format default changed from wxT() to _() which can handle the German characters. Modified Paths: -------------- trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/main.pas trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas trunk/wxdevcpp/source/plugins/wxdsgn/Designerfrm.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/WxMenuBar.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiPaneInfo.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxUtils.pas trunk/wxdevcpp/source/plugins/wxdsgn/wxdesigner.pas trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res trunk/wxdevcpp/source/project.pas Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-05-10 17:31:23 UTC (rev 1492) +++ trunk/wxdevcpp/source/devcpp.dof 2012-06-04 18:41:51 UTC (rev 1493) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=559 +Build=569 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.559 +FileVersion=7.4.2.569 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/main.pas =================================================================== --- trunk/wxdevcpp/source/main.pas 2012-05-10 17:31:23 UTC (rev 1492) +++ trunk/wxdevcpp/source/main.pas 2012-06-04 18:41:51 UTC (rev 1493) @@ -93,7 +93,7 @@ {$IFDEF PLUGIN_BUILD} SynEdit, iplugin, iplugin_bpl, iplugin_dll, iplugger, controlbar_win32_events, hashes, //SynEditCodeFolding, - xprocs, SynHighlighterRC, hh, hh_funcs, VistaAltFixUnit, + xprocs, SynHighlighterRC, hh, hh_funcs, VistaAltFixUnit2, {$IFNDEF COMPILER_7_UP} ThemeMgr, @@ -10730,7 +10730,7 @@ ShowWindow(Application.Handle, SW_SHOW); if IsWindowsVista then begin - TVistaAltFix.Create(Self); + TVistaAltFix2.Create(Self); end; // accepting drag and drop files DragAcceptFiles(Handle, TRUE); Modified: trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas =================================================================== --- trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas 2012-05-10 17:31:23 UTC (rev 1492) +++ trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas 2012-06-04 18:41:51 UTC (rev 1493) @@ -196,10 +196,10 @@ // GAR 3/26/2012 // Do we need to explicitly Release the TForm? - if Assigned(CodeComplForm) then - CodeComplForm.Release - else - CodeComplForm := NIL; + // if Assigned(CodeComplForm) then + // CodeComplForm.Release + // else + // CodeComplForm := NIL; inherited Destroy; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/Designerfrm.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/Designerfrm.pas 2012-05-10 17:31:23 UTC (rev 1492) +++ trunk/wxdevcpp/source/plugins/wxdsgn/Designerfrm.pas 2012-06-04 18:41:51 UTC (rev 1493) @@ -762,18 +762,19 @@ if frmNewForm.Wx_ICON.Bitmap.handle <> 0 then begin + ShowMessage( xpmFileDir + frmNewForm.GetGraphicFileName ); if onlyForForm then - DeleteFile(xpmFileDir + 'Self_' + frmNewForm.Wx_Name + '_XPM.xpm'); + DeleteFile(xpmFileDir + frmNewForm.GetGraphicFileName); //xpmFileDir + 'Self_' + frmNewForm.Wx_Name + '_XPM.xpm'); - if not fileexists(xpmFileDir + 'Self_' + frmNewForm.Wx_Name + '_XPM.xpm') then + if not fileexists(xpmFileDir + frmNewForm.GetGraphicFileName) then // + 'Self_' + frmNewForm.Wx_Name + '_XPM.xpm') then begin fileStrlst := TStringList.Create; try - strXPMContent := GetXPMFromTPicture('Self_' + frmNewForm.Wx_Name, frmNewForm.Wx_ICON.Bitmap); + strXPMContent := GetXPMFromTPicture(strFileName, frmNewForm.Wx_ICON.Bitmap); //'Self_' + frmNewForm.Wx_Name, frmNewForm.Wx_ICON.Bitmap); if trim(strXPMContent) <> '' then begin fileStrlst.Add(strXPMContent); - fileStrlst.SaveToFile(xpmFileDir + 'Self_' + frmNewForm.Wx_Name + '_XPM.xpm'); + fileStrlst.SaveToFile(xpmFileDir + frmNewForm.GetGraphicFileName); //+ 'Self_' + frmNewForm.Wx_Name + '_XPM.xpm'); end; except end; @@ -1640,7 +1641,7 @@ else begin //strLst.add('wxIcon ' + self.Wx_Name + '_ICON' + ' (' +Self_'+self.Wx_Name + '_XPM' + ');'); - strLst.add('SetIcon(' + 'Self_' + self.Wx_Name + '_XPM' + ');'); + strLst.add('SetIcon(' + GetDesignerFormName(self) + '_' + self.Name + '_XPM' + ');'); end; end; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/WxMenuBar.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/WxMenuBar.pas 2012-05-10 17:31:23 UTC (rev 1492) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/WxMenuBar.pas 2012-06-04 18:41:51 UTC (rev 1493) @@ -595,9 +595,9 @@ Result := Result + #13 + 'm_fileHistory->UseMenu( ' + parentName + ' );'; Result := Result + #13 + 'm_fileConfig = new wxConfig("' + ChangeFileExt(ExtractFileName(wx_designer.main.GetProjectFileName), '') + '");'; Result := Result + #13 + 'wxConfigBase::Set( m_fileConfig );'; - Result := Result + #13 + 'm_fileConfig->SetPath(wxT("/RecentFiles"));'; - Result := Result + #13 + 'm_fileHistory->Load(*m_fileConfig); '; - Result := Result + #13 + 'm_fileConfig->SetPath(wxT(".."));'; + Result := Result + #13 + 'm_fileConfig->SetPath(' + GetCppString('/RecentFiles') + ');'; + Result := Result + #13 + 'm_fileHistory->Load(*m_fileConfig);'; + Result := Result + #13 + 'm_fileConfig->SetPath(' + GetCppString('..') + ');'; End Else Begin Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiPaneInfo.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiPaneInfo.pas 2012-05-10 17:31:23 UTC (rev 1492) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiPaneInfo.pas 2012-06-04 18:41:51 UTC (rev 1493) @@ -682,7 +682,7 @@ If trim(Wx_Caption) = '' Then Result := '' Else - Result := Format('.Caption(wxT("%s"))', [Self.FWx_Caption]); + Result := Format('.Caption(%s)', [GetCppString(Self.FWx_Caption)]); End; Procedure TWxAuiPaneInfo.SetAuiPaneCaption(Caption: String); @@ -692,7 +692,7 @@ Function TWxAuiPaneInfo.GetAuiPaneName: String; Begin - Result := Format('.Name(wxT("%s"))', [self.Name]); + Result := Format('.Name(%s)', [GetCppString(self.Name)]); End; Function TWxAuiPaneInfo.HasToolbarPaneStyle(Wx_Aui_Pane_Style: TwxAuiPaneStyleSet): Boolean; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxUtils.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxUtils.pas 2012-05-10 17:31:23 UTC (rev 1492) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxUtils.pas 2012-06-04 18:41:51 UTC (rev 1493) @@ -8101,12 +8101,12 @@ If trim(caption) = '' Then Result := '' Else - Result := Format('.Caption(wxT("%s"))', [caption]); + Result := Format('.Caption(%s)', [GetCppString(caption)]); End; Function GetAuiPaneName(name: String): String; Begin - Result := Format('.Name(wxT("%s"))', [name]); + Result := Format('.Name(%s)', [GetCppString(name)]); End; Function HasToolbarPaneStyle(Wx_Aui_Pane_Style: TwxAuiPaneStyleSet): Boolean; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdesigner.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/wxdesigner.pas 2012-05-10 17:31:23 UTC (rev 1492) +++ trunk/wxdevcpp/source/plugins/wxdsgn/wxdesigner.pas 2012-06-04 18:41:51 UTC (rev 1493) @@ -826,9 +826,9 @@ // String format tells us what function to wrap strings with in the generated C++ code // Possible values are wxT(), _T(), and _() StringFormat := ini.ReadString('wxWidgets', 'cbStringFormat', StringFormat); - // if there's no preference saved in the ini file, then default to wxT() + // if there's no preference saved in the ini file, then default to _() because it's Unicode safe. if trim(StringFormat) = '' then - StringFormat := 'wxT'; + StringFormat := '_'; UseDefaultPos := ini.ReadBool('wxWidgets', 'cbUseDefaultPos', FALSE); // ?? UseDefaultPos); UseDefaultSize := ini.ReadBool('wxWidgets', 'cbUseDefaultSize', FALSE); //?? UseDefaultSize); UseIndividEnums := ini.ReadBool('wxWidgets', 'cbIndividualEnums', TRUE); //?? UseIndividEnums); @@ -3305,7 +3305,7 @@ editorName := main.GetActiveEditorName; if ((UpperCase(SelectedComponent.ClassName) = UpperCase('TFrmNewForm')) and (not TFrmNewForm(TJvInspectorPropData(JvInspProperties.Selected.Data).Instance).KeepFormat)) then - GenerateXPMDirectly(TFrmNewForm(TJvInspectorPropData(JvInspProperties.Selected.Data).Instance).Wx_ICON.Bitmap, (editors[editorName] as TWXEditor).GetDesigner.Wx_Name, 'Self', editorName); + GenerateXPMDirectly(TFrmNewForm(TJvInspectorPropData(JvInspProperties.Selected.Data).Instance).Wx_ICON.Bitmap, SelectedComponent.Name, (editors[editorName] as TWXEditor).GetDesigner.Wx_Name, editorName); if ((UpperCase(SelectedComponent.ClassName) = UpperCase('TWxStaticBitmap')) and (not TWxStaticBitmap(TJvInspectorPropData(JvInspProperties.Selected.Data).Instance).KeepFormat)) then Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-05-10 17:31:23 UTC (rev 1492) +++ trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-06-04 18:41:51 UTC (rev 1493) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=62 +Build=69 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName= FileDescription=wxDev-C++ RAD add-on -FileVersion=7.4.2.62 +FileVersion=7.4.2.69 InternalName= LegalCopyright= LegalTrademarks= Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/project.pas =================================================================== --- trunk/wxdevcpp/source/project.pas 2012-05-10 17:31:23 UTC (rev 1492) +++ trunk/wxdevcpp/source/project.pas 2012-06-04 18:41:51 UTC (rev 1493) @@ -1942,6 +1942,7 @@ fUnits.Remove(index); UpdateNodeIndexes(); + SetModified(TRUE); //is this the PCH file? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-05-10 17:31:34
|
Revision: 1492 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1492&view=rev Author: tbreina Date: 2012-05-10 17:31:23 +0000 (Thu, 10 May 2012) Log Message: ----------- Update -c configuration code. Modified Paths: -------------- trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.dpr trunk/wxdevcpp/source/devcpp.res Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-04-29 22:43:20 UTC (rev 1491) +++ trunk/wxdevcpp/source/devcpp.dof 2012-05-10 17:31:23 UTC (rev 1492) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=553 +Build=559 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.553 +FileVersion=7.4.2.559 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.dpr =================================================================== --- trunk/wxdevcpp/source/devcpp.dpr 2012-04-29 22:43:20 UTC (rev 1491) +++ trunk/wxdevcpp/source/devcpp.dpr 2012-05-10 17:31:23 UTC (rev 1492) @@ -159,14 +159,14 @@ and ((paramIndex + 1) <= ParamCount)) then begin - paramString := IncludeTrailingPathDelimiter(ParamStr(paramIndex + 1)); + paramString := IncludeTrailingPathDelimiter(GetRealPath(ParamStr(paramIndex + 1), GetCurrentDir)); if not DirectoryExists(paramString) then if not ForceDirectories(paramString) then begin - ShowMessage('The configuration directory #10#13#10#13' + - paramString + - '#10#13#10#13does not exist and we were unable to ' + + ShowMessage('The configuration directory ' + #10#13 + + paramString + #10#13 + + ' does not exist and we were unable to ' + 'create it. Please check that the path is not read-only and that ' + 'you have sufficient privilieges to write to it.'#10#13#10#13 + 'wxDev-C++ will now exit.'); Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-04-29 22:43:26
|
Revision: 1491 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1491&view=rev Author: tbreina Date: 2012-04-29 22:43:20 +0000 (Sun, 29 Apr 2012) Log Message: ----------- Debugger parser update from Robert Wall for unicode strings. Modified Paths: -------------- trunk/wxdevcpp/source/debugger.pas trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/utils.pas Modified: trunk/wxdevcpp/source/debugger.pas =================================================================== --- trunk/wxdevcpp/source/debugger.pas 2012-04-13 17:35:12 UTC (rev 1490) +++ trunk/wxdevcpp/source/debugger.pas 2012-04-29 22:43:20 UTC (rev 1491) @@ -194,6 +194,7 @@ const GDBqStrEmpty: string = '\"'; const GDBwxString: string = 'wxString'; const wxStringBase: string = '<wxStringBase>'; +const wxUnicodeStr: string = 'static npos ='; const wpUnknown: string = '(unknown)'; const FileStr: string = 'File'; const FuncStr: string = 'Function'; @@ -1739,7 +1740,7 @@ Line: integer; Expr: string; Addr: string; - Vari: PWatchVar; + Vari : PWatchVar; Output: string; {Ret: Boolean;} @@ -3045,14 +3046,13 @@ Output: string; Vari: string; // This is called Var in the GDB spec ! // start: Integer; + Local : PWatchVar; Val: string; - Local: PWatchVar; - + begin // ParseResult Val := SplitResult(Str, @Vari); Output := Vari; Output := Output + ' = '; - // start := Pos(wxStringBase, Val); if (Vari = GDBname) then // a name of a Tuple begin New(Local); @@ -3068,14 +3068,7 @@ else if (Vari = GDBvalue) then // a value of named a Tuple begin - ReplaceWxStr(@Val); -// else -// if (AnsiStartsStr('"{', Val)) then // it's a named Tuple -// begin -// Output := Output + ExtractList(Str, PARSETUPLE, Level, List); -// end - if (AnsiStartsStr('"', Val)) then // it's a quoted string e.g. a value of a Tuple begin New(Local); @@ -3260,12 +3253,7 @@ s: integer; n: integer; Str2: string; - Local: PWatchVar; - - - - - + Local : PWatchVar; begin Str^ := TrimLeft(Str^); @@ -3298,21 +3286,6 @@ function TGDBDebugger.ExtractWxStr(Str: PString): string; - // Expects a Value specifically of the form: - - // {<wxStringBase> = {static npos = 1234567890, - // m_pchData = 0x12abcd \"A String with or without \\\"quotes\\\" embedded\"}, - // <No data fields>} - // - // or - // - // {<wxStringBase> = {static npos = 4294967295, - // m_pchData = 0x13 <Address 0x13 out of bounds>}, - // <No data fields>} - // - // (and may start with a quote and end with a comma) - // and returns the string only. - var starts: integer; ends: integer; @@ -3340,8 +3313,29 @@ procedure TGDBDebugger.ReplaceWxStr(Str: PString); -// Expects a string with embedded wxStrings specifically of the form expected -// by ExtractWxStr +// Expects a string with embedded wxStrings specifically of the form + +// {<wxStringBase> = {static npos = 1234567890, +// m_pchData = 0x12abcd \"A String with or without \\\"quotes\\\" embedded\"}, +// <No data fields>} +// +// or +// +// {<wxStringBase> = {static npos = 4294967295, +// m_pchData = 0x13 <Address 0x13 out of bounds>}, +// <No data fields>} +// +// or +// +// {static npos = 4294967295, m_impl = {static npos = 4294967295, +// _M_dataplus = {<std::allocator<wchar_t>> = { +// <__gnu_cxx::new_allocator<wchar_t>> = {<No data fields>}, +// <No data fields>},_M_p = 0x1279d0c L\"a string\"}}, +// m_convertedToChar = {m_str = 0x0, m_len = 4294967295}}"} +// +// (and may start with a quote and end with a comma) +// and returns the string only. + // and returns with the string that has only the quoted string itself embedded. // e.g. {MywxStr = {<wxStringBase> = {static npos = ..., m_pchData = 0x... \"AString\"}, <No data fields>}} // becomes @@ -3357,7 +3351,9 @@ begin Remainder := Str^; Output := ''; - wxstarts := AnsiPos('{' + wxStringBase, Remainder); + wxstarts := AnsiPos('{' + wxStringBase, Remainder); // search for both variants + if (wxstarts = 0) then + wxstarts := AnsiPos( '{'+wxUnicodeStr, Remainder); while (not (wxstarts = 0)) do begin Output := Output + AnsiLeftStr(Remainder, wxstarts - 1); @@ -3370,7 +3366,9 @@ break; end; Remainder := AnsiRightStr(Remainder, Length(Remainder) - ends + starts); - wxstarts := AnsiPos('{' + wxStringBase, Remainder); + wxstarts := AnsiPos( '{'+wxStringBase, Remainder); // search for both variants + if (wxstarts = 0) then + wxstarts := AnsiPos( '{'+wxUnicodeStr, Remainder); end; Str^ := Output + Remainder; end; Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-04-13 17:35:12 UTC (rev 1490) +++ trunk/wxdevcpp/source/devcpp.dof 2012-04-29 22:43:20 UTC (rev 1491) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=546 +Build=553 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.546 +FileVersion=7.4.2.553 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/utils.pas =================================================================== --- trunk/wxdevcpp/source/utils.pas 2012-04-13 17:35:12 UTC (rev 1490) +++ trunk/wxdevcpp/source/utils.pas 2012-04-29 22:43:20 UTC (rev 1491) @@ -1512,24 +1512,48 @@ end; function StrToFloatInternational(str : String): real; -const - chHolder = '!'; +var + f1 : real; + i : Integer; begin +// We are passing number strings in the US format which uses +// a period as the decimal point and a comma as the thousands separator. +// // On international locales, the decimal separator and thousand -// separators are reveresed from the US locale. -// e.g. one million is 1.000.000,00 -// StringToFloat can't handle the difference so we need to try it -// and if an exception occurs, convert the string to right locale. -// Basically, just swap DecimalSeparator with ThousandSeparator. +// different from the US locale. +// e.g. one million is 1.000.000,00 in Italy +// or 1 000 000,00 in the Ukraine +// Unfortunately, we are usually passing US locale-formatted +// float strings, which will cause exception errors with StrToFloat. +// So let's try StrToFloat and if we get an error we swap the decimal +// separator with the local decimal separator. +// Note: This will still fail if the string we pass has non-numeric characters +// or includes the thousands separator. However, the values should be ones that +// are being passed by the coder. So just beware. GAR 16 APR 2012 + try - Result := StrToFloat(str); + f1 := StrToFloat(str); except - str := StringReplace(str, DecimalSeparator, chHolder, [rfReplaceAll]); - str := StringReplace(str, ThousandSeparator, DecimalSeparator, [rfReplaceAll]); - str := StringReplace(str, chHolder, ThousandSeparator, [rfReplaceAll]); - Result := StrToFloat(str); + on EConvertError do + begin + // Start from end and replace last period with the local decimal separator + i := Length(str) - 1; // Start from end of string and go backward + while (i >= 0) do // Terminate loop when we reach beginning of string str + begin + if str[i] = '.' then // Found US locale decimal separator + begin + str[i] := DecimalSeparator; + i := -1; // Terminate loop + end + else + i := i - 1; // Go back one space in string + end; + + f1 := StrToFloat(str); + end end; + Result := f1; end; end. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-04-13 17:35:18
|
Revision: 1490 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1490&view=rev Author: tbreina Date: 2012-04-13 17:35:12 +0000 (Fri, 13 Apr 2012) Log Message: ----------- Random bug that occurs when we try to focus a synedit text that is not enabled. Modified Paths: -------------- trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/editor.pas Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-04-08 21:11:02 UTC (rev 1489) +++ trunk/wxdevcpp/source/devcpp.dof 2012-04-13 17:35:12 UTC (rev 1490) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=545 +Build=546 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.545 +FileVersion=7.4.2.546 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/editor.pas =================================================================== --- trunk/wxdevcpp/source/editor.pas 2012-04-08 21:11:02 UTC (rev 1489) +++ trunk/wxdevcpp/source/editor.pas 2012-04-13 17:35:12 UTC (rev 1490) @@ -306,7 +306,8 @@ else fNew := TRUE; - fText.Visible := TRUE; + fText.Show; + //fText.Visible := TRUE; fDebugHintTimer := TTimer.Create(Application); fDebugHintTimer.Interval := 1000; @@ -525,7 +526,7 @@ //Then do the actual changing fTabSheet.PageControl.Show; fTabSheet.PageControl.ActivePage := fTabSheet; - if fText.Visible then + if fText.Visible and fText.Enabled then fText.SetFocus; //Call the post-change event handler This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-04-08 21:11:08
|
Revision: 1489 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1489&view=rev Author: tbreina Date: 2012-04-08 21:11:02 +0000 (Sun, 08 Apr 2012) Log Message: ----------- StrToFloat failed on some locales because the decimal and thousand separators are different. For example, european locales use a comma as the decimal separator. I've added a StrToFloatInternational function which tries the standard StrToFloat and, if it fails, switches the thousands and decimal separators and tries again. Modified Paths: -------------- trunk/wxdevcpp/source/CFGINI.pas trunk/wxdevcpp/source/CFGReg.pas trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/utils.pas trunk/wxdevcpp/source/version.pas Modified: trunk/wxdevcpp/source/CFGINI.pas =================================================================== --- trunk/wxdevcpp/source/CFGINI.pas 2012-03-28 18:56:35 UTC (rev 1488) +++ trunk/wxdevcpp/source/CFGINI.pas 2012-04-08 21:11:02 UTC (rev 1489) @@ -22,7 +22,7 @@ interface uses - Classes, IniFiles, cfgTypes, TypInfo; + Classes, IniFiles, cfgTypes, TypInfo, utils; type TCFGINI = class(TObject) @@ -201,7 +201,7 @@ tkFloat: SetFloatProp(Obj, PropName, - StrtoFloat(fINI.ReadString(Section, PropName, '0.0'))); + StrToFloatInternational(fINI.ReadString(Section, PropName, '0.0'))); tkSet: SetOrdProp(Obj, PropName, ReadSet(Section + '.' + PropName, Modified: trunk/wxdevcpp/source/CFGReg.pas =================================================================== --- trunk/wxdevcpp/source/CFGReg.pas 2012-03-28 18:56:35 UTC (rev 1488) +++ trunk/wxdevcpp/source/CFGReg.pas 2012-04-08 21:11:02 UTC (rev 1489) @@ -23,7 +23,7 @@ uses {$IFDEF WIN32} - Classes, Registry, Types, TypInfo, cfgTypes; + Classes, Registry, Types, TypInfo, cfgTypes, utils; {$ENDIF} {$IFDEF LINUX} Classes, Types, TypInfo, cfgTypes; @@ -166,7 +166,7 @@ SetInt64Prop(Obj, PropName, StrtoInt(fReg.ReadString(PropName))); tkFloat: - SetFloatProp(Obj, PropName, StrtoFloat(fReg.ReadString(PropName))); + SetFloatProp(Obj, PropName, StrToFloatInternational(fReg.ReadString(PropName))); tkSet: SetOrdProp(Obj, PropName, ReadSet(PropName, Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-03-28 18:56:35 UTC (rev 1488) +++ trunk/wxdevcpp/source/devcpp.dof 2012-04-08 21:11:02 UTC (rev 1489) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=543 +Build=545 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.543 +FileVersion=7.4.2.545 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/utils.pas =================================================================== --- trunk/wxdevcpp/source/utils.pas 2012-03-28 18:56:35 UTC (rev 1488) +++ trunk/wxdevcpp/source/utils.pas 2012-04-08 21:11:02 UTC (rev 1489) @@ -161,6 +161,8 @@ function IsNumeric(s: string): boolean; +function StrToFloatInternational(str : String): real; + implementation uses @@ -1509,4 +1511,25 @@ end; end; +function StrToFloatInternational(str : String): real; +const + chHolder = '!'; +begin + +// On international locales, the decimal separator and thousand +// separators are reveresed from the US locale. +// e.g. one million is 1.000.000,00 +// StringToFloat can't handle the difference so we need to try it +// and if an exception occurs, convert the string to right locale. +// Basically, just swap DecimalSeparator with ThousandSeparator. + try + Result := StrToFloat(str); + except + str := StringReplace(str, DecimalSeparator, chHolder, [rfReplaceAll]); + str := StringReplace(str, ThousandSeparator, DecimalSeparator, [rfReplaceAll]); + str := StringReplace(str, chHolder, ThousandSeparator, [rfReplaceAll]); + Result := StrToFloat(str); + end; +end; + end. Modified: trunk/wxdevcpp/source/version.pas =================================================================== --- trunk/wxdevcpp/source/version.pas 2012-03-28 18:56:35 UTC (rev 1488) +++ trunk/wxdevcpp/source/version.pas 2012-04-08 21:11:02 UTC (rev 1489) @@ -1269,7 +1269,7 @@ strInclude + ';' + StringReplace(GetProgramFilesDir, ' (x86)', '', []) + '\Microsoft SDKs\Windows\v6.0A\Include;' else - if (strtofloat(versionString) >= 10.0) then + if (StrToFloatInternational(versionString) >= 10.0) then strInclude := strInclude + ';' + IncludeTrailingPathDelimiter(strFSDKInstallDir) + 'include'; strInclude := strInclude + ';$(WinSDKDir)include;'; @@ -1287,7 +1287,7 @@ StringReplace(GetProgramFilesDir, ' (x86)', '', []) + '\Microsoft SDKs\Windows\v6.0A\Bin;' else - if (strtofloat(versionString) >= 10.0) then + if (StrToFloatInternational(versionString) >= 10.0) then strBin := strBin + ';' + IncludeTrailingPathDelimiter(strFSDKInstallDir) + 'bin'; strBin := strBin + ';$(WinSDKDir)bin;'; @@ -1304,7 +1304,7 @@ StringReplace(GetProgramFilesDir, ' (x86)', '', []) + '\Microsoft SDKs\Windows\v6.0A\Lib;' else - if (strtofloat(versionString) >= 10.0) then + if (StrToFloatInternational(versionString) >= 10.0) then strLib := strLib + ';' + IncludeTrailingPathDelimiter(strFSDKInstallDir) + 'lib'; strLib := strLib + ';$(WinSDKDir)lib;'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-03-28 18:56:41
|
Revision: 1488 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1488&view=rev Author: tbreina Date: 2012-03-28 18:56:35 +0000 (Wed, 28 Mar 2012) Log Message: ----------- 7.4.2.542 Release / 7.4.2.61 wxdsgn Modified Paths: -------------- trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-03-27 20:40:32 UTC (rev 1487) +++ trunk/wxdevcpp/source/devcpp.dof 2012-03-28 18:56:35 UTC (rev 1488) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=542 +Build=543 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.542 +FileVersion=7.4.2.543 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-03-27 20:40:32 UTC (rev 1487) +++ trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-03-28 18:56:35 UTC (rev 1488) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=61 +Build=62 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName= FileDescription=wxDev-C++ RAD add-on -FileVersion=7.4.2.61 +FileVersion=7.4.2.62 InternalName= LegalCopyright= LegalTrademarks= Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-03-27 20:40:39
|
Revision: 1487 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1487&view=rev Author: tbreina Date: 2012-03-27 20:40:32 +0000 (Tue, 27 Mar 2012) Log Message: ----------- Fixed code completion listbox. Now you can add new files and folders without removing the old ones in the cache. Also, horizontal scrollbar now shows up as necessary in listbox. Modified Paths: -------------- trunk/wxdevcpp/source/EditorOptfrm.dfm trunk/wxdevcpp/source/EditorOptfrm.pas trunk/wxdevcpp/source/LangFrm.pas trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.res Modified: trunk/wxdevcpp/source/EditorOptfrm.dfm =================================================================== --- trunk/wxdevcpp/source/EditorOptfrm.dfm 2012-03-27 03:55:29 UTC (rev 1486) +++ trunk/wxdevcpp/source/EditorOptfrm.dfm 2012-03-27 20:40:32 UTC (rev 1487) @@ -1139,6 +1139,7 @@ Top = 120 Width = 369 Height = 155 + AutoComplete = False ItemHeight = 13 ParentShowHint = False ShowHint = True Modified: trunk/wxdevcpp/source/EditorOptfrm.pas =================================================================== --- trunk/wxdevcpp/source/EditorOptfrm.pas 2012-03-27 03:55:29 UTC (rev 1486) +++ trunk/wxdevcpp/source/EditorOptfrm.pas 2012-03-27 20:40:32 UTC (rev 1487) @@ -111,7 +111,7 @@ chkCBUseColors: TCheckBox; chkCCCache: TCheckBox; CppTokenizer1: TCppTokenizer; - CppParser1: TCppParser; + CppParser1: TCppParser; // This is our local copy of the cache. lbCCC: TListBox; lblCCCache: TLabel; pbCCCache: TProgressBar; @@ -249,14 +249,10 @@ procedure LoadSyntax(Value: string); procedure FillSyntaxSets; procedure FillCCC; - function CompactFilename(filename: string): string; end; var EditorOptForm: TEditorOptForm; -function PathCompactPath(hDC: HDC; lpszPath: pchar; dx: UINT): boolean; - stdcall; - external 'shlwapi.dll' name 'PathCompactPathA'; implementation @@ -479,8 +475,8 @@ begin if (lbCCC.ItemIndex >= 0) and - (lbCCC.ItemIndex < MainForm.CppParser1.ScannedFiles.Count) then - lbCCC.Hint := MainForm.CppParser1.ScannedFiles.Strings[lbCCC.ItemIndex]; + (lbCCC.ItemIndex < CppParser1.ScannedFiles.Count) then + lbCCC.Hint := CppParser1.ScannedFiles.Strings[lbCCC.ItemIndex]; end; @@ -1640,7 +1636,7 @@ procedure TEditorOptForm.btnCCCnewClick(Sender: TObject); var - I, I1: integer; + I, I1, maxItemWidth, nItemWidth: integer; Hits: integer; MaxHits, MaxIndex: integer; sl: TStrings; @@ -1703,8 +1699,15 @@ CppParser1.OnTotalProgress := CppParser1TotalProgress; filesSelected := TStringList.Create; + filesSelected.Duplicates := dupIgnore; filesSelected.Clear; + // Add the files already in the cache + for I := 0 to MainForm.CppParser1.CacheContents.Count - 1 do + begin + CppParser1.AddFileToScan(MainForm.CppParser1.CacheContents[I]); + end; + //Add the files to scan and then parse the list for I := 0 to OpenDialog.Files.Count - 1 do begin @@ -1720,10 +1723,23 @@ CppParser1.ParseList; Screen.Cursor := crDefault; + maxItemWidth := 0; + //Finally append the new items unto the listbox for I := 0 to filesSelected.Count - 1 do - lbCCC.Items.Add(CompactFilename(filesSelected[I])); + begin + lbCCC.Items.Add(filesSelected[I]); + // Determine the screen width to set the horizontal scrollbar + nItemWidth := lbCCC.Canvas.TextWidth(lbCCC.Items[I] + 'WWWWW'); // Adding extra 'W' to give more space + if (nItemWidth > maxItemWidth) then + maxItemWidth := nItemWidth; + end; + + // This activates the scrollbar. + if (maxItemWidth > lbCCC.ClientWidth) then + lbCCC.ScrollWidth := maxItemWidth; + filesSelected.Clear; filesSelected.Free; @@ -1752,6 +1768,7 @@ CppParser1.OnTotalProgress := CppParser1TotalProgress; CppParser1.OnCacheProgress := NIL; lbCCC.Items.Clear; + lbCCC.ScrollWidth := 0; chkCCCache.Tag := 1; // mark modified end; end; @@ -1759,13 +1776,31 @@ procedure TEditorOptForm.FillCCC; var I: integer; + maxItemWidth, nItemWidth : integer; begin Screen.Cursor := crHourglass; + lbCCC.Items.BeginUpdate; + + maxItemWidth := 0; + for I := 0 to MainForm.CppParser1.CacheContents.Count - 1 do - lbCCC.Items.Add(CompactFilename(MainForm.CppParser1.CacheContents[I])); + begin + lbCCC.Items.Add(MainForm.CppParser1.CacheContents[I]); + // Determine the screen width of the text to set up the horizontal scrollbar + nItemWidth := lbCCC.Canvas.TextWidth(lbCCC.Items[I] + 'WWWWW'); // Adding extra 'W' to give more space + if (nItemWidth > maxItemWidth) then + maxItemWidth := nItemWidth; + end; + + // Set the horizontal scrollbar for the listbox + if (maxItemWidth > lbCCC.ClientWidth) then + lbCCC.ScrollWidth := maxItemWidth; + + lbCCC.Items.EndUpdate; + Screen.Cursor := crDefault; end; @@ -1777,16 +1812,6 @@ btnCCCdelete.Enabled := chkCCCache.Checked; end; -function TEditorOptForm.CompactFilename(filename: string): string; -var - DC: HDC; -begin - //Get a handle to the DC - DC := lbCCC.Canvas.Handle; - PathCompactPath(DC, pchar(filename), lbCCC.ClientWidth); - Result := filename; -end; - procedure TEditorOptForm.CppParser1StartParsing(Sender: TObject); begin chkCCCache.Enabled := FALSE; @@ -1925,7 +1950,7 @@ chosenDirectory: string; filesSelected, FileList: TStringList; I: integer; - + maxItemWidth, nItemWidth : integer; begin if SelectDirectory('Select directory to add to cache', '', chosenDirectory) then //(SelectDirectory(chosenDirectory, [], 0)) then @@ -1934,18 +1959,27 @@ Application.ProcessMessages; Screen.Cursor := crHourglass; - //Track the cache parse progress + //Track the cache parse progress HasProgressStarted := FALSE; CppParser1.OnStartParsing := CppParser1StartParsing; CppParser1.OnEndParsing := CppParser1EndParsing; CppParser1.OnTotalProgress := CppParser1TotalProgress; FileList := TStringList.Create; - // Get all header files + FileList.Duplicates := dupIgnore; // Ignore all duplicates + + // Get all header files FilesFromWildCard(chosenDirectory, '*.*', FileList, TRUE, FALSE, TRUE); filesSelected := TStringList.Create; filesSelected.Clear; + + // Add the files already in the cache + for I := 0 to MainForm.CppParser1.CacheContents.Count - 1 do + begin + filesSelected.Add(MainForm.CppParser1.CacheContents[I]); + end; + for I := 0 to FileList.Count - 1 do if (GetFileTyp(FileList[I]) = utHead) then filesSelected.Add(FileList[I]); @@ -1953,10 +1987,10 @@ FileList.Clear; FileList.Free; - //Add the files to scan and then parse the list + //Add the files to scan and then parse the list for I := 0 to filesSelected.Count - 1 do begin - // See if file is already in the cache + // See if file is already in the cache if (CppParser1.CacheContents.IndexOf(filesSelected[I]) = -1) then CppParser1.AddFileToScan(filesSelected[I]) else @@ -1971,13 +2005,25 @@ lbCCC.Items.BeginUpdate; // Prevent refresh until all items written + maxItemWidth := 0; + //Finally append the new items unto the listbox for I := 0 to filesSelected.Count - 1 do begin - lbCCC.Items.Add(CompactFilename(filesSelected[I])); + lbCCC.Items.Add(filesSelected[I]); + + // Determine the onscreen width to set the horizontal scrollbar + nItemWidth := lbCCC.Canvas.TextWidth(lbCCC.Items[I] + 'WWWWW'); // Adding extra 'W' to give more space + if (nItemWidth > maxItemWidth) then + maxItemWidth := nItemWidth; + pbCCCache.StepIt; end; + if (maxItemWidth > lbCCC.ClientWidth) then + lbCCC.ScrollWidth := maxItemWidth; + + lbCCC.Items.EndUpdate; // Ok now refresh listbox with new items filesSelected.Clear; Modified: trunk/wxdevcpp/source/LangFrm.pas =================================================================== --- trunk/wxdevcpp/source/LangFrm.pas 2012-03-27 03:55:29 UTC (rev 1486) +++ trunk/wxdevcpp/source/LangFrm.pas 2012-03-27 20:40:32 UTC (rev 1487) @@ -326,6 +326,8 @@ MainForm.ClassBrowser1.SetUpdateOff; s := TStringList.Create; + s.Duplicates := dupIgnore; // Ignore all duplicates + if DirCheckBox.Checked then StrToList(DirEdit.Text, s) else Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-03-27 03:55:29 UTC (rev 1486) +++ trunk/wxdevcpp/source/devcpp.dof 2012-03-27 20:40:32 UTC (rev 1487) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=514 +Build=542 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.514 +FileVersion=7.4.2.542 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-03-27 03:55:35
|
Revision: 1486 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1486&view=rev Author: tbreina Date: 2012-03-27 03:55:29 +0000 (Tue, 27 Mar 2012) Log Message: ----------- Changed CodeComplForm destructor to Release Added if-then to make sure foldername wasn't greater than size of the buffer Changed logic for cache wildcard so that only header files are added to the cache. Re-labeled "Loading cache..." to "Parsing files..." which is more accurate. Modified Paths: -------------- trunk/wxdevcpp/source/EditorOptfrm.dfm trunk/wxdevcpp/source/EditorOptfrm.pas trunk/wxdevcpp/source/LangFrm.pas trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas trunk/wxdevcpp/source/packages/Parser/CppTokenizer.pas trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res Modified: trunk/wxdevcpp/source/EditorOptfrm.dfm =================================================================== --- trunk/wxdevcpp/source/EditorOptfrm.dfm 2012-03-24 03:28:15 UTC (rev 1485) +++ trunk/wxdevcpp/source/EditorOptfrm.dfm 2012-03-27 03:55:29 UTC (rev 1486) @@ -454,7 +454,7 @@ Width = 181 Height = 21 Anchors = [akLeft, akRight, akBottom] - ItemHeight = 0 + ItemHeight = 13 TabOrder = 6 OnChange = FontChange OnDblClick = cboDblClick @@ -465,7 +465,7 @@ Width = 87 Height = 21 Anchors = [akLeft, akRight, akBottom] - ItemHeight = 0 + ItemHeight = 13 TabOrder = 7 OnChange = FontSizeChange OnDblClick = cboDblClick @@ -527,7 +527,7 @@ Top = 32 Width = 180 Height = 21 - ItemHeight = 0 + ItemHeight = 13 TabOrder = 0 OnDblClick = cboDblClick OnSelect = FontChange @@ -537,7 +537,7 @@ Top = 32 Width = 80 Height = 21 - ItemHeight = 0 + ItemHeight = 13 TabOrder = 1 OnChange = FontSizeChange OnDblClick = cboDblClick @@ -1111,9 +1111,9 @@ object txtLoadingCache: TLabel Left = 8 Top = 320 - Width = 80 + Width = 68 Height = 13 - Caption = 'Loading cache...' + Caption = 'Parsing files ...' Visible = False end object chkEnableCompletion: TCheckBox Modified: trunk/wxdevcpp/source/EditorOptfrm.pas =================================================================== --- trunk/wxdevcpp/source/EditorOptfrm.pas 2012-03-24 03:28:15 UTC (rev 1485) +++ trunk/wxdevcpp/source/EditorOptfrm.pas 2012-03-27 03:55:29 UTC (rev 1486) @@ -26,7 +26,7 @@ uses //dbugintf, EAB removed Gexperts debug stuff. {$IFDEF WIN32} - Windows, Messages, SysUtils, Variants, Graphics, Controls, Forms, + Windows, Messages, SysUtils, Variants, Graphics, Controls, Forms, Dialogs, ComCtrls, devTabs, StdCtrls, ExtCtrls, Spin, ColorPickerButton, SynEdit, SynEditHighlighter, SynHighlighterCpp, CheckLst, SynMemo, FileCtrl, Buttons, ClassBrowser, CppParser, CppTokenizer, StrUtils, XPMenu, Classes; @@ -1940,59 +1940,46 @@ CppParser1.OnEndParsing := CppParser1EndParsing; CppParser1.OnTotalProgress := CppParser1TotalProgress; - filesSelected := TStringList.Create; - filesSelected.Clear; - FileList := TStringList.Create; + // Get all header files + FilesFromWildCard(chosenDirectory, '*.*', FileList, TRUE, FALSE, TRUE); - // This is kludge to get all header files - FilesFromWildCard(chosenDirectory, '*.h', FileList, TRUE, FALSE, TRUE); + filesSelected := TStringList.Create; + filesSelected.Clear; for I := 0 to FileList.Count - 1 do - filesSelected.Add(FileList[I]); + if (GetFileTyp(FileList[I]) = utHead) then + filesSelected.Add(FileList[I]); + FileList.Clear; - FilesFromWildCard(chosenDirectory, '*.hpp', FileList, TRUE, FALSE, TRUE); - for I := 0 to FileList.Count - 1 do - filesSelected.Add(FileList[I]); - FileList.Clear; - FilesFromWildCard(chosenDirectory, '*.hh', FileList, TRUE, FALSE, TRUE); - for I := 0 to FileList.Count - 1 do - filesSelected.Add(FileList[I]); - FileList.Clear; - FilesFromWildCard(chosenDirectory, '*.rh', FileList, TRUE, FALSE, TRUE); - for I := 0 to FileList.Count - 1 do - filesSelected.Add(FileList[I]); - FileList.Clear; - FileList.Assign(filesSelected); - filesSelected.Clear; - // End kludge + FileList.Free; //Add the files to scan and then parse the list - for I := 0 to FileList.Count - 1 do + for I := 0 to filesSelected.Count - 1 do begin // See if file is already in the cache - if (CppParser1.CacheContents.IndexOf(FileList[I]) = -1) then - begin - filesSelected.Add(FileList.Strings[I]); - CppParser1.AddFileToScan(FileList[I]); - end; + if (CppParser1.CacheContents.IndexOf(filesSelected[I]) = -1) then + CppParser1.AddFileToScan(filesSelected[I]) + else + filesSelected.Delete(I); end; - FileList.Clear; - FileList.Free; - CppParser1.ParseList; pbCCCache.Max := filesSelected.Count; pbCCCache.StepBy(1); - //Finally append the new items unto the listbox + lbCCC.Items.BeginUpdate; // Prevent refresh until all items written + + //Finally append the new items unto the listbox for I := 0 to filesSelected.Count - 1 do begin lbCCC.Items.Add(CompactFilename(filesSelected[I])); pbCCCache.StepIt; end; + lbCCC.Items.EndUpdate; // Ok now refresh listbox with new items + filesSelected.Clear; filesSelected.Free; Modified: trunk/wxdevcpp/source/LangFrm.pas =================================================================== --- trunk/wxdevcpp/source/LangFrm.pas 2012-03-24 03:28:15 UTC (rev 1485) +++ trunk/wxdevcpp/source/LangFrm.pas 2012-03-27 03:55:29 UTC (rev 1486) @@ -189,11 +189,13 @@ HasProgressStarted := TRUE; end; pbCCCache.Position := pbCCCache.Position + Current; + if FileName <> '' then - ParseLabel.Caption := 'Parsing file: ' + FileName + // Use MinimizeName to truncate the filename to fit the ParseLabel width + ParseLabel.Caption := 'Parsing file: ' + MinimizeName(FileName, ParseLabel.Canvas, 200) else ParseLabel.Caption := 'Finalizing... Please wait'; - ParseLabel.Width := 250; + Application.ProcessMessages; end; @@ -221,7 +223,10 @@ begin { Found one! } fileName := Directory + SearchRec.Name; - if (MainForm.CppParser1.CacheContents.IndexOf(fileName) = -1) then + // Add only header files - .h, .hpp, .hh + // Don't include duplicates + if ((MainForm.CppParser1.CacheContents.IndexOf(fileName) = -1) + and (GetFileTyp(fileName) = utHead) ) then MainForm.CppParser1.AddFileToScan(fileName); Error := FindNext(SearchRec); Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-03-24 03:28:15 UTC (rev 1485) +++ trunk/wxdevcpp/source/devcpp.dof 2012-03-27 03:55:29 UTC (rev 1486) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=492 +Build=514 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.492 +FileVersion=7.4.2.514 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas =================================================================== --- trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas 2012-03-24 03:28:15 UTC (rev 1485) +++ trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas 2012-03-27 03:55:29 UTC (rev 1486) @@ -194,11 +194,10 @@ else fIncludedFiles := NIL; - // GAR 3/20/2012 I'm still not convinced that we need to - // explicitly free CodeComplForm since it is a TForm. - // Maybe, CodeComplForm.Release would be a better solution?? + // GAR 3/26/2012 + // Do we need to explicitly Release the TForm? if Assigned(CodeComplForm) then - FreeAndNil(CodeComplForm) + CodeComplForm.Release else CodeComplForm := NIL; Modified: trunk/wxdevcpp/source/packages/Parser/CppTokenizer.pas =================================================================== --- trunk/wxdevcpp/source/packages/Parser/CppTokenizer.pas 2012-03-24 03:28:15 UTC (rev 1485) +++ trunk/wxdevcpp/source/packages/Parser/CppTokenizer.pas 2012-03-27 03:55:29 UTC (rev 1486) @@ -227,9 +227,15 @@ begin Token := New(PToken); FillChar(Token^.Text, sizeof(Token^.Text), 0); - Token^.Text := sText; - Token^.Line := iLine; - fTokenList.Add(Token); + + // Make sure token isn't greater than buffer size + if Length(sText) < sizeof(Token^.Text) then + begin + Token^.Text := sText; + Token^.Line := iLine; + fTokenList.Add(Token); + end; + end; procedure TCppTokenizer.CountLines; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-03-24 03:28:15 UTC (rev 1485) +++ trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-03-27 03:55:29 UTC (rev 1486) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=60 +Build=61 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName= FileDescription=wxDev-C++ RAD add-on -FileVersion=7.4.2.60 +FileVersion=7.4.2.61 InternalName= LegalCopyright= LegalTrademarks= Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-03-24 03:28:22
|
Revision: 1485 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1485&view=rev Author: tbreina Date: 2012-03-24 03:28:15 +0000 (Sat, 24 Mar 2012) Log Message: ----------- Trying to solve Robert's ReadFile problem in TCodeParser.Load. I'm checking the return size of strLen to make sure it's correct. Otherwise, it will show a message of its size. Also, I've put the FreeAndNil for CodeComplForm at the end of the TCodeCompletion.Destroy since the fCompletionStatementList and fFullCompletionStatementLists point to the CodeCompletionForm's TListBox and think need to be free and niled before the form. Modified Paths: -------------- trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas trunk/wxdevcpp/source/packages/Parser/CppParser.pas Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-03-20 17:52:16 UTC (rev 1484) +++ trunk/wxdevcpp/source/devcpp.dof 2012-03-24 03:28:15 UTC (rev 1485) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=491 +Build=492 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.491 +FileVersion=7.4.2.492 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas =================================================================== --- trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas 2012-03-20 17:52:16 UTC (rev 1484) +++ trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas 2012-03-24 03:28:15 UTC (rev 1485) @@ -155,14 +155,6 @@ destructor TCodeCompletion.Destroy; begin - // GAR 3/20/2012 I'm still not convinced that we need to - // explicitly free CodeComplForm since it is a TForm. - // Maybe, CodeComplForm.Release would be a better solution?? - if Assigned(CodeComplForm) then - FreeAndNil(CodeComplForm) - else - CodeComplForm := NIL; - // GAR 3/20/2012 // Normally fCompletionStatementList would need to be specifically // Disposed and Deleted item by item in the TList. However, @@ -202,6 +194,14 @@ else fIncludedFiles := NIL; + // GAR 3/20/2012 I'm still not convinced that we need to + // explicitly free CodeComplForm since it is a TForm. + // Maybe, CodeComplForm.Release would be a better solution?? + if Assigned(CodeComplForm) then + FreeAndNil(CodeComplForm) + else + CodeComplForm := NIL; + inherited Destroy; end; Modified: trunk/wxdevcpp/source/packages/Parser/CppParser.pas =================================================================== --- trunk/wxdevcpp/source/packages/Parser/CppParser.pas 2012-03-20 17:52:16 UTC (rev 1484) +++ trunk/wxdevcpp/source/packages/Parser/CppParser.pas 2012-03-24 03:28:15 UTC (rev 1485) @@ -2527,61 +2527,96 @@ FileRead(hFile, _DeclImplLine, SizeOf(_DeclImplLine)); FileRead(hFile, _Line, SizeOf(_Line)); - FileRead(hFile, strLen, SizeOf(strLen)); // Read string length - ReallocMem(Buf, strLen + 1); // +1 for the string terminator - FileRead(hFile, Buf^, strLen); // Read buffer - FillChar((Buf + strLen)^, 1, 0); - _FullText := Buf; + if (FileRead(hFile, strLen, SizeOf(strLen)) = sizeof(strLen)) then // Read string length + begin + ReallocMem(Buf, strLen + 1); // +1 for the string terminator + FileRead(hFile, Buf^, strLen); // Read buffer + FillChar((Buf + strLen)^, 1, 0); + _FullText := Buf; + end + else + ShowMessage(Format('strLen = %d', [strLen])); - FileRead(hFile, strLen, SizeOf(strLen)); // Read string length - ReallocMem(Buf, strLen + 1); // +1 for the string terminator - FileRead(hFile, Buf^, strLen); // Read buffer - FillChar((Buf + strLen)^, 1, 0); - _Type := Buf; + if (FileRead(hFile, strLen, SizeOf(strLen)) = sizeof(strLen)) then // Read string length + begin + ReallocMem(Buf, strLen + 1); // +1 for the string terminator + FileRead(hFile, Buf^, strLen); // Read buffer + FillChar((Buf + strLen)^, 1, 0); + _Type := Buf; + end + else + ShowMessage(Format('strLen = %d', [strLen])); - FileRead(hFile, strLen, SizeOf(strLen)); // Read string length - ReallocMem(Buf, strLen + 1); // +1 for the string terminator - FileRead(hFile, Buf^, strLen); // Read buffer - FillChar((Buf + strLen)^, 1, 0); - _Command := Buf; + if (FileRead(hFile, strLen, SizeOf(strLen)) = sizeof(strLen)) then // Read string length + begin + ReallocMem(Buf, strLen + 1); // +1 for the string terminator + FileRead(hFile, Buf^, strLen); // Read buffer + FillChar((Buf + strLen)^, 1, 0); + _Command := Buf; + end + else + ShowMessage(Format('strLen = %d', [strLen])); - FileRead(hFile, strLen, SizeOf(strLen)); // Read string length - ReallocMem(Buf, strLen + 1); // +1 for the string terminator - FileRead(hFile, Buf^, strLen); // Read buffer - FillChar((Buf + strLen)^, 1, 0); - _Args := Buf; + if (FileRead(hFile, strLen, SizeOf(strLen)) = sizeof(strLen)) then // Read string length + begin + ReallocMem(Buf, strLen + 1); // +1 for the string terminator + FileRead(hFile, Buf^, strLen); // Read buffer + FillChar((Buf + strLen)^, 1, 0); + _Args := Buf; + end + else + ShowMessage(Format('strLen = %d', [strLen])); - FileRead(hFile, strLen, SizeOf(strLen)); // Read string length - ReallocMem(Buf, strLen + 1); // +1 for the string terminator - FileRead(hFile, Buf^, strLen); // Read buffer - FillChar((Buf + strLen)^, 1, 0); - _ScopelessCmd := Buf; + if (FileRead(hFile, strLen, SizeOf(strLen)) = sizeof(strLen)) then // Read string length + begin + ReallocMem(Buf, strLen + 1); // +1 for the string terminator + FileRead(hFile, Buf^, strLen); // Read buffer + FillChar((Buf + strLen)^, 1, 0); + _ScopelessCmd := Buf; + end + else + ShowMessage(Format('strLen = %d', [strLen])); - FileRead(hFile, strLen, SizeOf(strLen)); // Read string length - ReallocMem(Buf, strLen + 1); // +1 for the string terminator - FileRead(hFile, Buf^, strLen); // Read buffer - FillChar((Buf + strLen)^, 1, 0); - _DeclImplFileName := Buf; + if (FileRead(hFile, strLen, SizeOf(strLen)) = sizeof(strLen)) then // Read string length + begin + ReallocMem(Buf, strLen + 1); // +1 for the string terminator + FileRead(hFile, Buf^, strLen); // Read buffer + FillChar((Buf + strLen)^, 1, 0); + _DeclImplFileName := Buf; + end + else + ShowMessage(Format('strLen = %d', [strLen])); - FileRead(hFile, strLen, SizeOf(strLen)); // Read string length - ReallocMem(Buf, strLen + 1); // +1 for the string terminator - FileRead(hFile, Buf^, strLen); // Read buffer - FillChar((Buf + strLen)^, 1, 0); - _FileName := Buf; + if (FileRead(hFile, strLen, SizeOf(strLen)) = sizeof(strLen)) then // Read string length + begin + ReallocMem(Buf, strLen + 1); // +1 for the string terminator + FileRead(hFile, Buf^, strLen); // Read buffer + FillChar((Buf + strLen)^, 1, 0); + _FileName := Buf; + end + else + ShowMessage(Format('strLen = %d', [strLen])); - FileRead(hFile, strLen, SizeOf(strLen)); // Read string length - ReallocMem(Buf, strLen + 1); // +1 for the string terminator - FileRead(hFile, Buf^, strLen); // Read buffer - FillChar((Buf + strLen)^, 1, 0); - _InheritsFromIDs := Buf; + if (FileRead(hFile, strLen, SizeOf(strLen)) = sizeof(strLen)) then // Read string length + begin + ReallocMem(Buf, strLen + 1); // +1 for the string terminator + FileRead(hFile, Buf^, strLen); // Read buffer + FillChar((Buf + strLen)^, 1, 0); + _InheritsFromIDs := Buf; + end + else + ShowMessage(Format('strLen = %d', [strLen])); - FileRead(hFile, strLen, SizeOf(strLen)); // Read string length - ReallocMem(Buf, strLen + 1); // +1 for the string terminator - FileRead(hFile, Buf^, strLen); // Read buffer - FillChar((Buf + strLen)^, 1, 0); - _InheritsFromClasses := Buf; + if (FileRead(hFile, strLen, SizeOf(strLen)) = sizeof(strLen)) then // Read string length + begin + ReallocMem(Buf, strLen + 1); // +1 for the string terminator + FileRead(hFile, Buf^, strLen); // Read buffer + FillChar((Buf + strLen)^, 1, 0); + _InheritsFromClasses := Buf; + end + else + ShowMessage(Format('strLen = %d', [strLen])); - _Loaded := TRUE; _NoCompletion := FALSE; _Temporary := FALSE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-03-20 17:52:30
|
Revision: 1484 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1484&view=rev Author: tbreina Date: 2012-03-20 17:52:16 +0000 (Tue, 20 Mar 2012) Log Message: ----------- Code beautifier. Some commenting of CodeCompletion.pas Pretty close to 7.4.2 release. Modified Paths: -------------- trunk/wxdevcpp/source/AboutFrm.pas trunk/wxdevcpp/source/AddToDoFm.pas trunk/wxdevcpp/source/CFGData.pas trunk/wxdevcpp/source/CFGINI.pas trunk/wxdevcpp/source/CFGReg.pas trunk/wxdevcpp/source/CVSFm.pas trunk/wxdevcpp/source/CVSPasswdFm.pas trunk/wxdevcpp/source/CVSThread.pas trunk/wxdevcpp/source/CodeIns.pas trunk/wxdevcpp/source/CompOptionsFrm.pas trunk/wxdevcpp/source/CompileProgressFm.pas trunk/wxdevcpp/source/CompilerOptionsFrame.pas trunk/wxdevcpp/source/DevThemes.pas trunk/wxdevcpp/source/EditorOptfrm.pas trunk/wxdevcpp/source/Envirofrm.pas trunk/wxdevcpp/source/ExceptionFilterUnit.pas trunk/wxdevcpp/source/FileAssocs.pas trunk/wxdevcpp/source/FilePropertiesFm.pas trunk/wxdevcpp/source/FilesReloadFrm.pas trunk/wxdevcpp/source/Findfrm.pas trunk/wxdevcpp/source/FunctionSearchFm.pas trunk/wxdevcpp/source/GotoLineFrm.pas trunk/wxdevcpp/source/IconFrm.pas trunk/wxdevcpp/source/ImageTheme.pas trunk/wxdevcpp/source/ImportMSVCFm.pas trunk/wxdevcpp/source/Incrementalfrm.pas trunk/wxdevcpp/source/LangFrm.pas trunk/wxdevcpp/source/LanguagesDEPfix.pas trunk/wxdevcpp/source/Macros.pas trunk/wxdevcpp/source/ModifyVarFrm.pas trunk/wxdevcpp/source/MultiLangSupport.pas trunk/wxdevcpp/source/NewClassFm.pas trunk/wxdevcpp/source/NewMemberFm.pas trunk/wxdevcpp/source/NewProjectFrm.pas trunk/wxdevcpp/source/NewTemplateFm.pas trunk/wxdevcpp/source/NewVarFm.pas trunk/wxdevcpp/source/OpenSaveDialogs.pas trunk/wxdevcpp/source/ParamsFrm.pas trunk/wxdevcpp/source/PrintFrm.pas trunk/wxdevcpp/source/ProcessListFrm.pas trunk/wxdevcpp/source/ProfileAnalysisFm.pas trunk/wxdevcpp/source/ProjectOptionsFrm.pas trunk/wxdevcpp/source/RemoveUnitFrm.pas trunk/wxdevcpp/source/Replacefrm.pas trunk/wxdevcpp/source/Search_Center.pas trunk/wxdevcpp/source/Splash.pas trunk/wxdevcpp/source/Templates.pas trunk/wxdevcpp/source/TipOfTheDayFm.pas trunk/wxdevcpp/source/ToolEditFrm.pas trunk/wxdevcpp/source/ToolFrm.pas trunk/wxdevcpp/source/WindowListFrm.pas trunk/wxdevcpp/source/cfgTypes.pas trunk/wxdevcpp/source/compiler.pas trunk/wxdevcpp/source/datamod.pas trunk/wxdevcpp/source/debugCPU.pas trunk/wxdevcpp/source/debugfrm.pas trunk/wxdevcpp/source/debugger.pas trunk/wxdevcpp/source/devExec.pas trunk/wxdevcpp/source/devcfg.pas trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.dpr trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/devrun.pas trunk/wxdevcpp/source/editor.pas trunk/wxdevcpp/source/helpfrm.pas trunk/wxdevcpp/source/hh.pas trunk/wxdevcpp/source/hh_funcs.pas trunk/wxdevcpp/source/main.pas trunk/wxdevcpp/source/oysUtils.pas trunk/wxdevcpp/source/packages/ColorPickerButton.pas trunk/wxdevcpp/source/packages/ControlBar_WIN32_EVENTS.pas trunk/wxdevcpp/source/packages/Hashes.pas trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas trunk/wxdevcpp/source/packages/QSynAutoIndent.pas trunk/wxdevcpp/source/packages/RegExpr.pas trunk/wxdevcpp/source/packages/SynAutoIndent.pas trunk/wxdevcpp/source/packages/VistaAltFixUnit.pas trunk/wxdevcpp/source/packages/XPMenu.pas trunk/wxdevcpp/source/packages/devFileMonitor.pas trunk/wxdevcpp/source/packages/devMonitorThread.pas trunk/wxdevcpp/source/packages/devMonitorTypes.pas trunk/wxdevcpp/source/packages/devMsgBox.pas trunk/wxdevcpp/source/packages/devReg.pas trunk/wxdevcpp/source/packages/devShortcuts.pas trunk/wxdevcpp/source/packages/devShortcutsEditorForm.pas trunk/wxdevcpp/source/packages/devTabs.pas trunk/wxdevcpp/source/packages/uvista.pas trunk/wxdevcpp/source/plugins/wxdsgn/CompFileIo.pas trunk/wxdevcpp/source/plugins/wxdsgn/CreateOrderFm.pas trunk/wxdevcpp/source/plugins/wxdsgn/DesignerOptions.pas trunk/wxdevcpp/source/plugins/wxdsgn/Designerfrm.pas trunk/wxdevcpp/source/plugins/wxdsgn/ELDsgnr.pas trunk/wxdevcpp/source/plugins/wxdsgn/MigrateFrm.pas trunk/wxdevcpp/source/plugins/wxdsgn/ViewIDForm.pas trunk/wxdevcpp/source/plugins/wxdsgn/dmCodeGen.pas trunk/wxdevcpp/source/plugins/wxdsgn/dmCreateNewProp.pas trunk/wxdevcpp/source/plugins/wxdsgn/wxdesigner.pas trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res trunk/wxdevcpp/source/plugins/wxdsgn/wxeditor.pas trunk/wxdevcpp/source/plugins/wxdsgn/wxversion.pas trunk/wxdevcpp/source/prjtypes.pas trunk/wxdevcpp/source/project.pas trunk/wxdevcpp/source/utils.pas trunk/wxdevcpp/source/version.pas trunk/wxdevcpp/source/xprocs.pas Modified: trunk/wxdevcpp/source/AboutFrm.pas =================================================================== --- trunk/wxdevcpp/source/AboutFrm.pas 2012-03-20 05:02:37 UTC (rev 1483) +++ trunk/wxdevcpp/source/AboutFrm.pas 2012-03-20 17:52:16 UTC (rev 1484) @@ -19,11 +19,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA } -Unit AboutFrm; +unit AboutFrm; -Interface +interface -Uses +uses Version, {$IFDEF WIN32} Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, @@ -34,8 +34,8 @@ QStdCtrls, QButtons, QExtCtrls, utila; {$ENDIF} -Type - TAboutForm = Class(TForm) +type + TAboutForm = class(TForm) btnOk: TBitBtn; btnUpdateCheck: TBitBtn; banner: TImage; @@ -69,17 +69,17 @@ Book: TLabel; Label1: TLabel; BuildNumber: TLabel; - Procedure LabelClick(Sender: TObject); - Procedure FormCreate(Sender: TObject); - Procedure btnUpdateCheckClick(Sender: TObject); - Private - Procedure LoadText; - Protected - Procedure CreateParams(Var Params: TCreateParams); Override; - End; + procedure LabelClick(Sender: TObject); + procedure FormCreate(Sender: TObject); + procedure btnUpdateCheckClick(Sender: TObject); + private + procedure LoadText; + protected + procedure CreateParams(var Params: TCreateParams); override; + end; -Implementation -Uses +implementation +uses {$IFDEF WIN32} ShellAPI, devcfg, MultiLangSupport, main; {$ENDIF} @@ -91,9 +91,9 @@ -Procedure TAboutForm.LoadText; -Begin - DesktopFont := True; +procedure TAboutForm.LoadText; +begin + DesktopFont := TRUE; XPMenu.Active := devData.XPTheme; Caption := 'About wxDev-C++'; License.Caption := Lang[ID_AB_LICENSE]; @@ -102,20 +102,20 @@ btnUpdateCheck.Caption := Lang[ID_AB_UPDATE]; Authors.Caption := Lang[ID_BTN_AUTHOR]; BuildNumber.Caption := GetAppVersion; -End; +end; -Procedure TAboutForm.LabelClick(Sender: TObject); -Var s: String; -Begin - If pos('@', (Sender As TLabel).Caption) <> 0 Then - s := 'mailto:' + (Sender As TLabel).Caption - Else - s := (Sender As TLabel).Caption; - ShellExecute(GetDesktopWindow(), 'open', Pchar(s), Nil, Nil, SW_SHOWNORMAL); -End; +procedure TAboutForm.LabelClick(Sender: TObject); +var s: string; +begin + if pos('@', (Sender as TLabel).Caption) <> 0 then + s := 'mailto:' + (Sender as TLabel).Caption + else + s := (Sender as TLabel).Caption; + ShellExecute(GetDesktopWindow(), 'open', pchar(s), NIL, NIL, SW_SHOWNORMAL); +end; -Procedure TAboutForm.FormCreate(Sender: TObject); -Begin +procedure TAboutForm.FormCreate(Sender: TObject); +begin LoadText; wxDevCopyright.Font.Style := [fsBold]; CopyrightLabel.Font.Style := [fsBold]; @@ -127,24 +127,24 @@ wxWebsite.Font.Color := clBlue; Book.Font.Style := [fsUnderline]; Book.Font.Color := clBlue; -End; +end; -Procedure TAboutForm.btnUpdateCheckClick(Sender: TObject); -Begin +procedure TAboutForm.btnUpdateCheckClick(Sender: TObject); +begin MainForm.actUpdateCheckExecute(sender); -End; +end; -Procedure TAboutForm.CreateParams(Var Params: TCreateParams); -Begin - Inherited; - If (Parent <> Nil) Or (ParentWindow <> 0) Then +procedure TAboutForm.CreateParams(var Params: TCreateParams); +begin + inherited; + if (Parent <> NIL) or (ParentWindow <> 0) then Exit; // must not mess with wndparent if form is embedded - If Assigned(Owner) And (Owner Is TWincontrol) Then + if Assigned(Owner) and (Owner is TWincontrol) then Params.WndParent := TWinControl(Owner).handle - Else - If Assigned(Screen.Activeform) Then + else + if Assigned(Screen.Activeform) then Params.WndParent := Screen.Activeform.Handle; -End; +end; -End. +end. Modified: trunk/wxdevcpp/source/AddToDoFm.pas =================================================================== --- trunk/wxdevcpp/source/AddToDoFm.pas 2012-03-20 05:02:37 UTC (rev 1483) +++ trunk/wxdevcpp/source/AddToDoFm.pas 2012-03-20 17:52:16 UTC (rev 1484) @@ -17,11 +17,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA } -Unit AddToDoFm; +unit AddToDoFm; -Interface +interface -Uses +uses {$IFDEF WIN32} Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, Spin, SynEditTextBuffer, SynEditTypes, XPMenu; @@ -31,8 +31,8 @@ QDialogs, QStdCtrls, QComCtrls, QSynEditTextBuffer, QSynEditTypes; {$ENDIF} -Type - TAddToDoForm = Class(TForm) +type + TAddToDoForm = class(TForm) Label1: TLabel; memDescr: TMemo; Label2: TLabel; @@ -42,111 +42,111 @@ btnCancel: TButton; txtUser: TEdit; XPMenu: TXPMenu; - Procedure FormClose(Sender: TObject; Var Action: TCloseAction); - Procedure btnOKClick(Sender: TObject); - Procedure FormShow(Sender: TObject); - Procedure txtUserKeyPress(Sender: TObject; Var Key: Char); - Private + procedure FormClose(Sender: TObject; var Action: TCloseAction); + procedure btnOKClick(Sender: TObject); + procedure FormShow(Sender: TObject); + procedure txtUserKeyPress(Sender: TObject; var Key: char); + private { Private declarations } - Procedure LoadText; - Public + procedure LoadText; + public { Public declarations } - End; + end; -Var +var AddToDoForm: TAddToDoForm; -Implementation +implementation -Uses +uses main, editor, MultiLangSupport, devcfg; {$R *.dfm} -Procedure TAddToDoForm.FormClose(Sender: TObject; - Var Action: TCloseAction); -Begin +procedure TAddToDoForm.FormClose(Sender: TObject; + var Action: TCloseAction); +begin Action := caFree; -End; +end; -Procedure TAddToDoForm.btnOKClick(Sender: TObject); -Var +procedure TAddToDoForm.btnOKClick(Sender: TObject); +var e: TEditor; - I: Integer; + I: integer; st: TBufferCoord; - Line: Integer; - LineText: String; - Hdr: String; - Prepend: String; -Begin + Line: integer; + LineText: string; + Hdr: string; + Prepend: string; +begin e := MainForm.GetEditor; - If Not Assigned(e) Then - Begin + if not Assigned(e) then + begin Close; Exit; - End; + end; Line := e.Text.CaretY - 1; LineText := e.Text.Lines[Line]; st.Line := Line + 1; - st.Char := 1; + st.char := 1; I := 1; - While (I <= Length(LineText)) And (LineText[I] In [#9, ' ']) Do + while (I <= Length(LineText)) and (LineText[I] in [#9, ' ']) do Inc(I); Prepend := Copy(LineText, 1, I - 1); Hdr := '/* TODO ('; - If txtUser.Text <> '' Then + if txtUser.Text <> '' then Hdr := Hdr + txtUser.Text; Hdr := Hdr + '#' + IntToStr(spnPri.Value) + '#): '; - If memDescr.Lines.Count = 1 Then + if memDescr.Lines.Count = 1 then e.Text.Lines.Insert(Line, Prepend + Hdr + memDescr.Text + ' */') - Else - Begin + else + begin e.Text.Lines.Insert(Line, Prepend + Hdr + memDescr.Lines[0]); Prepend := Prepend + StringOfChar(#32, Length(Hdr)); - For I := 1 To memDescr.Lines.Count - 1 Do - Begin - If I = memDescr.Lines.Count - 1 Then + for I := 1 to memDescr.Lines.Count - 1 do + begin + if I = memDescr.Lines.Count - 1 then e.Text.Lines.Insert(Line + I, Prepend + memDescr.Lines[I] + ' */') - Else + else e.Text.Lines.Insert(Line + I, Prepend + memDescr.Lines[I]); - End; - End; - e.Text.UndoList.AddChange(crInsert, st, BufferCoord(st.Char, + end; + end; + e.Text.UndoList.AddChange(crInsert, st, BufferCoord(st.char, st.Line + memDescr.Lines.Count), '', smNormal); - e.Modified := True; + e.Modified := TRUE; Close; -End; +end; -Procedure TAddToDoForm.FormShow(Sender: TObject); -Begin +procedure TAddToDoForm.FormShow(Sender: TObject); +begin LoadText; memDescr.Clear; spnPri.Value := 0; txtUser.Clear; -End; +end; -Procedure TAddToDoForm.txtUserKeyPress(Sender: TObject; Var Key: Char); -Begin - If Not (Key In ['a'..'z', 'A'..'Z', '0'..'9', '_', ' ', #8, #13, #27]) Then - Begin +procedure TAddToDoForm.txtUserKeyPress(Sender: TObject; var Key: char); +begin + if not (Key in ['a'..'z', 'A'..'Z', '0'..'9', '_', ' ', #8, #13, #27]) then + begin Key := #0; Exit; - End; -End; + end; +end; -Procedure TAddToDoForm.LoadText; -Begin - DesktopFont := True; +procedure TAddToDoForm.LoadText; +begin + DesktopFont := TRUE; XPMenu.Active := devData.XPTheme; Label1.Caption := Lang[ID_ADDTODO_DESCRIPTION] + ':'; Label2.Caption := Lang[ID_ADDTODO_PRIORITY] + ':'; Label3.Caption := Lang[ID_ADDTODO_USER] + ':'; btnOk.Caption := Lang[ID_BTN_OK]; btnCancel.Caption := Lang[ID_BTN_CANCEL]; -End; +end; -End. +end. Modified: trunk/wxdevcpp/source/CFGData.pas =================================================================== --- trunk/wxdevcpp/source/CFGData.pas 2012-03-20 05:02:37 UTC (rev 1483) +++ trunk/wxdevcpp/source/CFGData.pas 2012-03-20 17:52:16 UTC (rev 1484) @@ -17,11 +17,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA } -Unit CFGData; +unit CFGData; -Interface +interface -Uses +uses {$IFDEF WIN32} Windows, Messages, Classes, sysUtils, TypInfo, cfgreg, CFGINI, cfgtypes; {$ENDIF} @@ -29,144 +29,144 @@ Classes, sysUtils, TypInfo, cfgreg, CFGINI, cfgtypes; {$ENDIF} -Type - EConfigDataError = Class(Exception); +type + EConfigDataError = class(Exception); - TConfigData = Class(TComponent) - Private - finiFileName: String; // ini filename - finiSection: String; // default section of ini file - fRegKey: String; // root key for registry + TConfigData = class(TComponent) + private + finiFileName: string; // ini filename + finiSection: string; // default section of ini file + fRegKey: string; // root key for registry fRegRoot: HKEY; // registry main key // options - fUseRegistry: Boolean; // Save settings to registry - fboolAsWords: Boolean; // Save boolean values as TRUE/FALSE + fUseRegistry: boolean; // Save settings to registry + fboolAsWords: boolean; // Save boolean values as TRUE/FALSE fIgnores: TStrings; // Ignored Properties GetReg: TCFGReg; GetINI: TCFGINI; - Procedure SetIni(s: String); - Public - Constructor Create(aOwner: TComponent); Override; - Destructor Destroy; Override; - Procedure SettoDefaults; Virtual; Abstract; + procedure SetIni(s: string); + public + constructor Create(aOwner: TComponent); override; + destructor Destroy; override; + procedure SettoDefaults; virtual; abstract; - Procedure SaveConfigData; Virtual; - Procedure ReadConfigData; Virtual; + procedure SaveConfigData; virtual; + procedure ReadConfigData; virtual; // load/save windowplacement structure - Procedure SaveWindowPlacement(Const key: String; value: TWindowPlacement); + procedure SaveWindowPlacement(const key: string; value: TWindowPlacement); - Function LoadWindowPlacement(Const key: String; - Var Value: TWindowPlacement): Boolean; + function LoadWindowPlacement(const key: string; + var Value: TWindowPlacement): boolean; // load/save individual setting - Procedure SaveSetting(Const key: String; - Const Entry: String; Const value: String); + procedure SaveSetting(const key: string; + const Entry: string; const value: string); - Function LoadSetting(Const key: String; - Const entry: String): String; + function LoadSetting(const key: string; + const entry: string): string; // load/save boolean setting - Procedure SaveboolSetting(Const key: String; - Const entry: String; Const value: Boolean); + procedure SaveboolSetting(const key: string; + const entry: string; const value: boolean); - Function LoadboolSetting(Const key: String; - Const entry: String): Boolean; Overload; - Function LoadboolSetting(val: Boolean; Const key: String; - Const entry: String): Boolean; Overload; + function LoadboolSetting(const key: string; + const entry: string): boolean; overload; + function LoadboolSetting(val: boolean; const key: string; + const entry: string): boolean; overload; // load/save TCFGOptions - Procedure SaveObject(obj: TCFGOptions); Virtual; - Procedure LoadObject(obj: TCFGOptions); Virtual; + procedure SaveObject(obj: TCFGOptions); virtual; + procedure LoadObject(obj: TCFGOptions); virtual; - Property BaseRegKey: String Read fRegKey Write fRegKey; - Property BoolAsWords: Boolean Read fboolAsWords Write fboolAsWords; - Property INIFile: String Read fINIFileName Write SetIni; - Property INISection: String Read finiSection Write finiSection; - Property Root: HKEY Read fRegRoot Write fRegRoot; - Property UseRegistry: Boolean Read fUseRegistry Write fUseRegistry; - Property IgnoreProperties: TStrings Read fIgnores Write fIgnores; - End; + property BaseRegKey: string read fRegKey write fRegKey; + property BoolAsWords: boolean read fboolAsWords write fboolAsWords; + property INIFile: string read fINIFileName write SetIni; + property INISection: string read finiSection write finiSection; + property Root: HKEY read fRegRoot write fRegRoot; + property UseRegistry: boolean read fUseRegistry write fUseRegistry; + property IgnoreProperties: TStrings read fIgnores write fIgnores; + end; -Function ReadBoolString(Value: String): Boolean; -Function GetPropName(Instance: TPersistent; Index: Integer): String; -Function GetPropCount(Instance: TPersistent): Integer; +function ReadBoolString(Value: string): boolean; +function GetPropName(Instance: TPersistent; Index: integer): string; +function GetPropCount(Instance: TPersistent): integer; -Const - boolStr: Array[Boolean] Of String[5] = ('False', 'True'); +const + boolStr: array[boolean] of string[5] = ('False', 'True'); -Implementation +implementation // returns boolean value of passed string -Function ReadBoolString(Value: String): Boolean; -Begin +function ReadBoolString(Value: string): boolean; +begin result := uppercase(Value) = 'TRUE'; -End; +end; // returns empty TWindowPlacement Record -Function EmptyWinPlace: TWindowPlacement; -Begin +function EmptyWinPlace: TWindowPlacement; +begin FillChar(result, Sizeof(TWindowPlacement), #0); Result.Length := Sizeof(TWindowPlacement); -End; +end; //Returns the number of properties of a given object -Function GetPropCount(Instance: TPersistent): Integer; -Var Data: PTypeData; -Begin +function GetPropCount(Instance: TPersistent): integer; +var Data: PTypeData; +begin Data := GetTypeData(Instance.Classinfo); Result := Data^.PropCount; -End; +end; //Returns the property name of an instance at a certain index -Function GetPropName(Instance: TPersistent; Index: Integer): String; -Var PropList: PPropList; +function GetPropName(Instance: TPersistent; Index: integer): string; +var PropList: PPropList; PropInfo: PPropInfo; Data: PTypeData; -Begin +begin Result := ''; Data := GetTypeData(Instance.Classinfo); GetMem(PropList, Data^.PropCount * Sizeof(PPropInfo)); - Try + try GetPropInfos(Instance.ClassInfo, PropList); PropInfo := PropList^[Index]; Result := PropInfo^.Name; - Finally + finally FreeMem(PropList, Data^.PropCount * Sizeof(PPropInfo)); - End; -End; + end; +end; { TConfigData } -Constructor TConfigData.Create(aOwner: TComponent); -Begin - Inherited Create(aOwner); +constructor TConfigData.Create(aOwner: TComponent); +begin + inherited Create(aOwner); GetINI := TCFGINI.Create(Self); GetREG := TCFGREG.Create(Self); - fUseRegistry := True; // defaultly use the registry to save info + fUseRegistry := TRUE; // defaultly use the registry to save info fRegRoot := HKEY_CURRENT_USER; // default to current user registry fIgnores := TStringList.Create; - With fIgnores Do - Begin + with fIgnores do + begin Add('Name'); Add('Tag'); // local props (might not need) - End; -End; + end; +end; -Destructor TConfigData.Destroy; -Begin +destructor TConfigData.Destroy; +begin GetINI.Free; GetREG.Free; - If Assigned(fIgnores) Then + if Assigned(fIgnores) then fIgnores.Free; - Inherited Destroy; -End; + inherited Destroy; +end; {function TConfigData.GetINI: TCFGINI; begin @@ -186,54 +186,54 @@ end; end; } -Procedure TConfigData.SetIni(s: String); -Begin +procedure TConfigData.SetIni(s: string); +begin fIniFileName := s; GetINI.SetIniFile(s); -End; +end; -Procedure TConfigData.ReadConfigData; -Begin - If fUseRegistry Then - Try +procedure TConfigData.ReadConfigData; +begin + if fUseRegistry then + try GetReg.ReadConfig; - Except End - Else - Try + except end + else + try GetINI.ReadConfig; - Except End; -End; + except end; +end; -Procedure TConfigData.SaveConfigData; -Begin - If fUseRegistry Then - Try +procedure TConfigData.SaveConfigData; +begin + if fUseRegistry then + try GetReg.SaveConfig; - Except End - Else - Try + except end + else + try GetINI.SaveConfig; - Except End; -End; + except end; +end; -Function TConfigData.LoadWindowPlacement(Const key: String; - Var Value: TWindowPlacement): Boolean; +function TConfigData.LoadWindowPlacement(const key: string; + var Value: TWindowPlacement): boolean; // convert string to TWindowPlacement record - Function StrtoWinPlace(s: String): TWindowPlacement; - Var + function StrtoWinPlace(s: string): TWindowPlacement; + var tmp: TSTringList; - Begin - If s = '' Then + begin + if s = '' then result := EmptyWinPlace - Else - Begin + else + begin tmp := TStringList.Create; - Try + try tmp.CommaText := s; - If tmp.Count = 10 Then - With Result Do - Begin + if tmp.Count = 10 then + with Result do + begin Length := Sizeof(TWindowPlacement); Flags := StrtoInt(tmp[0]); ShowCmd := StrtoInt(tmp[1]); @@ -241,154 +241,154 @@ ptMaxPosition := point(StrtoInt(tmp[4]), StrtoInt(tmp[5])); rcNormalPosition := rect(StrtoInt(tmp[6]), StrtoInt(tmp[7]), StrtoInt(tmp[8]), StrtoInt(tmp[9])); - End - Else + end + else result := emptyWinPlace; - Finally + finally tmp.Free; - End; - End; - End; + end; + end; + end; -Var - s: String; -Begin - Try - If fUseRegistry Then +var + s: string; +begin + try + if fUseRegistry then s := GetReg.LoadSetting(key, 'WinPlace') - Else + else s := GetINI.LoadSetting(key, 'WinPlace'); value := StrtoWinPlace(s); - result := True; - Except - result := False; - End; -End; + result := TRUE; + except + result := FALSE; + end; +end; -Procedure TConfigData.SaveWindowPlacement(Const key: String; +procedure TConfigData.SaveWindowPlacement(const key: string; value: TWindowPlacement); - Function WinPlacetoStr(WinPlace: TWindowPlacement): String; - Begin - With WinPlace Do + function WinPlacetoStr(WinPlace: TWindowPlacement): string; + begin + with WinPlace do Result := format('%d, %d, %d, %d, %d, %d, %d, %d, %d, %d', [Flags, ShowCmd, ptMinPosition.X, ptMinPosition.Y, ptMaxPosition.X, ptMaxPosition.Y, rcNormalPosition.Left, rcNormalPosition.Top, rcNormalPosition.Right, rcNormalPosition.Bottom]); - End; -Var - s: String; -Begin - Try + end; +var + s: string; +begin + try s := WinPlacetoStr(Value); - If fUseRegistry Then + if fUseRegistry then GetReg.SaveSetting(key, 'WinPlace', s) - Else + else GetINI.SaveSetting(key, 'WinPlace', s); - Except End; -End; + except end; +end; -Procedure TConfigData.LoadObject(obj: TCFGOptions); -Begin - Try - If fUseRegistry Then +procedure TConfigData.LoadObject(obj: TCFGOptions); +begin + try + if fUseRegistry then GetReg.LoadObject(Obj) - Else + else GetINI.LoadObject(Obj); - Except End; -End; + except end; +end; -Procedure TConfigData.SaveObject(obj: TCFGOptions); -Begin - Try - If fUseRegistry Then +procedure TConfigData.SaveObject(obj: TCFGOptions); +begin + try + if fUseRegistry then GetReg.SaveObject(Obj) - Else + else GetINI.SaveObject(Obj); - Except End; -End; + except end; +end; -Function TConfigData.LoadboolSetting(Const key, entry: String): Boolean; -Var - s: String; -Begin - Try - If fUseRegistry Then +function TConfigData.LoadboolSetting(const key, entry: string): boolean; +var + s: string; +begin + try + if fUseRegistry then s := GetReg.LoadSetting(Key, Entry) - Else + else s := GetINI.LoadSetting(key, Entry); - If s = '' Then + if s = '' then s := '0'; - If fboolAsWords Then + if fboolAsWords then result := ReadboolString(s) - Else + else result := strtoint(s) = 1; - Except - result := False; - End; -End; + except + result := FALSE; + end; +end; -Function TConfigData.LoadboolSetting(val: Boolean; - Const key, entry: String): Boolean; -Var - s: String; -Begin - Try - If fUseRegistry Then +function TConfigData.LoadboolSetting(val: boolean; + const key, entry: string): boolean; +var + s: string; +begin + try + if fUseRegistry then s := GetReg.LoadSetting(val, Key, Entry) - Else + else s := GetINI.LoadSetting(val, key, Entry); - If s = '' Then + if s = '' then s := '0'; - If fboolAsWords Then + if fboolAsWords then result := ReadboolString(s) - Else + else result := strtoint(s) = 1; - Except - result := False; - End; -End; + except + result := FALSE; + end; +end; -Function TConfigData.LoadSetting(Const key, entry: String): String; -Begin - Try - If fUseRegistry Then +function TConfigData.LoadSetting(const key, entry: string): string; +begin + try + if fUseRegistry then result := GetReg.LoadSetting(key, Entry) - Else + else result := GetINI.LoadSetting(key, Entry); - Except End; -End; + except end; +end; -Procedure TConfigData.SaveSetting(Const key: String; Const Entry: String; - Const value: String); -Begin - Try - If fUseRegistry Then +procedure TConfigData.SaveSetting(const key: string; const Entry: string; + const value: string); +begin + try + if fUseRegistry then GetReg.SaveSetting(key, Entry, Value) - Else + else GetINI.SaveSetting(key, Entry, Value); - Except End; -End; + except end; +end; -Procedure TConfigData.SaveboolSetting(Const key: String; Const entry: String; - Const value: Boolean); -Var - s: String; -Begin - Try - If fBoolAsWords Then +procedure TConfigData.SaveboolSetting(const key: string; const entry: string; + const value: boolean); +var + s: string; +begin + try + if fBoolAsWords then s := boolStr[value] - Else + else s := inttostr(ord(value)); - If fUseRegistry Then + if fUseRegistry then GetReg.SaveSetting(key, Entry, s) - Else + else GetINI.SaveSetting(key, Entry, s); - Except End; -End; + except end; +end; -End. +end. Modified: trunk/wxdevcpp/source/CFGINI.pas =================================================================== --- trunk/wxdevcpp/source/CFGINI.pas 2012-03-20 05:02:37 UTC (rev 1483) +++ trunk/wxdevcpp/source/CFGINI.pas 2012-03-20 17:52:16 UTC (rev 1484) @@ -17,50 +17,50 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA } -Unit CFGINI; +unit CFGINI; -Interface +interface -Uses +uses Classes, IniFiles, cfgTypes, TypInfo; -Type - TCFGINI = Class(TObject) - Private +type + TCFGINI = class(TObject) + private fOwner: TComponent; // assumes a TConfigData fini: Tinifile; - Procedure ReadFrominifile(Obj: TPersistent; Const Section: String); - Procedure ReadObject(Const Name: String; Obj: TPersistent); - Function ReadSet(Const Name: String; TypeInfo: PTypeInfo): Integer; - Procedure ReadStrings(Const Name: String; value: TStrings); - Procedure WriteObject(Const Name: String; Obj: TPersistent); - Procedure WriteSet(Const Name: String; value: Integer; + procedure ReadFrominifile(Obj: TPersistent; const Section: string); + procedure ReadObject(const Name: string; Obj: TPersistent); + function ReadSet(const Name: string; TypeInfo: PTypeInfo): integer; + procedure ReadStrings(const Name: string; value: TStrings); + procedure WriteObject(const Name: string; Obj: TPersistent); + procedure WriteSet(const Name: string; value: integer; TypeInfo: PTypeInfo); - Procedure WriteStrings(Const Name: String; value: TStrings); - Procedure Writetoinifile(Const Section: String; Obj: TPersistent); - Procedure ClearSection(Const Name: String); - Public - Constructor Create(aOwner: TComponent); - Destructor Destroy; Override; + procedure WriteStrings(const Name: string; value: TStrings); + procedure Writetoinifile(const Section: string; Obj: TPersistent); + procedure ClearSection(const Name: string); + public + constructor Create(aOwner: TComponent); + destructor Destroy; override; - Procedure SetIniFile(s: String); - Procedure ReadConfig; - Procedure SaveConfig; + procedure SetIniFile(s: string); + procedure ReadConfig; + procedure SaveConfig; - Procedure LoadObject(Var Obj: TCFGOptions); - Procedure SaveObject(Var Obj: TCFGOptions); + procedure LoadObject(var Obj: TCFGOptions); + procedure SaveObject(var Obj: TCFGOptions); - Function LoadSetting(Const key: String; Const Entry: String): String; - Overload; - Function LoadSetting(val: Boolean; Const key, Entry: String): String; - Overload; - Procedure SaveSetting(Const key: String; Const entry: String; - Const value: String); - End; + function LoadSetting(const key: string; const Entry: string): string; + overload; + function LoadSetting(val: boolean; const key, Entry: string): string; + overload; + procedure SaveSetting(const key: string; const entry: string; + const value: string); + end; -Implementation +implementation -Uses +uses {$IFDEF WIN32} CFGData, SysUtils, Graphics; {$ENDIF} @@ -70,122 +70,122 @@ { TCFGINI } -Constructor TCFGINI.Create(aOwner: TComponent); -Begin +constructor TCFGINI.Create(aOwner: TComponent); +begin fOwner := aOwner; - fIni := Nil; -End; + fIni := NIL; +end; -Destructor TCFGINI.Destroy; -Begin - If (assigned(fIni)) Then +destructor TCFGINI.Destroy; +begin + if (assigned(fIni)) then fini.free; - Inherited; -End; + inherited; +end; -Procedure TCFGIni.SetIniFile(s: String); -Begin - If (assigned(fIni)) Then +procedure TCFGIni.SetIniFile(s: string); +begin + if (assigned(fIni)) then fini.free; fini := TIniFile.Create(s); -End; +end; -Procedure TCFGINI.ReadConfig; -Var - section: String; -Begin - If Not assigned(fIni) Then +procedure TCFGINI.ReadConfig; +var + section: string; +begin + if not assigned(fIni) then exit; section := TConfigData(fOwner).INISection; - If section = '' Then - Raise EConfigDataError.Create('(ConfigData(INIReadCFG): Section not set'); - Try + if section = '' then + raise EConfigDataError.Create('(ConfigData(INIReadCFG): Section not set'); + try ReadFromINIFile(fOwner, Section); - Except End; -End; + except end; +end; -Procedure TCFGINI.SaveConfig; -Var - section: String; -Begin - If Not assigned(fIni) Then +procedure TCFGINI.SaveConfig; +var + section: string; +begin + if not assigned(fIni) then exit; section := TConfigData(fOwner).INISection; - If section = '' Then - Raise EConfigDataError.Create('(ConfigData(INISaveCFG): Section not set'); - With fINI Do - Try + if section = '' then + raise EConfigDataError.Create('(ConfigData(INISaveCFG): Section not set'); + with fINI do + try WritetoINIfile(Section, fOwner); - Except End; -End; + except end; +end; // Reading methods -Function TCFGINI.ReadSet(Const Name: String; TypeInfo: PTypeInfo): Integer; -Var - idx: Integer; - value: Integer; -Begin +function TCFGINI.ReadSet(const Name: string; TypeInfo: PTypeInfo): integer; +var + idx: integer; + value: integer; +begin result := 0; - If Not assigned(fIni) Then + if not assigned(fIni) then exit; TypeInfo := GetTypeData(TypeInfo).CompType^; value := 0; - If fINI.SectionExists(Name) Then - With GetTypeData(TypeInfo)^ Do - For idx := MinValue To MaxValue Do - If ReadBoolString(fini.ReadString(Name, GetENumName(TypeInfo, idx), - 'FALSE')) Then + if fINI.SectionExists(Name) then + with GetTypeData(TypeInfo)^ do + for idx := MinValue to MaxValue do + if ReadBoolString(fini.ReadString(Name, GetENumName(TypeInfo, idx), + 'FALSE')) then include(TIntegerSet(value), idx); result := value; -End; +end; -Procedure TCFGINI.ReadStrings(Const Name: String; value: TStrings); -Begin +procedure TCFGINI.ReadStrings(const Name: string; value: TStrings); +begin Value.BeginUpdate; - Try + try Value.Clear; - If fini.SectionExists(Name) Then + if fini.SectionExists(Name) then fini.ReadSectionValues(Name, value); - Finally + finally Value.EndUpdate; - End; -End; + end; +end; -Procedure TCFGINI.ReadObject(Const Name: String; Obj: TPersistent); -Begin - If fini.SectionExists(Name) Then +procedure TCFGINI.ReadObject(const Name: string; Obj: TPersistent); +begin + if fini.SectionExists(Name) then ReadFromINIFile(Obj, Name); -End; +end; -Procedure TCFGINI.ReadFrominifile(Obj: TPersistent; Const Section: String); -Var - idx, idx2: Integer; - PropName: String; +procedure TCFGINI.ReadFrominifile(Obj: TPersistent; const Section: string); +var + idx, idx2: integer; + PropName: string; Cd: TConfigData; -Begin +begin CD := TConfigData(fOwner); - For idx := 0 To pred(GetPropCount(Obj)) Do - Begin + for idx := 0 to pred(GetPropCount(Obj)) do + begin PropName := GetPropName(Obj, idx); - If Obj Is TFont Then - Begin + if Obj is TFont then + begin idx2 := CD.IgnoreProperties.Indexof('Name'); - If idx2 <> -1 Then + if idx2 <> -1 then CD.IgnoreProperties[idx2] := 'Height'; - End - Else - Begin + end + else + begin idx2 := CD.IgnoreProperties.Indexof('Height'); - If idx2 <> -1 Then + if idx2 <> -1 then CD.IgnoreProperties[idx2] := 'Name'; - End; - If (CD.IgnoreProperties.Indexof(PropName) > -1) Or - ((Not fINI.ValueExists(Section, PropName)) And - (Not fINI.SectionExists(Section + '.' + PropName))) Then + end; + if (CD.IgnoreProperties.Indexof(PropName) > -1) or + ((not fINI.ValueExists(Section, PropName)) and + (not fINI.SectionExists(Section + '.' + PropName))) then continue; - Case PropType(Obj, PropName) Of + case PropType(Obj, PropName) of tkString, tkLString, tkWString: @@ -208,104 +208,104 @@ GetPropInfo(Obj, PropName, [tkSet])^.PropType^)); tkClass: - Begin - If TPersistent(GetOrdProp(Obj, PropName)) Is TStrings Then + begin + if TPersistent(GetOrdProp(Obj, PropName)) is TStrings then ReadStrings(Section + '.' + PropName, TStrings(GetOrdProp(Obj, PropName))) - Else + else ReadObject(Section + '.' + PropName, TPersistent(GetOrdProp(Obj, PropName))); - End; - End; - End; -End; + end; + end; + end; +end; // Writing Methods -Procedure TCFGINI.WriteSet(Const Name: String; value: Integer; +procedure TCFGINI.WriteSet(const Name: string; value: integer; TypeInfo: PTypeInfo); -Var - idx: Integer; - s: String; -Begin +var + idx: integer; + s: string; +begin TypeInfo := GetTypeData(TypeInfo).CompType^; ClearSection(Name); - With GetTypeData(TypeInfo)^ Do - For idx := MinValue To MaxValue Do - Begin + with GetTypeData(TypeInfo)^ do + for idx := MinValue to MaxValue do + begin s := GetENumName(TypeInfo, idx); - If fINI.ValueExists(Name, s) Then + if fINI.ValueExists(Name, s) then fini.DeleteKey(Name, s); - fINI.WriteString(Name, s, boolStr[idx In TIntegerSet(value)]); - End; -End; + fINI.WriteString(Name, s, boolStr[idx in TIntegerSet(value)]); + end; +end; -Procedure TCFGINI.WriteStrings(Const Name: String; value: TStrings); -Var - idx: Integer; -Begin +procedure TCFGINI.WriteStrings(const Name: string; value: TStrings); +var + idx: integer; +begin ClearSection(Name); - If value.count <= 0 Then + if value.count <= 0 then exit; - For idx := 0 To Pred(value.Count) Do - If AnsiPos('=', value[idx]) <> 0 Then + for idx := 0 to Pred(value.Count) do + if AnsiPos('=', value[idx]) <> 0 then fini.WriteString(Name, Value.Names[idx], value.Values[Value.Names[idx]]) - Else + else fini.WriteString(Name, Value[idx], ''); -End; +end; -Procedure TCFGINI.WriteObject(Const Name: String; Obj: TPersistent); +procedure TCFGINI.WriteObject(const Name: string; Obj: TPersistent); - Function WritetheObject(Obj: TPersistent): Boolean; - Var - idx, c, Count: Integer; - Begin - result := False; + function WritetheObject(Obj: TPersistent): boolean; + var + idx, c, Count: integer; + begin + result := FALSE; Count := GetPropCount(Obj); - If Count <= 0 Then + if Count <= 0 then exit; c := Count; - For idx := 0 To pred(Count) Do - Begin - If TConfigData(fOwner).IgnoreProperties.Indexof( - getPropName(Obj, idx)) <> -1 Then + for idx := 0 to pred(Count) do + begin + if TConfigData(fOwner).IgnoreProperties.Indexof( + getPropName(Obj, idx)) <> -1 then dec(c); - End; + end; result := c > 0; - End; -Begin - If Not WritetheObject(Obj) Then + end; +begin + if not WritetheObject(Obj) then exit; ClearSection(Name); WritetoINIFile(Name, Obj); -End; +end; -Procedure TCFGINI.Writetoinifile(Const Section: String; Obj: TPersistent); -Var +procedure TCFGINI.Writetoinifile(const Section: string; Obj: TPersistent); +var idx, - idx2: Integer; - PropName: String; + idx2: integer; + PropName: string; CD: TConfigData; -Begin +begin CD := TConfigData(fOwner); - For idx := 0 To pred(GetPropCount(Obj)) Do - Begin + for idx := 0 to pred(GetPropCount(Obj)) do + begin PropName := GetPropName(Obj, idx); - If Obj Is TFont Then - Begin + if Obj is TFont then + begin idx2 := CD.IgnoreProperties.Indexof('Name'); - If idx2 > -1 Then + if idx2 > -1 then CD.IgnoreProperties[idx2] := 'Height'; - End - Else - Begin + end + else + begin idx2 := CD.IgnoreProperties.Indexof('Height'); - If idx2 > -1 Then + if idx2 > -1 then CD.IgnoreProperties[idx2] := 'Name'; - End; - If CD.IgnoreProperties.Indexof(PropName) >= 0 Then + end; + if CD.IgnoreProperties.Indexof(PropName) >= 0 then continue; - Case PropType(Obj, PropName) Of + case PropType(Obj, PropName) of tkString, tkLString, tkWString: @@ -328,69 +328,69 @@ WriteSet(Section + '.' + PropName, GetOrdProp(Obj, PropName), GetPropInfo(Obj, PropName, [tkSet])^.PropType^); tkClass: - Begin - If TPersistent(GetOrdProp(Obj, PropName)) Is TStrings Then + begin + if TPersistent(GetOrdProp(Obj, PropName)) is TStrings then WriteStrings(Section + '.' + PropName, TStrings(GetOrdProp(Obj, PropName))) - Else + else WritetoINIFile(Section + '.' + PropName, TPersistent(GetOrdProp(Obj, PropName))); - End; - End; - End; -End; + end; + end; + end; +end; -Procedure TCFGINI.LoadObject(Var Obj: TCFGOptions); -Begin - If Not assigned(Obj) Then +procedure TCFGINI.LoadObject(var Obj: TCFGOptions); +begin + if not assigned(Obj) then exit; - Try + try ReadObject(Obj.Name, Obj); - Except End; -End; + except end; +end; -Function TCFGINI.LoadSetting(Const key, Entry: String): String; -Begin - If Entry = '' Then +function TCFGINI.LoadSetting(const key, Entry: string): string; +begin + if Entry = '' then exit; result := fini.ReadString(Key, Entry, ''); -End; +end; -Function TCFGINI.LoadSetting(val: Boolean; Const key, Entry: String): String; -Begin - If Entry = '' Then +function TCFGINI.LoadSetting(val: boolean; const key, Entry: string): string; +begin + if Entry = '' then exit; result := fini.ReadString(Key, Entry, ''); - If result = '' Then - Begin - If val Then + if result = '' then + begin + if val then result := '1' - Else + else result := '0'; - End; -End; + end; +end; -Procedure TCFGINI.SaveObject(Var Obj: TCFGOptions); -Begin - If Not assigned(Obj) Then +procedure TCFGINI.SaveObject(var Obj: TCFGOptions); +begin + if not assigned(Obj) then exit; WriteObject(Obj.Name, Obj); -End; +end; -Procedure TCFGINI.SaveSetting(Const key, entry, value: String); -Begin - If Entry = '' Then +procedure TCFGINI.SaveSetting(const key, entry, value: string); +begin + if Entry = '' then exit; fini.WriteString(Key, Entry, Value); -End; +end; -Procedure TCFGINI.ClearSection(Const Name: String); +procedure TCFGINI.ClearSection(const Name: string); //var // tmp: TStrings; // idx: integer; -Begin +begin // This way it's much easier... - If fini.SectionExists(Name) Then + if fini.SectionExists(Name) then fini.EraseSection(Name); // tmp:= TStringList.Create; // try @@ -401,6 +401,6 @@ // finally // tmp.Free; // end; -End; +end; -End. +end. Modified: trunk/wxdevcpp/source/CFGReg.pas =================================================================== --- trunk/wxdevcpp/source/CFGReg.pas 2012-03-20 05:02:37 UTC (rev 1483) +++ trunk/wxdevcpp/source/CFGReg.pas 2012-03-20 17:52:16 UTC (rev 1484) @@ -17,11 +17,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA } -Unit CFGReg; +unit CFGReg; -Interface +interface -Uses +uses {$IFDEF WIN32} Classes, Registry, Types, TypInfo, cfgTypes; {$ENDIF} @@ -29,40 +29,40 @@ Classes, Types, TypInfo, cfgTypes; {$ENDIF} -Type - TCFGReg = Class(TObject) - Private +type + TCFGReg = class(TObject) + private fOwner: TComponent; // assumes a TConfigData fReg: TRegistry; - Procedure ReadFromRegistry(Obj: TPersistent); - Procedure ReadObject(Const Name: String; Obj: TPersistent); - Function ReadSet(Const Name: String; TypeInfo: PTypeInfo): Integer; - Procedure ReadStrings(Const Name: String; value: TStrings); - Procedure WriteObject(Const Name: String; Obj: TPersistent); - Procedure WriteSet(Const Name: String; value: Integer; + procedure ReadFromRegistry(Obj: TPersistent); + procedure ReadObject(const Name: string; Obj: TPersistent); + function ReadSet(const Name: string; TypeInfo: PTypeInfo): integer; + procedure ReadStrings(const Name: string; value: TStrings); + procedure WriteObject(const Name: string; Obj: TPersistent); + procedure WriteSet(const Name: string; value: integer; TypeInfo: PTypeInfo); - Procedure WriteStrings(Const Name: String; value: TStrings); - Procedure WritetoRegistry(Obj: TPersistent); // Registry access object; - Public - Constructor Create(aOwner: TComponent); - Destructor Destroy; Override; - Procedure ReadConfig; - Procedure SaveConfig; + procedure WriteStrings(const Name: string; value: TStrings); + procedure WritetoRegistry(Obj: TPersistent); // Registry access object; + public + constructor Create(aOwner: TComponent); + destructor Destroy; override; + procedure ReadConfig; + procedure SaveConfig; - Procedure LoadObject(Var Obj: TCFGOptions); - Procedure SaveObject(Var Obj: TCFGOptions); + procedure LoadObject(var Obj: TCFGOptions); + procedure SaveObject(var Obj: TCFGOptions); - Function LoadSetting(Const key: String; Const Entry: String): String; - Overload; - Function LoadSetting(val: Boolean; Const key, Entry: String): String; - Overload; - Procedure SaveSetting(Const key: String; Const entry: String; - Const value: String); - End; + function LoadSetting(const key: string; const Entry: string): string; + overload; + function LoadSetting(val: boolean; const key, Entry: string): string; + overload; + procedure SaveSetting(const key: string; const entry: string; + const value: string); + end; -Implementation +implementation -Uses +uses {$IFDEF WIN32} CFGData, Graphics, SysUtils; {$ENDIF} @@ -72,86 +72,86 @@ { TCFGReg } -Constructor TCFGReg.Create(aOwner: TComponent); -Begin +constructor TCFGReg.Create(aOwner: TComponent); +begin fOwner := aOwner; fReg := TRegistry.Create; -End; +end; -Destructor TCFGReg.Destroy; -Begin - If Assigned(fReg) Then +destructor TCFGReg.Destroy; +begin + if Assigned(fReg) then fReg.Free; - Inherited; -End; + inherited; +end; -Procedure TCFGReg.ReadConfig; -Var - RegKey: String; -Begin +procedure TCFGReg.ReadConfig; +var + RegKey: string; +begin RegKey := TConfigData(fOwner).BaseRegKey; - If RegKey = '' Then - Raise EConfigDataError.Create('ConfigData: Registry Key not set.'); - With fReg Do - Try + if RegKey = '' then + raise EConfigDataError.Create('ConfigData: Registry Key not set.'); + with fReg do + try RootKey := TConfigData(fOwner).Root; - If OpenKey(RegKey, False) Then + if OpenKey(RegKey, FALSE) then ReadFromRegistry(fOwner); - Finally + finally CloseKey; - End; -End; + end; +end; -Procedure TCFGReg.SaveConfig; -Var - RegKey: String; -Begin +procedure TCFGReg.SaveConfig; +var + RegKey: string; +begin RegKey := TConfigData(fOwner).BaseRegKey; - If RegKey = '' Then - Raise EConfigDataError.Create('ConfigData: Registry Key not set.'); - With fReg Do - Try + if RegKey = '' then + raise EConfigDataError.Create('ConfigData: Registry Key not set.'); + with fReg do + try RootKey := TConfigData(fOwner).Root; - If OpenKey(RegKey, False) Then + if OpenKey(RegKey, FALSE) then WritetoRegistry(fOwner); - Finally + finally CloseKey; - End; -End; + end; +end; // Reading methods -Procedure TCFGReg.ReadFromRegistry(Obj: TPersistent); -Var +procedure TCFGReg.ReadFromRegistry(Obj: TPersistent); +var idx, idx2, - Count: Integer; - PropName: String; + Count: integer; + PropName: string; CD: TConfigData; -Begin +begin Count := GetPropCount(Obj); CD := TConfigData(fOwner); - For idx := 0 To pred(Count) Do - Begin + for idx := 0 to pred(Count) do + begin PropName := GetPropName(Obj, idx); - If Obj Is TFont Then - Begin + if Obj is TFont then + begin idx2 := CD.IgnoreProperties.Indexof('Name'); - If idx2 <> -1 Then + if idx2 <> -1 then CD.IgnoreProperties[idx2] := 'Height'; - End - Else - Begin + end + else + begin idx2 := CD.IgnoreProperties.Indexof('Height'); - If idx2 <> -1 Then + if idx2 <> -1 then CD.IgnoreProperties[idx2] := 'Name'; - End; + end; - If (CD.IgnoreProperties.Indexof(PropName) > -1) - Or (Not fReg.ValueExists(PropName)) Then + if (CD.IgnoreProperties.Indexof(PropName) > -1) + or (not fReg.ValueExists(PropName)) then continue; - Case PropType(Obj, PropName) Of + case PropType(Obj, PropName) of tkString, tkLString, tkWString: @@ -173,104 +173,104 @@ GetPropInfo(Obj, PropName, [tkSet])^.PropType^)); tkClass: - Begin - If TPersistent(GetOrdProp(Obj, PropName)) Is TStrings Then + begin + if TPersistent(GetOrdProp(Obj, PropName)) is TStrings then ReadStrings(PropName, TStrings(GetOrdProp(Obj, PropName))) - Else + else ReadObject(PropName, TPersistent(GetOrdProp(Obj, PropName))); - End; - End; - End; -End; + end; + end; + end; +end; -Function TCFGReg.ReadSet(Const Name: String; TypeInfo: PTypeInfo): Integer; -Var - OldKey: String; - idx: Integer; - value: Integer; -Begin +function TCFGReg.ReadSet(const Name: string; TypeInfo: PTypeInfo): integer; +var + OldKey: string; + idx: integer; + value: integer; +begin TypeInfo := GetTypeData(TypeInfo).CompType^; OldKey := '\' + fReg.CurrentPath; value := 0; - Try - If Not freg.OpenKey(Name, False) Then - Raise ERegistryException.Createfmt( + try + if not freg.OpenKey(Name, FALSE) then + raise ERegistryException.Createfmt( 'ConfigData(RegReadSet): Cannot read subkey %s', [Name]); - With GetTypeData(TypeInfo)^ Do - For idx := MinValue To MaxValue Do - If ReadBoolString(fReg.ReadString(GetENumName(TypeInfo, idx))) Then + with GetTypeData(TypeInfo)^ do + for idx := MinValue to MaxValue do + if ReadBoolString(fReg.ReadString(GetENumName(TypeInfo, idx))) then include(TIntegerSet(value), idx); - Finally + finally result := value; - fReg.OpenKey(OldKey, False); - End; -End; + fReg.OpenKey(OldKey, FALSE); + end; +end; -Procedure TCFGREg.ReadStrings(Const Name: String; value: TStrings); -Var - OldKey: String; -Begin +procedure TCFGREg.ReadStrings(const Name: string; value: TStrings); +var + OldKey: string; +begin value.BeginUpdate; OldKey := '\' + fReg.CurrentPath; - Try + try value.Clear; - If Not fReg.OpenKey(Name, False) Then - Raise ERegistryException.Createfmt( + if not fReg.OpenKey(Name, FALSE) then + raise ERegistryException.Createfmt( 'ConfigData(RegReadStrings): Cannot open subkey %s', [Name]); fReg.GetValueNames(value); - Finally + finally value.EndUpdate; - fReg.OpenKey(OldKey, False); - End; -End; + fReg.OpenKey(OldKey, FALSE); + end; +end; -Procedure TCFGReg.ReadObject(Const Name: String; Obj: TPersistent); -Var - OldKey: String; -Begin +procedure TCFGReg.ReadObject(const Name: string; Obj: TPersistent); +var + OldKey: string; +begin OldKey := '\' + fReg.CurrentPath; - Try - If fReg.OpenKey(Name, False) Then + try + if fReg.OpenKey(Name, FALSE) then ReadFromRegistry(Obj); - Finally - fReg.OpenKey(Oldkey, False); - End; -End; + finally + fReg.OpenKey(Oldkey, FALSE); + end; +end; // Writing Methods -Procedure TCFGReg.WritetoRegistry(Obj: TPersistent); -Var +procedure TCFGReg.WritetoRegistry(Obj: TPersistent); +var idx, idx2, - Count: Integer; - PropName: String; + Count: integer; + PropName: string; CD: TConfigData; -Begin +begin Count := GetPropCount(Obj); CD := TConfigData(fOwner); - For idx := 0 To pred(Count) Do - Begin + for idx := 0 to pred(Count) do + begin PropName := GetPropName(Obj, idx); - If Obj Is TFont Then - Begin + if Obj is TFont then + begin idx2 := CD.IgnoreProperties.Indexof('Name'); - If idx2 <> -1 Then + if idx2 <> -1 then CD.IgnoreProperties[idx2] := 'Height'; - End - Else - Begin + end + else + begin idx2 := CD.IgnoreProperties.Indexof('Height'); - If idx2 <> -1 Then + if idx2 <> -1 then CD.IgnoreProperties[idx2] := 'Name'; - End; + end; - If (CD.IgnoreProperties.Indexof(PropName) > -1) Then + if (CD.IgnoreProperties.Indexof(PropName) > -1) then continue; - Case PropType(Obj, PropName) Of + case PropType(Obj, PropName) of tkString, tkLString, tkWString: @@ -292,170 +292,170 @@ GetPropInfo(Obj, PropName, [tkSet])^.PropType^); tkClass: - Begin - If TPersistent(GetOrdProp(Obj, PropName)) Is TStrings Then + begin + if TPersistent(GetOrdProp(Obj, PropName)) is TStrings then WriteStrings(PropName, TStrings(GetOrdProp(Obj, PropName))) - Else + else WriteObject(PropName, TPersistent(GetOrdProp(Obj, PropName))); - End; - End; - End; -End; + end; + end; + end; +end; -Procedure TCFGReg.WriteSet(Const Name: String; value: Integer; +procedure TCFGReg.WriteSet(const Name: string; value: integer; TypeInfo: PTypeInfo); -Var - OldKey: String; - idx: Integer; -Begin +var + OldKey: string; + idx: integer; +begin TypeInfo := GetTypeData(TypeInfo)^.CompType^; OldKey := '\' + fReg.CurrentPath; - Try - If Not fReg.OpenKey(Name, True) Then - Raise ERegistryException.Createfmt( + try + if not fReg.OpenKey(Name, TRUE) then + raise ERegistryException.Createfmt( 'ConfigData(RegSaveSet): Cannot create subkey %s', [name]); - With GetTypeData(TypeInfo)^ Do - For idx := MinValue To MaxValue Do + with GetTypeData(TypeInfo)^ do + for idx := MinValue to MaxValue do fReg.WriteString(GetENumName(TypeInfo, idx), - boolStr[idx In TIntegerSet(value)]); - Finally - fReg.OpenKey(OldKey, False); - End; -End; + boolStr[idx in TIntegerSet(value)]); + finally + fReg.OpenKey(OldKey, FALSE); + end; +end; -Procedure TCFGReg.WriteStrings(Const Name: String; value: TStrings); -Var - OldKey: String; - idx: Integer; -Begin - If value.Count <= 0 Then +procedure TCFGReg.WriteStrings(const Name: string; value: TStrings); +var + OldKey: string; + idx: integer; +begin + if value.Count <= 0 then exit; OldKey := '\' + fReg.CurrentPath; - Try - If Not fReg.OpenKey(Name, True) Then - Raise ERegistryException.Createfmt( + try + if not fReg.OpenKey(Name, TRUE) then + raise ERegistryException.Createfmt( 'ConfigData(RegSaveStrings): Cannot create %s', [name]); - For idx := 0 To pred(value.Count) Do + for idx := 0 to pred(value.Count) do fReg.WriteString(value[idx], ''); - Finally - fReg.OpenKey(OldKey, False); - End; -End; + finally + fReg.OpenKey(OldKey, FALSE); + end; +end; -Procedure TCFGReg.WriteObject(Const Name: String; Obj: TPersistent); +procedure TCFGReg.WriteObject(const Name: string; Obj: TPersistent); - Function WritetheObject(Obj: TPersistent): Boolean; - Var - idx, c, Count: Integer; - Begin - result := False; - If Not assigned(Obj) Then + function WritetheObject(Obj: TPersistent): boolean; + var + idx, c, Count: integer; + begin + result := FALSE; + if not assigned(Obj) then exit; Count := GetPropCount(Obj); - If Count <= 0 Then + if Count <= 0 then exit; c := Count; - For idx := 0 To pred(Count) Do - If TConfigData(fOwner).IgnoreProperties.Indexo... [truncated message content] |
From: <tb...@us...> - 2012-03-20 05:02:44
|
Revision: 1483 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1483&view=rev Author: tbreina Date: 2012-03-20 05:02:37 +0000 (Tue, 20 Mar 2012) Log Message: ----------- Reverted explicitly free'ing the CodeComplForm in the TCodeCompletion destructor to get rid of a destructor bug. Final changes made to replace hardcoded MAX_TOKEN_SIZE with the maximum buffer size of the file line being tokenized. Hopefully, we won't be ableto generate any more buffer overruns. Modified Paths: -------------- trunk/wxdevcpp/source/EditorOptfrm.dfm trunk/wxdevcpp/source/LangFrm.pas trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/main.pas trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas trunk/wxdevcpp/source/packages/Parser/CppParser.pas trunk/wxdevcpp/source/packages/Parser/CppTokenizer.pas trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res Modified: trunk/wxdevcpp/source/EditorOptfrm.dfm =================================================================== --- trunk/wxdevcpp/source/EditorOptfrm.dfm 2012-03-19 20:53:07 UTC (rev 1482) +++ trunk/wxdevcpp/source/EditorOptfrm.dfm 2012-03-20 05:02:37 UTC (rev 1483) @@ -983,7 +983,7 @@ Left = 5 Top = 28 Width = 397 - Height = 365 + Height = 381 ActivePage = tabCBCompletion TabIndex = 1 TabOrder = 1 Modified: trunk/wxdevcpp/source/LangFrm.pas =================================================================== --- trunk/wxdevcpp/source/LangFrm.pas 2012-03-19 20:53:07 UTC (rev 1482) +++ trunk/wxdevcpp/source/LangFrm.pas 2012-03-20 05:02:37 UTC (rev 1483) @@ -345,7 +345,7 @@ Begin If DirectoryExists(s[i]) Then Begin - CacheFilesFromWildcard(s[i], '*.h', True, False, False); + CacheFilesFromWildcard(s[i], '*.*', True, False, False); Screen.Cursor := crHourglass; Application.ProcessMessages; End Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-03-19 20:53:07 UTC (rev 1482) +++ trunk/wxdevcpp/source/devcpp.dof 2012-03-20 05:02:37 UTC (rev 1483) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=466 +Build=490 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.466 +FileVersion=7.4.2.490 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/main.pas =================================================================== --- trunk/wxdevcpp/source/main.pas 2012-03-19 20:53:07 UTC (rev 1482) +++ trunk/wxdevcpp/source/main.pas 2012-03-20 05:02:37 UTC (rev 1483) @@ -1634,7 +1634,6 @@ if (devCodeCompletion.UseCacheFiles) then begin SetSplashStatus('Loading code completion cache'); - InitClassBrowser(devCodeCompletion.UseCacheFiles); SetSplashStatus('Finished loading cache'); end; @@ -1656,8 +1655,6 @@ ToolClassesItem.Checked := devData.ToolbarClasses; ToolbarClick(NIL); - devData.First := FALSE; - fCompiler.RunParams := ''; devCompiler.UseExecParams := TRUE; //if pluginsCount = 0 then Modified: trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas =================================================================== --- trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas 2012-03-19 20:53:07 UTC (rev 1482) +++ trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas 2012-03-20 05:02:37 UTC (rev 1483) @@ -153,12 +153,19 @@ end; destructor TCodeCompletion.Destroy; +//var +// i, iCount : integer; begin + if Assigned(CodeComplForm) then + FreeAndNil(CodeComplForm) + else + CodeComplForm := NIL; + if Assigned(fCompletionStatementList) then FreeAndNil(fCompletionStatementList) else - fCompletionStatementList := NIL; + fCompletionStatementList := NIL; if Assigned(fFullCompletionStatementList) then FreeAndNil(fFullCompletionStatementList) @@ -330,6 +337,7 @@ iID := StrToIntDef(sl[I], -1); if iID = -1 then Continue; + InheritanceIDs.Add(iID); iST := iID; if iST = -1 then @@ -407,7 +415,9 @@ try if _Class <> '' then begin //empty - fCompletionStatementList.Clear; + + fCompletionStatementList.Clear; + for I := 0 to fFullCompletionStatementList.Count - 1 do if not HasDot then begin //class only @@ -432,6 +442,7 @@ begin for I := 0 to fFullCompletionStatementList.Count - 1 do CodeComplForm.lbCompletion.Items.Add(''); + fCompletionStatementList.Clear; fCompletionStatementList.Assign(fFullCompletionStatementList); end; @@ -556,6 +567,7 @@ C: string; M: string; D: boolean; +// I, iCount: integer; begin if fEnabled then begin @@ -596,8 +608,11 @@ // only perform new search if just invoked if not CodeComplForm.Showing then begin - fCompletionStatementList.Clear; - fFullCompletionStatementList.Clear; + + fCompletionStatementList.Clear; + + fFullCompletionStatementList.Clear; + fIncludedFiles.CommaText := fParser.GetFileIncludes(Filename); GetCompletionFor(C, M, D); fFullCompletionStatementList.Assign(fCompletionStatementList); @@ -702,8 +717,10 @@ S: string; begin HintText := ''; - fCompletionStatementList.Clear; + + fCompletionStatementList.Clear; + for I := 0 to fParser.Statements.Count - 1 do if AnsiCompareStr(PStatement(fParser.Statements[I])^._ScopelessCmd, FuncName) = 0 then begin Modified: trunk/wxdevcpp/source/packages/Parser/CppParser.pas =================================================================== --- trunk/wxdevcpp/source/packages/Parser/CppParser.pas 2012-03-19 20:53:07 UTC (rev 1482) +++ trunk/wxdevcpp/source/packages/Parser/CppParser.pas 2012-03-20 05:02:37 UTC (rev 1483) @@ -322,6 +322,7 @@ var i, iCount: integer; begin + if Assigned(fInvalidatedIDs) then FreeAndNil(fInvalidatedIDs) else fInvalidatedIDs := NIL; Modified: trunk/wxdevcpp/source/packages/Parser/CppTokenizer.pas =================================================================== --- trunk/wxdevcpp/source/packages/Parser/CppTokenizer.pas 2012-03-19 20:53:07 UTC (rev 1482) +++ trunk/wxdevcpp/source/packages/Parser/CppTokenizer.pas 2012-03-20 05:02:37 UTC (rev 1483) @@ -127,7 +127,7 @@ var i, iCount: integer; begin - if fTokenList <> NIL then + { if fTokenList <> NIL then begin while fTokenList.Count > 0 do if Assigned(PToken(fTokenList[fTokenList.Count - 1])) then @@ -139,7 +139,22 @@ fTokenList.Delete(fTokenList.Count - 1); fTokenList.Clear; end; + } + if Assigned(fTokenList) then + begin + iCount := fTokenList.Count; + for i := (iCount - 1) downto 0 do + begin + if Assigned(PToken(fTokenList[i])) then + begin + Dispose(PToken(fTokenList[i])); + fTokenList.Delete(i); + end; + end; + fTokenList.Clear; + end; + end; function TCppTokenizer.OpenFile(FileName: string): boolean; @@ -413,7 +428,8 @@ AssignPos: pchar; localOutput: pchar; begin - localOutput := StrAlloc(MAX_TOKEN_SIZE); + // Alloc the temp string to the size of the string we are tokenizing + localOutput := StrAlloc(StrLen(pStart) + 1); //StrAlloc(MAX_TOKEN_SIZE); localOutput^ := #0; SkipToNextToken; Offset := pCurrent; @@ -421,7 +437,7 @@ repeat while pCurrent^ in LetterChars + DigitChars do Advance; - // check for operator functions (look below too) + // check for operator functions (look below too) if (pCurrent - Offset >= 8) and (StrLComp('operator', Offset, pCurrent - Offset) = 0) then begin if pCurrent^ in ['+', '-', '/', '*', '['] then @@ -551,8 +567,10 @@ Result := ''; Offset := pCurrent; SkipPair('(', ')'); - if (pCurrent - Offset) > MAX_TOKEN_SIZE then - Exit; + + //if (pCurrent - Offset) > MAX_TOKEN_SIZE then + // Exit; + StrLCopy(fTmpOutput, Offset, pCurrent - Offset); if (pCurrent^ = '.') or ((pCurrent^ = '-') and ((pCurrent + 1)^ = '>')) then // skip '.' and '->' while not (pCurrent^ in [#0, '(', ';', '{', '}', ')'] + LineChars + SpaceChars) do @@ -722,7 +740,8 @@ Exit; Reset; - fTmpOutput := StrAlloc(StrLen(StartAt)); //StrAlloc(MAX_TOKEN_SIZE); + // Alloc the temp string to the size of the string we are tokenizing + fTmpOutput := StrAlloc(StrLen(StartAt) + 1); //StrAlloc(MAX_TOKEN_SIZE); pStart := StartAt; fEnd := Length(StrPas(pStart)); pCurrent := pStart; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-03-19 20:53:07 UTC (rev 1482) +++ trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-03-20 05:02:37 UTC (rev 1483) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=46 +Build=59 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName= FileDescription=wxDev-C++ RAD add-on -FileVersion=7.4.2.46 +FileVersion=7.4.2.59 InternalName= LegalCopyright= LegalTrademarks= @@ -81,50 +81,3 @@ ProductName= ProductVersion=7.0 Comments= -[HistoryLists\hlConditionals] -Count=2 -Item0=PLUGIN_BUILD -Item1=UseRuntimePackages -[HistoryLists\hlUnitAliases] -Count=1 -Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE; -[HistoryLists\hlSearchPath] -Count=24 -Item0=propedit;components;..\interfaces;..\..\packages;..\..\units;$(DEVCPPLIBS)\synedit\Source;$(DEVCPPLIBS)\theme;$(DEVCPPLIBS)\extlib;$(DEVCPPLIBS)\GraphicEx;components\BaseComponents;$(PROGRAMFILES)\GExperts for Delphi 6 -Item1=propedit;components;..\interfaces;..\..\packages;..\..\units;$(DEVCPPLIBS)\synedit\Source;$(DEVCPPLIBS)\theme;$(DEVCPPLIBS)\extlib;$(DEVCPPLIBS)\GraphicEx;components\BaseComponents;$(PROGRAMFILES)\GExperts for Delphi 6;C:\wxdevcpp\CompUsedBy_WX_BUILD\jvcl\archive -Item2=propedit;components;..\interfaces;..\..\packages;..\..\units;$(DEVCPPLIBS)\synedit\Source;$(DEVCPPLIBS)\theme;$(DEVCPPLIBS)\extlib;$(DEVCPPLIBS)\GraphicEx;components\BaseComponents -Item3=$(DELPHI)\Lib\Debug;E:\wxDevCpp\COMPUS~1\jcl\lib\d6\debug;propedit;components;..\interfaces;..\..\packages;..\..\units;$(DEVCPPLIBS)\synedit\Source;$(DEVCPPLIBS)\theme;$(DEVCPPLIBS)\extlib;$(DEVCPPLIBS)\GraphicEx;components\BaseComponents -Item4=propedit;components;..\interfaces;..\..\packages;..\..\units;$(DEVCPPLIBS)\synedit\Source;$(DEVCPPLIBS)\theme;$(DEVCPPLIBS)\extlib;$(DEVCPPLIBS)\GraphicEx;$(PROGRAMFILES)\GExperts for Delphi 6;components\BaseComponents -Item5=propedit;components;..\interfaces;..\..\packages;..\..\units;$(COMPUSEDBY_WX_BUILD)\synedit\Source;$(COMPUSEDBY_WX_BUILD)\theme;$(COMPUSEDBY_WX_BUILD)\extlib;$(COMPUSEDBY_WX_BUILD)\GraphicEx;$(PROGRAMFILES)\GExperts for Delphi 6;components\BaseComponents -Item6=propedit;components;..\interfaces;..\..\packages;..\..\units;$(COMPUSEDBY_WX_BUILD)\synedit\Source;$(COMPUSEDBY_WX_BUILD)\theme;$(COMPUSEDBY_WX_BUILD)\extlib;$(COMPUSEDBY_WX_BUILD)\GraphicEx;$(PROGRAMFILES)\GExperts for Delphi 6 -Item7=propedit;components;..\interfaces;..\..\packages;..\..\units;$(CompUsedBy_WXBUILD)\synedit\Source;..\..\..\..\CompUsedBy_WX_BUILD\theme;..\..\..\..\CompUsedBy_WX_BUILD\extlib;..\..\..\..\CompUsedBy_WX_BUILD\GraphicEx;$(PROGRAMFILES)\GExperts for Delphi 6 -Item8=propedit;components;..\interfaces;..\..\packages;..\..\units;..\..\..\..\CompUsedBy_WX_BUILD\synedit\Source;..\..\..\..\CompUsedBy_WX_BUILD\theme;..\..\..\..\CompUsedBy_WX_BUILD\extlib;..\..\..\..\CompUsedBy_WX_BUILD\GraphicEx;$(PROGRAMFILES)\GExperts for Delphi 6 -Item9=propedit;components;..\interfaces;..\..\packages;..\..\units;..\..\..\..\CompUsedBy_WX_BUILD\synedit\Source;..\..\..\..\CompUsedBy_WX_BUILD\theme;..\..\..\..\CompUsedBy_WX_BUILD\extlib;..\..\..\..\CompUsedBy_WX_BUILD\GraphicEx;$(PROGRAMFILES)\GExperts for Delphi 6;..\.. -Item10=propedit;components;..\interfaces;..\..\packages;..\..\..\..\CompUsedBy_WX_BUILD\synedit\Source;..\..\..\..\CompUsedBy_WX_BUILD\theme;..\..\..\..\CompUsedBy_WX_BUILD\extlib;..\..\..\..\CompUsedBy_WX_BUILD\GraphicEx;$(PROGRAMFILES)\GExperts for Delphi 6 -Item11=propedit;components;..\..\..\..\..\CompUsedBy_WX_BUILD\synedit\Source;..\..\..\..\..\CompUsedBy_WX_BUILD\theme;..\..\..\..\..\CompUsedBy_WX_BUILD\extlib;..\..\..\..\..\CompUsedBy_WX_BUILD\GraphicEx;..\..\..\..\..\CompUsedBy_WX_BUILD\jvcl\lib\d6;..\..\..\..\..\CompUsedBy_WX_BUILD\synedit\Packages;..\..\packages;$(PROGRAMFILES)\GExperts for Delphi 6;$(PROGRAMFILES)\madCollection\madExcept\Delphi 6;..\interfaces -Item12=propedit;components;..\..\..\..\CompUsedBy_WX_BUILD\synedit\Source;..\..\..\..\CompUsedBy_WX_BUILD\theme;..\..\..\..\CompUsedBy_WX_BUILD\extlib;..\..\..\..\CompUsedBy_WX_BUILD\GraphicEx;..\..\..\..\CompUsedBy_WX_BUILD\jvcl\lib\d6;..\..\..\..\CompUsedBy_WX_BUILD\synedit\Packages;..\..\packages;$(PROGRAMFILES)\GExperts for Delphi 6;$(PROGRAMFILES)\madCollection\madExcept\Delphi 6;..\interfaces -Item13=propedit;components;..\..\..\..\CompUsedBy_WX_BUILD\synedit\Source;..\..\..\..\CompUsedBy_WX_BUILD\theme;..\..\..\..\CompUsedBy_WX_BUILD\extlib;..\..\..\..\CompUsedBy_WX_BUILD\GraphicEx;..\..\..\..\CompUsedBy_WX_BUILD\jvcl\lib\d6;..\..\..\..\CompUsedBy_WX_BUILD\synedit\Packages;..\..\packages;$(PROGRAMFILES)\GExperts for Delphi 6;..\interfaces -Item14=propedit;components;..\..\..\..\CompUsedBy_WX_BUILD\synedit\Source;..\..\..\..\CompUsedBy_WX_BUILD\theme;..\..\..\..\CompUsedBy_WX_BUILD\extlib;..\..\..\..\CompUsedBy_WX_BUILD\GraphicEx;..\..\..\..\CompUsedBy_WX_BUILD\jvcl\lib\d6;..\..\packages;$(PROGRAMFILES)\GExperts for Delphi 6;..\interfaces -Item15=propedit;components;..\..\..\..\CompUsedBy_WX_BUILD\synedit\Source;..\..\..\..\CompUsedBy_WX_BUILD\theme;..\..\..\..\CompUsedBy_WX_BUILD\extlib;..\..\..\..\CompUsedBy_WX_BUILD\GraphicEx;..\..\packages;$(PROGRAMFILES)\GExperts for Delphi 6;..\interfaces -Item16=propedit;components;..\..\..\..\CompUsedBy_WX_BUILD\synedit\Source;..\..\..\..\CompUsedBy_WX_BUILD\theme;..\..\..\..\CompUsedBy_WX_BUILD\extlib;..\..\..\..\CompUsedBy_WX_BUILD\GraphicEx;..\..\packages;$(PROGRAMFILES)\GExperts for Delphi 6 -Item17=propedit;components;..\..\..\..\..\CompUsedBy_WX_BUILD\synedit\Source;..\..\..\..\..\CompUsedBy_WX_BUILD\theme;..\..\..\..\..\CompUsedBy_WX_BUILD\extlib;..\..\..\..\..\CompUsedBy_WX_BUILD\GraphicEx;..\..\packages;$(PROGRAMFILES)\GExperts for Delphi 6 -Item18=propedit;components;..\..\..\..\..\CompUsedBy_WX_BUILD\synedit\Source;..\..\..\..\..\CompUsedBy_WX_BUILD\theme;..\..\..\..\..\CompUsedBy_WX_BUILD\extlib;..\..\..\..\..\CompUsedBy_WX_BUILD\GraphicEx;..\..\packages -Item19=propedit;components;..\..\..\..\..\CompUsedBy_WX_BUILD\synedit\Source;..\..\..\..\..\CompUsedBy_WX_BUILD\theme;..\..\..\..\..\CompUsedBy_WX_BUILD\extlib;..\..\packages -Item20=propedit;components;..\..\..\..\..\CompUsedBy_WX_BUILD\synedit\Source;..\..\..\..\..\CompUsedBy_WX_BUILD\theme;..\..\..\..\..\CompUsedBy_WX_BUILD\extlib -Item21=propedit;components;..\..\..\..\..\CompUsedBy_WX_BUILD\synedit\Source;..\..\..\..\..\CompUsedBy_WX_BUILD\theme -Item22=propedit;components;..\..\..\..\..\CompUsedBy_WX_BUILD\synedit\Source -Item23=propedit;components -[HistoryLists\hlUnitOutputDirectory] -Count=2 -Item0=wxdsgn\units -Item1=units -[HistoryLists\hlBPLOutput] -Count=4 -Item0=C:\wxdevcpp\wxdsgn\wxdevcpp\plugins\wxdsgn\ -Item1=C:\wxdevcpp\wxdsgn\wxdevcpp -Item2=wxdsgn -Item3=bin -[HistoryLists\hlDCPOutput] -Count=2 -Item0=wxdsgn\bin -Item1=bin Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-03-19 20:53:15
|
Revision: 1482 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1482&view=rev Author: tbreina Date: 2012-03-19 20:53:07 +0000 (Mon, 19 Mar 2012) Log Message: ----------- First attempt to fix MAX_TOKEN_SIZE bug that seems to be causing the random parser faults. This still needs to be generalized since we also compare the string to MAX_TOKEN_SIZE (Can this code be dropped??) Modified Paths: -------------- trunk/wxdevcpp/source/packages/Parser/ClassBrowser.pas trunk/wxdevcpp/source/packages/Parser/ClassBrowsingReg.pas trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas trunk/wxdevcpp/source/packages/Parser/CodeCompletionForm.pas trunk/wxdevcpp/source/packages/Parser/CppParser.pas trunk/wxdevcpp/source/packages/Parser/CppTokenizer.pas trunk/wxdevcpp/source/packages/Parser/U_IntList.pas Modified: trunk/wxdevcpp/source/packages/Parser/ClassBrowser.pas =================================================================== --- trunk/wxdevcpp/source/packages/Parser/ClassBrowser.pas 2012-03-19 03:02:47 UTC (rev 1481) +++ trunk/wxdevcpp/source/packages/Parser/ClassBrowser.pas 2012-03-19 20:53:07 UTC (rev 1482) @@ -17,11 +17,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA } -Unit ClassBrowser; +unit ClassBrowser; -Interface +interface -Uses +uses {$IFDEF WIN32} Windows, Messages, Classes, SysUtils, Controls, ComCtrls, Forms, Graphics, CppParser; @@ -31,300 +31,300 @@ CppParser; {$ENDIF} -Const +const MAX_CUSTOM_FOLDERS = 250; -Type - TMemberSelectEvent = Procedure(Sender: TObject; Filename: TFilename; Line: Integer) Of Object; +type + TMemberSelectEvent = procedure(Sender: TObject; Filename: TFilename; Line: integer) of object; PFolders = ^TFolders; - TFolders = Record - Index: Char; - Name: String[32]; - Under: String[164]; + TFolders = record + Index: char; + Name: string[32]; + Under: string[164]; Node: TTreeNode; - End; + end; PFolderAssocs = ^TFolderAssocs; - TFolderAssocs = Record - FolderID: Integer; - Folder: String[32]; - Command: String[164]; - End; + TFolderAssocs = record + FolderID: integer; + Folder: string[32]; + Command: string[164]; + end; - TImagesRecord = Class(TPersistent) - Private - fGlobalsImg: Integer; - fClassesImg: Integer; - fVariablePrivateImg: Integer; - fVariableProtectedImg: Integer; - fVariablePublicImg: Integer; - fVariablePublishedImg: Integer; - fMethodPrivateImg: Integer; - fMethodProtectedImg: Integer; - fMethodPublicImg: Integer; - fMethodPublishedImg: Integer; - fInhMethodProtectedImg: Integer; - fInhMethodPublicImg: Integer; - fInhVariableProtectedImg: Integer; - fInhVariablePublicImg: Integer; - Published - Property Globals: Integer Read fGlobalsImg Write fGlobalsImg; - Property Classes: Integer Read fClassesImg Write fClassesImg; - Property VariablePrivate: Integer Read fVariablePrivateImg Write fVariablePrivateImg; - Property VariableProtected: Integer Read fVariableProtectedImg Write fVariableProtectedImg; - Property VariablePublic: Integer Read fVariablePublicImg Write fVariablePublicImg; - Property VariablePublished: Integer Read fVariablePublishedImg Write fVariablePublishedImg; - Property MethodPrivate: Integer Read fMethodPrivateImg Write fMethodPrivateImg; - Property MethodProtected: Integer Read fMethodProtectedImg Write fMethodProtectedImg; - Property MethodPublic: Integer Read fMethodPublicImg Write fMethodPublicImg; - Property MethodPublished: Integer Read fMethodPublishedImg Write fMethodPublishedImg; - Property InheritedMethodProtected: Integer Read fInhMethodProtectedImg Write fInhMethodProtectedImg; - Property InheritedMethodPublic: Integer Read fInhMethodPublicImg Write fInhMethodPublicImg; - Property InheritedVariableProtected: Integer Read fInhVariableProtectedImg Write fInhVariableProtectedImg; - Property InheritedVariablePublic: Integer Read fInhVariablePublicImg Write fInhVariablePublicImg; - End; + TImagesRecord = class(TPersistent) + private + fGlobalsImg: integer; + fClassesImg: integer; + fVariablePrivateImg: integer; + fVariableProtectedImg: integer; + fVariablePublicImg: integer; + fVariablePublishedImg: integer; + fMethodPrivateImg: integer; + fMethodProtectedImg: integer; + fMethodPublicImg: integer; + fMethodPublishedImg: integer; + fInhMethodProtectedImg: integer; + fInhMethodPublicImg: integer; + fInhVariableProtectedImg: integer; + fInhVariablePublicImg: integer; + published + property Globals: integer read fGlobalsImg write fGlobalsImg; + property Classes: integer read fClassesImg write fClassesImg; + property VariablePrivate: integer read fVariablePrivateImg write fVariablePrivateImg; + property VariableProtected: integer read fVariableProtectedImg write fVariableProtectedImg; + property VariablePublic: integer read fVariablePublicImg write fVariablePublicImg; + property VariablePublished: integer read fVariablePublishedImg write fVariablePublishedImg; + property MethodPrivate: integer read fMethodPrivateImg write fMethodPrivateImg; + property MethodProtected: integer read fMethodProtectedImg write fMethodProtectedImg; + property MethodPublic: integer read fMethodPublicImg write fMethodPublicImg; + property MethodPublished: integer read fMethodPublishedImg write fMethodPublishedImg; + property InheritedMethodProtected: integer read fInhMethodProtectedImg write fInhMethodProtectedImg; + property InheritedMethodPublic: integer read fInhMethodPublicImg write fInhMethodPublicImg; + property InheritedVariableProtected: integer read fInhVariableProtectedImg write fInhVariableProtectedImg; + property InheritedVariablePublic: integer read fInhVariablePublicImg write fInhVariablePublicImg; + end; TShowFilter = (sfAll, sfProject, sfCurrent); - TClassBrowser = Class(TCustomTreeView) - Private + TClassBrowser = class(TCustomTreeView) + private fParser: TCppParser; fOnSelect: TMemberSelectEvent; fImagesRecord: TImagesRecord; fShowFilter: TShowFilter; - fCurrentFile: String; - fCurrentFileHeader: String; - fCurrentFileImpl: String; + fCurrentFile: string; + fCurrentFileHeader: string; + fCurrentFileImpl: string; fProjectDir: TFileName; fClassFoldersFile: TFileName; - fFolders: Array Of TFolders; - fFolderAssocs: Array Of TFolderAssocs; - fLastSelection: String; + fFolders: array of TFolders; + fFolderAssocs: array of TFolderAssocs; + fLastSelection: string; fCnv: TControlCanvas; - fUseColors: Boolean; - fParserBusy: Boolean; - fShowInheritedMembers: Boolean; - fShowingSampleData: Boolean; - Procedure CustomPaintMe(Var Msg: TMessage); Message WM_PAINT; - Procedure SetParser(Value: TCppParser); - Procedure AddMembers(Node: TTreeNode; ParentIndex, ParentID: Integer); - Procedure OnNodeChange(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); - Procedure OnNodeChanging(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); - Procedure myDragOver(Sender, Source: TObject; X, Y: Integer; State: TDragState; Var Accept: Boolean); - Procedure myDragDrop(Sender, Source: TObject; X, Y: Integer); - Procedure myMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer); - Procedure OnParserUpdate(Sender: TObject); - Procedure OnParserBusy(Sender: TObject); - Procedure SetNodeImages(Node: TTreeNode; Statement: PStatement); - Procedure Sort; - Procedure SetCurrentFile(Value: String); - Procedure SetShowFilter(Const Value: TShowFilter); - Procedure ReadClassFolders; // read folders from disk - Procedure WriteClassFolders; // write folders to disk - Function HasSubFolder(Cmd: String): Boolean; // if Command has subfolders, returns true - Procedure CreateFolders(Cmd: String; Node: TTreeNode); // creates folders under Command - Function BelongsToFolder(Cmd: String): Integer; // returns the index to fFolders it belongs or -1 if does not - Function GetNodeOfFolder(Index: Integer): TTreeNode; Overload; - Function GetNodeOfFolder(Folder: String): TTreeNode; Overload; - Procedure AddFolderAssociation(Fld, Cmd: String); - Procedure RemoveFolderAssociation(Fld, Cmd: String); - Function IndexOfFolder(Fld: String): Integer; - Procedure ReSelect; - Procedure SetUseColors(Const Value: Boolean); - Procedure SetShowInheritedMembers(Const Value: Boolean); - Public - Constructor Create(AOwner: TComponent); Override; - Destructor Destroy; Override; - Procedure Loaded; Override; //Added by Jason Jiang to solve the problem when dropped to a + fUseColors: boolean; + fParserBusy: boolean; + fShowInheritedMembers: boolean; + fShowingSampleData: boolean; + procedure CustomPaintMe(var Msg: TMessage); message WM_PAINT; + procedure SetParser(Value: TCppParser); + procedure AddMembers(Node: TTreeNode; ParentIndex, ParentID: integer); + procedure OnNodeChange(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: integer); + procedure OnNodeChanging(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: integer); + procedure myDragOver(Sender, Source: TObject; X, Y: integer; State: TDragState; var Accept: boolean); + procedure myDragDrop(Sender, Source: TObject; X, Y: integer); + procedure myMouseMove(Sender: TObject; Shift: TShiftState; X, Y: integer); + procedure OnParserUpdate(Sender: TObject); + procedure OnParserBusy(Sender: TObject); + procedure SetNodeImages(Node: TTreeNode; Statement: PStatement); + procedure Sort; + procedure SetCurrentFile(Value: string); + procedure SetShowFilter(const Value: TShowFilter); + procedure ReadClassFolders; // read folders from disk + procedure WriteClassFolders; // write folders to disk + function HasSubFolder(Cmd: string): boolean; // if Command has subfolders, returns true + procedure CreateFolders(Cmd: string; Node: TTreeNode); // creates folders under Command + function BelongsToFolder(Cmd: string): integer; // returns the index to fFolders it belongs or -1 if does not + function GetNodeOfFolder(Index: integer): TTreeNode; overload; + function GetNodeOfFolder(Folder: string): TTreeNode; overload; + procedure AddFolderAssociation(Fld, Cmd: string); + procedure RemoveFolderAssociation(Fld, Cmd: string); + function IndexOfFolder(Fld: string): integer; + procedure ReSelect; + procedure SetUseColors(const Value: boolean); + procedure SetShowInheritedMembers(const Value: boolean); + public + constructor Create(AOwner: TComponent); override; + destructor Destroy; override; + procedure Loaded; override; //Added by Jason Jiang to solve the problem when dropped to a //design surface caused an error of "Control " has no parent window" - Procedure UpdateView; - Procedure ShowSampleData; - Procedure Clear; - Procedure AddFolder(S: String; Node: TTreeNode); - Procedure RemoveFolder(S: String); - Procedure RenameFolder(Old, New: String); - Function IsNodeAFolder(FolderNode: TTreeNode): Boolean; - Function FolderCount: Integer; - Procedure SetUpdateOn; - Procedure SetUpdateOff; - Published - Property Align; - Property Font; - Property Color; - Property Images; - Property ReadOnly; - Property Indent; - Property TabOrder; - Property PopupMenu; - Property ShowFilter: TShowFilter Read fShowFilter Write SetShowFilter; - Property OnSelect: TMemberSelectEvent Read fOnSelect Write fOnSelect; - Property Parser: TCppParser Read fParser Write SetParser; - Property ItemImages: TImagesRecord Read fImagesRecord Write fImagesRecord; - Property CurrentFile: String Read fCurrentFile Write SetCurrentFile; - Property ProjectDir: TFileName Read fProjectDir Write fProjectDir; - Property ClassFoldersFile: TFileName Read fClassFoldersFile Write fClassFoldersFile; - Property UseColors: Boolean Read fUseColors Write SetUseColors; - Property ShowInheritedMembers: Boolean Read fShowInheritedMembers Write SetShowInheritedMembers; - End; + procedure UpdateView; + procedure ShowSampleData; + procedure Clear; + procedure AddFolder(S: string; Node: TTreeNode); + procedure RemoveFolder(S: string); + procedure RenameFolder(Old, New: string); + function IsNodeAFolder(FolderNode: TTreeNode): boolean; + function FolderCount: integer; + procedure SetUpdateOn; + procedure SetUpdateOff; + published + property Align; + property Font; + property Color; + property Images; + property ReadOnly; + property Indent; + property TabOrder; + property PopupMenu; + property ShowFilter: TShowFilter read fShowFilter write SetShowFilter; + property OnSelect: TMemberSelectEvent read fOnSelect write fOnSelect; + property Parser: TCppParser read fParser write SetParser; + property ItemImages: TImagesRecord read fImagesRecord write fImagesRecord; + property CurrentFile: string read fCurrentFile write SetCurrentFile; + property ProjectDir: TFileName read fProjectDir write fProjectDir; + property ClassFoldersFile: TFileName read fClassFoldersFile write fClassFoldersFile; + property UseColors: boolean read fUseColors write SetUseColors; + property ShowInheritedMembers: boolean read fShowInheritedMembers write SetShowInheritedMembers; + end; -Const +const CLASS_FOLDERS_MAGIC = 'DEVCF_1_0'; -Implementation +implementation { TClassBrowser } -Procedure TClassBrowser.SetNodeImages(Node: TTreeNode; Statement: PStatement); -Var - bInherited: Boolean; -Begin - bInherited := fShowInheritedMembers And Assigned(Node.Parent) And (PStatement(Node.Parent.Data)^._ID <> PStatement(Node.Data)^._ParentID); +procedure TClassBrowser.SetNodeImages(Node: TTreeNode; Statement: PStatement); +var + bInherited: boolean; +begin + bInherited := fShowInheritedMembers and Assigned(Node.Parent) and (PStatement(Node.Parent.Data)^._ID <> PStatement(Node.Data)^._ParentID); - Case Statement^._Kind Of + case Statement^._Kind of skClass: - Begin + begin Node.ImageIndex := fImagesRecord.Classes; - End; + end; skVariable, skEnum: - Case Statement^._ClassScope Of + case Statement^._ClassScope of scsPrivate: Node.ImageIndex := fImagesRecord.VariablePrivate; scsProtected: - If Not bInherited Then - Node.ImageIndex := fImagesRecord.VariableProtected Else Node.ImageIndex := fImagesRecord.InheritedVariableProtected; + if not bInherited then + Node.ImageIndex := fImagesRecord.VariableProtected else Node.ImageIndex := fImagesRecord.InheritedVariableProtected; scsPublic: - If Not bInherited Then - Node.ImageIndex := fImagesRecord.VariablePublic Else Node.ImageIndex := fImagesRecord.InheritedVariablePublic; + if not bInherited then + Node.ImageIndex := fImagesRecord.VariablePublic else Node.ImageIndex := fImagesRecord.InheritedVariablePublic; scsPublished: - If Not bInherited Then - Node.ImageIndex := fImagesRecord.VariablePublished Else Node.ImageIndex := fImagesRecord.InheritedVariablePublic; - Else + if not bInherited then + Node.ImageIndex := fImagesRecord.VariablePublished else Node.ImageIndex := fImagesRecord.InheritedVariablePublic; + else Node.ImageIndex := fImagesRecord.VariablePublished; - End; + end; skFunction, skConstructor, skDestructor: - Case Statement^._ClassScope Of + case Statement^._ClassScope of scsPrivate: Node.ImageIndex := fImagesRecord.MethodPrivate; scsProtected: - If Not bInherited Then - Node.ImageIndex := fImagesRecord.MethodProtected Else Node.ImageIndex := fImagesRecord.InheritedMethodProtected; + if not bInherited then + Node.ImageIndex := fImagesRecord.MethodProtected else Node.ImageIndex := fImagesRecord.InheritedMethodProtected; scsPublic: - If Not bInherited Then - Node.ImageIndex := fImagesRecord.MethodPublic Else Node.ImageIndex := fImagesRecord.InheritedMethodPublic; + if not bInherited then + Node.ImageIndex := fImagesRecord.MethodPublic else Node.ImageIndex := fImagesRecord.InheritedMethodPublic; scsPublished: - If Not bInherited Then - Node.ImageIndex := fImagesRecord.MethodPublished Else Node.ImageIndex := fImagesRecord.InheritedMethodPublic; - Else + if not bInherited then + Node.ImageIndex := fImagesRecord.MethodPublished else Node.ImageIndex := fImagesRecord.InheritedMethodPublic; + else Node.ImageIndex := fImagesRecord.MethodPublished; - End; - End; + end; + end; Node.SelectedIndex := Node.ImageIndex; Node.StateIndex := Node.ImageIndex; -End; +end; -Procedure TClassBrowser.AddMembers(Node: TTreeNode; ParentIndex, ParentID: Integer); -Var - I, iFrom, tmp, tmpI: Integer; +procedure TClassBrowser.AddMembers(Node: TTreeNode; ParentIndex, ParentID: integer); +var + I, iFrom, tmp, tmpI: integer; ParNode, NewNode: TTreeNode; - F: Integer; + F: integer; Sl: TStringList; - tmpS: String; - bInherited: Boolean; -Begin - If (Not fShowInheritedMembers) And (ParentIndex >= 0) Then + tmpS: string; + bInherited: boolean; +begin + if (not fShowInheritedMembers) and (ParentIndex >= 0) then iFrom := ParentIndex // amazing speed-up - Else + else iFrom := 0; // if showing inheritance, a big speed penalty // create folders that have this branch as parent - If ParentIndex <> -1 Then - With PStatement(fParser.Statements[ParentIndex])^ Do - Begin - If HasSubFolder(ExtractFileName(_Filename) + ':' + IntToStr(_Line) + ':' + _FullText) Then + if ParentIndex <> -1 then + with PStatement(fParser.Statements[ParentIndex])^ do + begin + if HasSubFolder(ExtractFileName(_Filename) + ':' + IntToStr(_Line) + ':' + _FullText) then CreateFolders(ExtractFileName(_Filename) + ':' + IntToStr(_Line) + ':' + _FullText, Node); - End - Else - Begin - If HasSubFolder('') Then + end + else + begin + if HasSubFolder('') then CreateFolders('', Node); - End; + end; sl := TStringList.Create; - Try + try // allow inheritance propagation - If fShowInheritedMembers And (ParentIndex <> -1) And (PStatement(fParser.Statements[ParentIndex])^._Kind = skClass) Then - Begin + if fShowInheritedMembers and (ParentIndex <> -1) and (PStatement(fParser.Statements[ParentIndex])^._Kind = skClass) then + begin // follow the inheritance tree all the way up. // this code does not work for C++ polymorphic classes tmp := ParentIndex; tmpI := tmp; tmpS := ''; sl.Clear; - While (tmp <> -1) Do - Begin + while (tmp <> -1) do + begin tmpS := PStatement(fParser.Statements[tmpI])^._InheritsFromIDs; tmp := StrToIntDef(tmpS, -1); tmpI := fParser.IndexOfStatement(tmp); - If sl.IndexOf(tmpS) <> -1 Then + if sl.IndexOf(tmpS) <> -1 then tmp := -1; - If (tmp <> -1) Then + if (tmp <> -1) then sl.CommaText := sl.CommaText + tmpS + ','; - End; - End - Else + end; + end + else sl.Clear; - bInherited := False; - For I := iFrom To fParser.Statements.Count - 1 Do - Begin - With PStatement(fParser.Statements[I])^ Do - Begin - If Not _Visible Then + bInherited := FALSE; + for I := iFrom to fParser.Statements.Count - 1 do + begin + with PStatement(fParser.Statements[I])^ do + begin + if not _Visible then Continue; - If _ParentID <> ParentID Then - Begin - bInherited := fShowInheritedMembers And (sl.IndexOf(IntToStr(_ParentID)) > -1); - If Not bInherited Then + if _ParentID <> ParentID then + begin + bInherited := fShowInheritedMembers and (sl.IndexOf(IntToStr(_ParentID)) > -1); + if not bInherited then Continue; - End; + end; - If (fShowFilter = sfAll) Or - ((fShowFilter = sfProject) And (_InProject Or bInherited)) Or - ((fShowFilter = sfCurrent) And ((_Filename = fCurrentFileHeader) Or (_Filename = fCurrentFileImpl) Or bInherited)) Then - Begin + if (fShowFilter = sfAll) or + ((fShowFilter = sfProject) and (_InProject or bInherited)) or + ((fShowFilter = sfCurrent) and ((_Filename = fCurrentFileHeader) or (_Filename = fCurrentFileImpl) or bInherited)) then + begin // check if belongs to folder F := BelongsToFolder(ExtractFileName(_Filename) + ':' + IntToStr(_Line) + ':' + _FullText); - If F <> -1 Then + if F <> -1 then ParNode := GetNodeOfFolder(F) - Else + else ParNode := Node; - If fUseColors Then + if fUseColors then NewNode := Items.AddChildObject(ParNode, ' ' + _FullText + ' ', PStatement(fParser.Statements[I])) - Else + else NewNode := Items.AddChildObject(ParNode, _Command, PStatement(fParser.Statements[I])); SetNodeImages(NewNode, PStatement(fParser.Statements[I])); - If (PStatement(fParser.Statements[I])^._Kind = skClass) And (I <> ParentIndex) Then // CL: fixed potential infinite loop bug + if (PStatement(fParser.Statements[I])^._Kind = skClass) and (I <> ParentIndex) then // CL: fixed potential infinite loop bug AddMembers(NewNode, I, _ID); - End; - End; - End; - Finally + end; + end; + end; + finally sl.Free; - End; -End; + end; +end; //Added by Jason Jiang -Procedure TClassBrowser.Loaded; -Begin - DesktopFont := True; -End; +procedure TClassBrowser.Loaded; +begin + DesktopFont := TRUE; +end; -Constructor TClassBrowser.Create(AOwner: TComponent); -Begin - Inherited Create(AOwner); +constructor TClassBrowser.Create(AOwner: TComponent); +begin + inherited Create(AOwner); //DesktopFont := True; //This line of code caused a design time error moved to Loaded procedure ---- Jason Jiang OnMouseUp := OnNodeChange; OnMouseDown := OnNodeChanging; @@ -338,188 +338,188 @@ fCurrentFileHeader := ''; fCurrentFileImpl := ''; fShowFilter := sfAll; - fParserBusy := False; + fParserBusy := FALSE; fProjectDir := ''; fClassFoldersFile := ''; - ShowHint := True; - HideSelection := False; - RightClickSelect := True; - fShowInheritedMembers := False; - SetUseColors(True); - fShowingSampleData := False; -End; + ShowHint := TRUE; + HideSelection := FALSE; + RightClickSelect := TRUE; + fShowInheritedMembers := FALSE; + SetUseColors(TRUE); + fShowingSampleData := FALSE; +end; -Destructor TClassBrowser.Destroy; -Begin +destructor TClassBrowser.Destroy; +begin SetLength(fFolderAssocs, 0); SetLength(fFolders, 0); - If Assigned(fImagesRecord) Then + if Assigned(fImagesRecord) then FreeAndNil(fImagesRecord) - Else fImagesRecord := Nil; + else fImagesRecord := NIL; - If fUseColors Then - SetUseColors(False); + if fUseColors then + SetUseColors(FALSE); - Inherited Destroy; -End; + inherited Destroy; +end; -Procedure TClassBrowser.UpdateView; -Begin - If fParser = Nil Then +procedure TClassBrowser.UpdateView; +begin + if fParser = NIL then Exit; - fParserBusy := True; + fParserBusy := TRUE; Items.BeginUpdate; Clear; ReadClassFolders; - AddMembers(Nil, -1, -1); + AddMembers(NIL, -1, -1); Sort; - If fLastSelection <> '' Then + if fLastSelection <> '' then ReSelect; WriteClassFolders; Items.EndUpdate; - fParserBusy := False; + fParserBusy := FALSE; Repaint; -End; +end; -Procedure TClassBrowser.OnNodeChanging(Sender: TObject; - Button: TMouseButton; Shift: TShiftState; X, Y: Integer); -Var +procedure TClassBrowser.OnNodeChanging(Sender: TObject; + Button: TMouseButton; Shift: TShiftState; X, Y: integer); +var Node: TTreeNode; -Begin - If htOnItem In GetHitTestInfoAt(X, Y) Then +begin + if htOnItem in GetHitTestInfoAt(X, Y) then Node := GetNodeAt(X, Y) - Else - Node := Nil; + else + Node := NIL; Selected := Node; -End; +end; -Procedure TClassBrowser.OnNodeChange(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); -Var +procedure TClassBrowser.OnNodeChange(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: integer); +var Node: TTreeNode; -Begin - Inherited; +begin + inherited; - If htOnItem In GetHitTestInfoAt(X, Y) Then + if htOnItem in GetHitTestInfoAt(X, Y) then Node := GetNodeAt(X, Y) - Else - Node := Nil; + else + Node := NIL; - If Not Assigned(Node) Then - Begin + if not Assigned(Node) then + begin fLastSelection := ''; Exit; - End - Else - If Not Assigned(Node.Data) Then - Begin + end + else + if not Assigned(Node.Data) then + begin fLastSelection := ''; Exit; - End - Else - If Not fShowingSampleData And (fParser = Nil) Then - Begin - Node.Data := Nil; + end + else + if not fShowingSampleData and (fParser = NIL) then + begin + Node.Data := NIL; fLastSelection := ''; Exit; - End - Else - If Not fShowingSampleData And (fParser.Statements.IndexOf(Node.Data) = -1) Then - Begin - Node.Data := Nil; + end + else + if not fShowingSampleData and (fParser.Statements.IndexOf(Node.Data) = -1) then + begin + Node.Data := NIL; fLastSelection := ''; Exit; - End; + end; - If Node.ImageIndex = fImagesRecord.fGlobalsImg Then - Begin + if Node.ImageIndex = fImagesRecord.fGlobalsImg then + begin fLastSelection := PFolders(Node.Data)^.Under; Exit; - End; + end; - With PStatement(Node.Data)^ Do - Begin + with PStatement(Node.Data)^ do + begin fLastSelection := ExtractFileName(_Filename) + ':' + IntToStr(_Line) + ':' + _FullText; - If Assigned(fOnSelect) Then - If (Button = mbLeft) And Not (ssShift In Shift) Then // need implementation - If _IsDeclaration Then + if Assigned(fOnSelect) then + if (Button = mbLeft) and not (ssShift in Shift) then // need implementation + if _IsDeclaration then fOnSelect(Self, _DeclImplFileName, _DeclImplLine) - Else + else fOnSelect(Self, _FileName, _Line) - Else - If (Button = mbLeft) And (ssShift In Shift) Then // // need declaration - If _IsDeclaration Then + else + if (Button = mbLeft) and (ssShift in Shift) then // // need declaration + if _IsDeclaration then fOnSelect(Self, _FileName, _Line) - Else + else fOnSelect(Self, _DeclImplFileName, _DeclImplLine); - End; -End; + end; +end; -Procedure TClassBrowser.SetParser(Value: TCppParser); -Begin - If Value <> fParser Then - Begin +procedure TClassBrowser.SetParser(Value: TCppParser); +begin + if Value <> fParser then + begin fParser := Value; - If Assigned(fParser) Then - Begin + if Assigned(fParser) then + begin fParser.OnUpdate := OnParserUpdate; fParser.OnBusy := OnParserBusy; - End; + end; UpdateView; - End; -End; + end; +end; -Procedure TClassBrowser.SetUpdateOn; -Begin - If Assigned(fParser) Then +procedure TClassBrowser.SetUpdateOn; +begin + if Assigned(fParser) then fParser.OnUpdate := OnParserUpdate; -End; +end; -Procedure TClassBrowser.SetUpdateOff; -Begin - If Assigned(fParser) Then - fParser.OnUpdate := Nil; -End; +procedure TClassBrowser.SetUpdateOff; +begin + if Assigned(fParser) then + fParser.OnUpdate := NIL; +end; -Procedure TClassBrowser.OnParserUpdate(Sender: TObject); -Begin - fParserBusy := False; +procedure TClassBrowser.OnParserUpdate(Sender: TObject); +begin + fParserBusy := FALSE; UpdateView; -End; +end; -Procedure TClassBrowser.OnParserBusy(Sender: TObject); -Begin - fParserBusy := True; -End; +procedure TClassBrowser.OnParserBusy(Sender: TObject); +begin + fParserBusy := TRUE; +end; -Procedure TClassBrowser.ShowSampleData; - Function CreateTempStatement(Full, Typ, Cmd, Args: String; K: TStatementKind; S: TStatementClassScope): PStatement; - Begin +procedure TClassBrowser.ShowSampleData; + function CreateTempStatement(Full, Typ, Cmd, Args: string; K: TStatementKind; S: TStatementClassScope): PStatement; + begin Result := New(PStatement); - With Result^ Do - Begin + with Result^ do + begin _FullText := Full; _Type := Typ; _ScopelessCmd := Cmd; _Command := _ScopelessCmd; _Args := Args; - _Visible := True; - _Valid := True; + _Visible := TRUE; + _Valid := TRUE; _Kind := K; _ClassScope := S; - End; - End; -Var + end; + end; +var Node, SubNode: TTreeNode; Statement: PStatement; -Begin - fShowingSampleData := True; +begin + fShowingSampleData := TRUE; Items.Clear; - With Items Do - Begin + with Items do + begin Statement := CreateTempStatement('class Class1', 'class', 'Class1', '', skClass, scsNone); - Node := AddChildObject(Nil, ' ' + Statement^._Command + ' ', Statement); + Node := AddChildObject(NIL, ' ' + Statement^._Command + ' ', Statement); SetNodeImages(Node, Statement); Statement := CreateTempStatement('Class1()', '', 'Class1', '', skConstructor, scsPublic); @@ -552,7 +552,7 @@ Expand(Node); Statement := CreateTempStatement('class Class2', 'class', 'Class2', '', skClass, scsNone); - Node := AddChildObject(Nil, ' ' + Statement^._Command + ' ', Statement); + Node := AddChildObject(NIL, ' ' + Statement^._Command + ' ', Statement); SetNodeImages(Node, Statement); Statement := CreateTempStatement('Class2()', '', 'Class2', '', skConstructor, scsPublic); @@ -583,162 +583,162 @@ SubNode := AddChildObject(Node, ' ' + Statement^._Command + ' ', Statement); SetNodeImages(SubNode, Statement); Expand(Node); - End; -End; + end; +end; -Function CustomSortProc(Node1, Node2: TTreeNode; Data: Integer): Integer; Stdcall; -Begin - If (Node1.ImageIndex = 0) Or (Node2.ImageIndex = 0) Then +function CustomSortProc(Node1, Node2: TTreeNode; Data: integer): integer; stdcall; +begin + if (Node1.ImageIndex = 0) or (Node2.ImageIndex = 0) then Result := Node1.ImageIndex - Node2.ImageIndex - Else + else Result := Ord(PStatement(Node1.Data)^._Kind) - Ord(PStatement(Node2.Data)^._Kind); - If Result = 0 Then - Result := AnsiStrIComp(Pchar(Node1.Text), Pchar(Node2.Text)); -End; + if Result = 0 then + Result := AnsiStrIComp(pchar(Node1.Text), pchar(Node2.Text)); +end; -Procedure TClassBrowser.Sort; -Begin +procedure TClassBrowser.Sort; +begin CustomSort(@CustomSortProc, 0); -End; +end; -Procedure TClassBrowser.SetCurrentFile(Value: String); -Begin - If fShowFilter <> sfCurrent Then +procedure TClassBrowser.SetCurrentFile(Value: string); +begin + if fShowFilter <> sfCurrent then Exit; fCurrentFile := Value; fCurrentFileHeader := ChangeFileExt(fCurrentFile, '.h'); - If Not FileExists(fCurrentFileHeader) Then + if not FileExists(fCurrentFileHeader) then fCurrentFileHeader := ChangeFileExt(fCurrentFile, '.hpp'); - If Not FileExists(fCurrentFileHeader) Then + if not FileExists(fCurrentFileHeader) then fCurrentFileHeader := ChangeFileExt(fCurrentFile, '.hh'); fCurrentFileImpl := ChangeFileExt(fCurrentFile, '.c'); - If Not FileExists(fCurrentFileImpl) Then + if not FileExists(fCurrentFileImpl) then fCurrentFileImpl := ChangeFileExt(fCurrentFile, '.cpp'); - If Not FileExists(fCurrentFileImpl) Then + if not FileExists(fCurrentFileImpl) then fCurrentFileImpl := ChangeFileExt(fCurrentFile, '.cc'); fCurrentFileHeader := LowerCase(fCurrentFileHeader); fCurrentFileImpl := LowerCase(fCurrentFileImpl); UpdateView; -End; +end; -Procedure TClassBrowser.Clear; -Begin +procedure TClassBrowser.Clear; +begin Items.Clear; SetLength(fFolders, 0); SetLength(fFolderAssocs, 0); -End; +end; -Procedure TClassBrowser.SetShowFilter(Const Value: TShowFilter); -Begin - If fShowFilter <> Value Then - Begin +procedure TClassBrowser.SetShowFilter(const Value: TShowFilter); +begin + if fShowFilter <> Value then + begin fShowFilter := Value; UpdateView; - End; -End; + end; +end; // returns the index to fFolders it belongs or -1 if does not -Function TClassBrowser.BelongsToFolder(Cmd: String): Integer; -Var - I: Integer; -Begin +function TClassBrowser.BelongsToFolder(Cmd: string): integer; +var + I: integer; +begin Result := -1; - For I := Low(fFolderAssocs) To High(fFolderAssocs) Do - If AnsiCompareText(fFolderAssocs[I].Command, Cmd) = 0 Then + for I := Low(fFolderAssocs) to High(fFolderAssocs) do + if AnsiCompareText(fFolderAssocs[I].Command, Cmd) = 0 then Result := fFolderAssocs[I].FolderID; -End; +end; // creates folders under Command -Procedure TClassBrowser.CreateFolders(Cmd: String; Node: TTreeNode); -Var - I: Integer; -Begin - For I := Low(fFolders) To High(fFolders) Do - If AnsiCompareText(fFolders[I].Under, Cmd) = 0 Then - Begin +procedure TClassBrowser.CreateFolders(Cmd: string; Node: TTreeNode); +var + I: integer; +begin + for I := Low(fFolders) to High(fFolders) do + if AnsiCompareText(fFolders[I].Under, Cmd) = 0 then + begin fFolders[I].Node := Items.AddChildObjectFirst(Node, fFolders[I].Name, @fFolders[I]); // if AnsiCompareStr(fFolders[I].Under, #01#02+Char(I)) = 0 then - CreateFolders(#01#02 + Char(I), fFolders[I].Node); - End; -End; + CreateFolders(#01#02 + char(I), fFolders[I].Node); + end; +end; -Function TClassBrowser.HasSubFolder(Cmd: String): Boolean; -Var - I: Integer; -Begin - Result := False; - For I := Low(fFolders) To High(fFolders) Do - If AnsiCompareText(fFolders[I].Under, Cmd) = 0 Then - Begin - Result := True; +function TClassBrowser.HasSubFolder(Cmd: string): boolean; +var + I: integer; +begin + Result := FALSE; + for I := Low(fFolders) to High(fFolders) do + if AnsiCompareText(fFolders[I].Under, Cmd) = 0 then + begin + Result := TRUE; Break; - End; -End; + end; +end; -Procedure TClassBrowser.ReadClassFolders; -Var - Magic: Array[0..8] Of Char; - iNumEntries: Integer; - hFile: Integer; - I: Integer; -Begin - If fProjectDir = '' Then +procedure TClassBrowser.ReadClassFolders; +var + Magic: array[0..8] of char; + iNumEntries: integer; + hFile: integer; + I: integer; +begin + if fProjectDir = '' then Exit; hFile := FileOpen(fProjectDir + '\' + fClassFoldersFile, fmOpenRead); - If hFile <= 0 Then + if hFile <= 0 then Exit; // file not open FileRead(hFile, Magic, SizeOf(Magic)); - If Magic <> CLASS_FOLDERS_MAGIC Then - Begin + if Magic <> CLASS_FOLDERS_MAGIC then + begin FileClose(hFile); Exit; // magic different - End; + end; // folders - FileRead(hFile, iNumEntries, SizeOf(Integer)); + FileRead(hFile, iNumEntries, SizeOf(integer)); SetLength(fFolders, iNumEntries); - For I := Low(fFolders) To High(fFolders) Do - Begin - fFolders[I].Index := Char(I); + for I := Low(fFolders) to High(fFolders) do + begin + fFolders[I].Index := char(I); FileRead(hFile, fFolders[I].Name, SizeOf(fFolders[I].Name)); FileRead(hFile, fFolders[I].Under, SizeOf(fFolders[I].Under)); - End; + end; // associations - FileRead(hFile, iNumEntries, SizeOf(Integer)); + FileRead(hFile, iNumEntries, SizeOf(integer)); SetLength(fFolderAssocs, iNumEntries); - For I := Low(fFolderAssocs) To High(fFolderAssocs) Do - Begin + for I := Low(fFolderAssocs) to High(fFolderAssocs) do + begin FileRead(hFile, fFolderAssocs[I].FolderID, SizeOf(fFolderAssocs[I].FolderID)); fFolderAssocs[I].Folder := fFolders[fFolderAssocs[I].FolderID].Name; FileRead(hFile, fFolderAssocs[I].Command, SizeOf(fFolderAssocs[I].Command)); - End; + end; FileClose(hFile); -End; +end; -Procedure TClassBrowser.WriteClassFolders; -Var - Magic: Array[0..8] Of Char; - iNumEntries: Integer; - hFile: Integer; - I: Integer; -Begin - If fProjectDir = '' Then +procedure TClassBrowser.WriteClassFolders; +var + Magic: array[0..8] of char; + iNumEntries: integer; + hFile: integer; + I: integer; +begin + if fProjectDir = '' then Exit; - If High(fFolders) = -1 Then - Begin + if High(fFolders) = -1 then + begin DeleteFile(fProjectDir + '\' + fClassFoldersFile); Exit; - End; + end; hFile := FileCreate(fProjectDir + '\' + fClassFoldersFile); - If hFile <= 0 Then + if hFile <= 0 then Exit; // file not open Magic := CLASS_FOLDERS_MAGIC; @@ -746,191 +746,191 @@ // folders iNumEntries := High(fFolders) + 1; - FileWrite(hFile, iNumEntries, SizeOf(Integer)); - For I := Low(fFolders) To High(fFolders) Do - Begin + FileWrite(hFile, iNumEntries, SizeOf(integer)); + for I := Low(fFolders) to High(fFolders) do + begin FileWrite(hFile, fFolders[I].Name, SizeOf(fFolders[I].Name)); FileWrite(hFile, fFolders[I].Under, SizeOf(fFolders[I].Under)); - End; + end; // associations iNumEntries := High(fFolderAssocs) + 1; - FileWrite(hFile, iNumEntries, SizeOf(Integer)); - For I := Low(fFolderAssocs) To High(fFolderAssocs) Do - Begin + FileWrite(hFile, iNumEntries, SizeOf(integer)); + for I := Low(fFolderAssocs) to High(fFolderAssocs) do + begin FileWrite(hFile, fFolderAssocs[I].FolderID, SizeOf(fFolderAssocs[I].FolderID)); FileWrite(hFile, fFolderAssocs[I].Command, SizeOf(fFolderAssocs[I].Command)); - End; + end; FileClose(hFile); -End; +end; -Procedure TClassBrowser.AddFolder(S: String; Node: TTreeNode); -Begin - If High(fFolders) >= MAX_CUSTOM_FOLDERS Then +procedure TClassBrowser.AddFolder(S: string; Node: TTreeNode); +begin + if High(fFolders) >= MAX_CUSTOM_FOLDERS then Exit; - If S = '' Then + if S = '' then Exit; - If Length(S) > 32 Then + if Length(S) > 32 then S := Copy(S, 1, 32); SetLength(fFolders, High(fFolders) + 2); - fFolders[High(fFolders)].Index := Char(High(fFolders)); + fFolders[High(fFolders)].Index := char(High(fFolders)); fFolders[High(fFolders)].Name := S; - If Assigned(Node) And (Node.ImageIndex <> fImagesRecord.fGlobalsImg) And Not Node.HasChildren Then + if Assigned(Node) and (Node.ImageIndex <> fImagesRecord.fGlobalsImg) and not Node.HasChildren then Node := Node.Parent; - If Assigned(Node) Then - Begin - If Node.ImageIndex <> fImagesRecord.fGlobalsImg Then - With PStatement(Node.Data)^ Do + if Assigned(Node) then + begin + if Node.ImageIndex <> fImagesRecord.fGlobalsImg then + with PStatement(Node.Data)^ do fFolders[High(fFolders)].Under := ExtractFileName(_Filename) + ':' + IntToStr(_Line) + ':' + _FullText - Else - fFolders[High(fFolders)].Under := #01#02 + Char(PFolders(Node.Data)^.Index); - End; + else + fFolders[High(fFolders)].Under := #01#02 + char(PFolders(Node.Data)^.Index); + end; fFolders[High(fFolders)].Node := Items.AddChildObjectFirst(Node, fFolders[High(fFolders)].Name, @fFolders[High(fFolders)]); WriteClassFolders; -End; +end; -Procedure TClassBrowser.RemoveFolder(S: String); -Var - I: Integer; - C: Integer; -Begin - For I := Low(fFolders) To High(fFolders) Do - If AnsiCompareText(fFolders[I].Name, S) = 0 Then - Begin - If Assigned(fFolders[I].Node) Then - Begin - While fFolders[I].Node.Count > 0 Do +procedure TClassBrowser.RemoveFolder(S: string); +var + I: integer; + C: integer; +begin + for I := Low(fFolders) to High(fFolders) do + if AnsiCompareText(fFolders[I].Name, S) = 0 then + begin + if Assigned(fFolders[I].Node) then + begin + while fFolders[I].Node.Count > 0 do fFolders[I].Node[0].MoveTo(fFolders[I].Node.Parent, naAddChild); fFolders[I].Node.Delete; - End; + end; RemoveFolderAssociation(fFolders[I].Name, ''); - For C := I + 1 To High(fFolders) Do + for C := I + 1 to High(fFolders) do fFolders[C - 1] := fFolders[C]; SetLength(fFolders, High(fFolders)); Break; - End; + end; Items.BeginUpdate; Sort; Items.EndUpdate; WriteClassFolders; Refresh; -End; +end; -Procedure TClassBrowser.AddFolderAssociation(Fld, Cmd: String); -Var - Index: Integer; -Begin - If (Fld = '') Or (Cmd = '') Then +procedure TClassBrowser.AddFolderAssociation(Fld, Cmd: string); +var + Index: integer; +begin + if (Fld = '') or (Cmd = '') then Exit; - If Length(Fld) > 32 Then + if Length(Fld) > 32 then Fld := Copy(Fld, 1, 32); - If Length(Cmd) > 128 Then + if Length(Cmd) > 128 then Cmd := Copy(Cmd, 1, 128); Index := IndexOfFolder(Fld); - If Index <> -1 Then - Begin + if Index <> -1 then + begin SetLength(fFolderAssocs, High(fFolderAssocs) + 2); fFolderAssocs[High(fFolderAssocs)].FolderID := Index; fFolderAssocs[High(fFolderAssocs)].Folder := Fld; fFolderAssocs[High(fFolderAssocs)].Command := Cmd; - End; -End; + end; +end; -Procedure TClassBrowser.RemoveFolderAssociation(Fld, Cmd: String); -Var - I: Integer; - C: Integer; - Index: Integer; -Begin +procedure TClassBrowser.RemoveFolderAssociation(Fld, Cmd: string); +var + I: integer; + C: integer; + Index: integer; +begin Index := IndexOfFolder(Fld); - If (Index <> -1) Or (Fld = '') Then - Begin + if (Index <> -1) or (Fld = '') then + begin I := Low(fFolderAssocs); - While I <= High(fFolderAssocs) Do - If ((Fld = '') Or (fFolderAssocs[I].FolderID = Index)) And - ((Cmd = '') Or (AnsiCompareText(fFolderAssocs[I].Command, Cmd) = 0)) Then - Begin - For C := I + 1 To High(fFolderAssocs) Do + while I <= High(fFolderAssocs) do + if ((Fld = '') or (fFolderAssocs[I].FolderID = Index)) and + ((Cmd = '') or (AnsiCompareText(fFolderAssocs[I].Command, Cmd) = 0)) then + begin + for C := I + 1 to High(fFolderAssocs) do fFolderAssocs[C - 1] := fFolderAssocs[C]; SetLength(fFolderAssocs, High(fFolderAssocs)); - End - Else + end + else Inc(I); - End; -End; + end; +end; -Function TClassBrowser.GetNodeOfFolder(Index: Integer): TTreeNode; -Begin - Result := Nil; - If Index <= High(fFolders) Then +function TClassBrowser.GetNodeOfFolder(Index: integer): TTreeNode; +begin + Result := NIL; + if Index <= High(fFolders) then Result := fFolders[Index].Node; -End; +end; -Function TClassBrowser.GetNodeOfFolder(Folder: String): TTreeNode; -Var - I: Integer; -Begin - Result := Nil; - For I := Low(fFolders) To High(fFolders) Do - If AnsiCompareText(fFolders[I].Name, Folder) = 0 Then - Begin +function TClassBrowser.GetNodeOfFolder(Folder: string): TTreeNode; +var + I: integer; +begin + Result := NIL; + for I := Low(fFolders) to High(fFolders) do + if AnsiCompareText(fFolders[I].Name, Folder) = 0 then + begin Result := fFolders[I].Node; Break; - End; -End; + end; +end; -Function TClassBrowser.IsNodeAFolder(FolderNode: TTreeNode): Boolean; -Var - I: Integer; -Begin - Result := False; - For I := Low(fFolders) To High(fFolders) Do - If FolderNode = fFolders[I].Node Then - Begin - Result := True; +function TClassBrowser.IsNodeAFolder(FolderNode: TTreeNode): boolean; +var + I: integer; +begin + Result := FALSE; + for I := Low(fFolders) to High(fFolders) do + if FolderNode = fFolders[I].Node then + begin + Result := TRUE; break; - End; -End; + end; +end; -Procedure TClassBrowser.myDragDrop(Sender, Source: TObject; X, Y: Integer); -Var +procedure TClassBrowser.myDragDrop(Sender, Source: TObject; X, Y: integer); +var Node: TTreeNode; -Begin - If htOnItem In GetHitTestInfoAt(X, Y) Then +begin + if htOnItem in GetHitTestInfoAt(X, Y) then Node := GetNodeAt(X, Y) - Else - Node := Nil; + else + Node := NIL; // if drag node is a folder - If Selected.ImageIndex = fImagesRecord.fGlobalsImg Then - Begin - If Assigned(Selected.Data) Then - If Assigned(Node) Then - Begin - If Selected.ImageIndex <> fImagesRecord.fGlobalsImg Then - With PStatement(Node.Data)^ Do + if Selected.ImageIndex = fImagesRecord.fGlobalsImg then + begin + if Assigned(Selected.Data) then + if Assigned(Node) then + begin + if Selected.ImageIndex <> fImagesRecord.fGlobalsImg then + with PStatement(Node.Data)^ do PFolders(Selected.Data)^.Under := ExtractFileName(_Filename) + ':' + IntToStr(_Line) + ':' + _FullText - Else - PFolders(Selected.Data)^.Under := #01#02 + Char(PFolders(Node.Data)^.Index); - End - Else + else + PFolders(Selected.Data)^.Under := #01#02 + char(PFolders(Node.Data)^.Index); + end + else PFolders(Selected.Data)^.Under := ''; - End + end // drag node is statement - Else With PStatement(Selected.Data)^ Do - Begin // dragged node is Statement, so Node is folder + else with PStatement(Selected.Data)^ do + begin // dragged node is Statement, so Node is folder RemoveFolderAssociation('', ExtractFileName(_Filename) + ':' + IntToStr(_Line) + ':' + _FullText); - If Assigned(Node) Then + if Assigned(Node) then AddFolderAssociation(Node.Text, ExtractFileName(_Filename) + ':' + IntToStr(_Line) + ':' + _FullText); - End; + end; - If Assigned(Selected) Then + if Assigned(Selected) then Selected.MoveTo(Node, naAddChildFirst); Items.BeginUpdate; @@ -938,291 +938,291 @@ Items.EndUpdate; WriteClassFolders; Refresh; -End; +end; -Procedure TClassBrowser.myDragOver(Sender, Source: TObject; X, Y: Integer; - State: TDragState; Var Accept: Boolean); -Var +procedure TClassBrowser.myDragOver(Sender, Source: TObject; X, Y: integer; + State: TDragState; var Accept: boolean); +var Node: TTreeNode; -Begin - If htOnItem In GetHitTestInfoAt(X, Y) Then +begin + if htOnItem in GetHitTestInfoAt(X, Y) then Node := GetNodeAt(X, Y) - Else - Node := Nil; - Accept := (Source Is TClassBrowser) And + else + Node := NIL; + Accept := (Source is TClassBrowser) and ( ( // drag node is folder, drop node is not and drop node has children - Assigned(Node) And (Selected.ImageIndex = fImagesRecord.fGlobalsImg) {and (Node.ImageIndex <> fImagesRecord.fGlobalsImg)} And Node.HasChildren - ) Or + Assigned(Node) and (Selected.ImageIndex = fImagesRecord.fGlobalsImg) {and (Node.ImageIndex <> fImagesRecord.fGlobalsImg)} and Node.HasChildren + ) or ( // drag node is folder and drop node is folder - Assigned(Node) And (Selected.ImageIndex = fImagesRecord.fGlobalsImg) And (Node.ImageIndex = fImagesRecord.fGlobalsImg) - ) Or + Assigned(Node) and (Selected.ImageIndex = fImagesRecord.fGlobalsImg) and (Node.ImageIndex = fImagesRecord.fGlobalsImg) + ) or ( // drag node is not folder, drop node is folder - Assigned(Node) And (Selected.ImageIndex <> fImagesRecord.fGlobalsImg) And (Node.ImageIndex = fImagesRecord.fGlobalsImg) - ) Or + Assigned(Node) and (Selected.ImageIndex <> fImagesRecord.fGlobalsImg) and (Node.ImageIndex = fImagesRecord.fGlobalsImg) + ) or // not drop node - Not Assigned(Node) - ) And + not Assigned(Node) + ) and (Node <> Selected); -End; +end; -Procedure TClassBrowser.myMouseMove(Sender: TObject; Shift: TShiftState; X, - Y: Integer); -Var +procedure TClassBrowser.myMouseMove(Sender: TObject; Shift: TShiftState; X, + Y: integer); +var Node: TTreeNode; -Begin - If fParserBusy Then +begin + if fParserBusy then Exit; Node := GetNodeAt(X, Y); - If Assigned(Node) And Assigned(Node.Data) And (Node.ImageIndex <> fImagesRecord.fGlobalsImg) Then - Begin + if Assigned(Node) and Assigned(Node.Data) and (Node.ImageIndex <> fImagesRecord.fGlobalsImg) then + begin Hint := PStatement(Node.Data)^._FullText; Application.ActivateHint(ClientToScreen(Point(X, Y))); - End - Else + end + else Application.HideHint; -End; +end; -Procedure TClassBrowser.RenameFolder(Old, New: String); -Var - I: Integer; - Index: Integer; -Begin +procedure TClassBrowser.RenameFolder(Old, New: string); +var + I: integer; + Index: integer; +begin Index := IndexOfFolder(Old); - If Index <> -1 Then - Begin + if Index <> -1 then + begin fFolders[Index].Name := New; - For I := Low(fFolderAssocs) To High(fFolderAssocs) Do - If fFolderAssocs[I].FolderID = Index Then + for I := Low(fFolderAssocs) to High(fFolderAssocs) do + if fFolderAssocs[I].FolderID = Index then fFolderAssocs[I].Folder := New; fFolders[Index].Node.Text := New; WriteClassFolders; Refresh; - End; -End; + end; +end; -Function TClassBrowser.IndexOfFolder(Fld: String): Integer; -Var - I: Integer; -Begin +function TClassBrowser.IndexOfFolder(Fld: string): integer; +var + I: integer; +begin Result := -1; - For I := Low(fFolders) To High(fFolders) Do - If AnsiCompareText(Fld, fFolders[I].Name) = 0 Then - Begin + for I := Low(fFolders) to High(fFolders) do + if AnsiCompareText(Fld, fFolders[I].Name) = 0 then + begin Result := I; Break; - End; -End; + end; +end; -Procedure TClassBrowser.ReSelect; - Function DoSelect(Node: TTreeNode): Boolean; - Var - I: Integer; - OldSelection: String; - Begin - Result := False; - For I := 0 To Node.Count - 1 Do - Begin - If Node[I].ImageIndex <> fImagesRecord.fGlobalsImg Then - With PStatement(Node[I].Data)^ Do +procedure TClassBrowser.ReSelect; + function DoSelect(Node: TTreeNode): boolean; + var + I: integer; + OldSelection: string; + begin + Result := FALSE; + for I := 0 to Node.Count - 1 do + begin + if Node[I].ImageIndex <> fImagesRecord.fGlobalsImg then + with PStatement(Node[I].Data)^ do OldSelection := ExtractFileName(_Filename) + ':' + IntToStr(_Line) + ':' + _FullText - Else + else OldSelection := PFolders(Node[I].Data)^.Under; - If AnsiCompareStr(OldSelection, fLastSelection) = 0 Then - Begin + if AnsiCompareStr(OldSelection, fLastSelection) = 0 then + begin Selected := Node[I]; - Result := True; + Result := TRUE; Break; - End - Else - If Node[I].HasChildren Then - Begin + end + else + if Node[I].HasChildren then + begin Result := DoSelect(Node[I]); - If Result Then + if Result then Break; - End; - End; - End; -Var - I: Integer; - OldSelection: String; -Begin - For I := 0 To Items.Count - 1 Do - Begin - If Items[I].ImageIndex <> fImagesRecord.fGlobalsImg Then - With PStatement(Items[I].Data)^ Do + end; + end; + end; +var + I: integer; + OldSelection: string; +begin + for I := 0 to Items.Count - 1 do + begin + if Items[I].ImageIndex <> fImagesRecord.fGlobalsImg then + with PStatement(Items[I].Data)^ do OldSelection := ExtractFileName(_Filename) + ':' + IntToStr(_Line) + ':' + _FullText - Else + else OldSelection := PFolders(Items[I].Data)^.Under; - If AnsiCompareStr(OldSelection, fLastSelection) = 0 Then - Begin + if AnsiCompareStr(OldSelection, fLastSelection) = 0 then + begin Selected := Items[I]; Break; - End - Else - If Items[I].HasChildren Then - If DoSelect(Items[I]) Then + end + else + if Items[I].HasChildren then + if DoSelect(Items[I]) then Break; - End; -End; + end; +end; -Function TClassBrowser.FolderCount: Integer; -Begin +function TClassBrowser.FolderCount: integer; +begin Result := High(fFolders) + 1; -End; +end; -Procedure TClassBrowser.CustomPaintMe(Var Msg: TMessage); -Var - I: Integer; +procedure TClassBrowser.CustomPaintMe(var Msg: TMessage); +var + I: integer; NodeRect, tmp: TRect; st: PStatement; - bInherited: Boolean; + bInherited: boolean; currItem: TTreeNode; -Begin - Inherited; +begin + inherited; - If fParserBusy Then + if fParserBusy then Exit; - If Not Assigned(fCnv) Or Not fUseColors Then + if not Assigned(fCnv) or not fUseColors then Exit; - For I := 0 To Items.Count - 1 Do - Begin + for I := 0 to Items.Count - 1 do + begin currItem := Items[I]; - If currItem.IsVisible Then - Begin - NodeRect := currItem.DisplayRect(True); + if currItem.IsVisible then + begin + NodeRect := currItem.DisplayRect(TRUE); - If currItem.ImageIndex <> fImagesRecord.fGlobalsImg Then - Begin + if currItem.ImageIndex <> fImagesRecord.fGlobalsImg then + begin fCnv.Font.Color := Self.Font.Color; fCnv.Brush.Color := Color; fCnv.FillRect(NodeRect); st := currItem.Data; - If Assigned(fParser) Or fShowingSampleData Then - If Assigned(st) Then - If fShowingSampleData - Or (fParser.Statements.IndexOf(st) <> -1) Then - Begin + if Assigned(fParser) or fShowingSampleData then + if Assigned(st) then + if fShowingSampleData + or (fParser.Statements.IndexOf(st) <> -1) then + begin fCnv.Font.Style := [fsBold]; - If Selected = currItem Then - Begin + if Selected = currItem then + begin fCnv.Font.Color := clHighlightText; fCnv.Brush.Color := clHighlight; tmp := NodeRect; tmp.Right := tmp.Left + fCnv.TextWidth(st^._ScopelessCmd) + 4; fCnv.FillRect(tmp); - End; + end; - bInherited := fShowInheritedMembers And - Assigned(currItem.Parent) And - (currItem.Parent.ImageIndex <> fImagesRecord.Globals) And - Assigned(currItem.Parent.Data) And - (fShowingSampleData Or - (fParser.Statements.IndexOf(currItem.Parent.Data) <> -1)) And + bInherited := fShowInheritedMembers and + Assigned(currItem.Parent) and + (currItem.Parent.ImageIndex <> fImagesRecord.Globals) and + Assigned(currItem.Parent.Data) and + (fShowingSampleData or + (fParser.Statements.IndexOf(currItem.Parent.Data) <> -1)) and (PStatement(currItem.Parent.Data)^._ID <> st^._ParentID); - If bInherited Then + if bInherited then fCnv.Font.Color := clGray; fCnv.TextOut(NodeRect.Left + 2, NodeRect.Top + 1, st^._ScopelessCmd); - ... [truncated message content] |
From: <tb...@us...> - 2012-03-19 03:02:56
|
Revision: 1481 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1481&view=rev Author: tbreina Date: 2012-03-19 03:02:47 +0000 (Mon, 19 Mar 2012) Log Message: ----------- Still a work in progress.Trying to clean up the Parser and code completion code. When destroying the TList pointers, it is best to dispose and delete from the last entry downto the first (rather than from first to last) to avoid the memory move needed, This code is still buggy. Modified Paths: -------------- trunk/wxdevcpp/source/CodeIns.pas trunk/wxdevcpp/source/EditorOptfrm.dfm trunk/wxdevcpp/source/EditorOptfrm.pas trunk/wxdevcpp/source/LangFrm.dfm trunk/wxdevcpp/source/LangFrm.pas trunk/wxdevcpp/source/Splash.pas trunk/wxdevcpp/source/devcfg.pas trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/main.dfm trunk/wxdevcpp/source/main.pas trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas trunk/wxdevcpp/source/packages/Parser/CppParser.pas trunk/wxdevcpp/source/packages/Parser/CppTokenizer.pas trunk/wxdevcpp/source/packages/devShortcuts.pas trunk/wxdevcpp/source/plugins/wxdsgn/ELDsgnr.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxUtils.pas trunk/wxdevcpp/source/plugins/wxdsgn/wxdesigner.pas trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res trunk/wxdevcpp/source/webupdate/WebUpdate.pas Modified: trunk/wxdevcpp/source/CodeIns.pas =================================================================== --- trunk/wxdevcpp/source/CodeIns.pas 2012-02-27 04:39:36 UTC (rev 1480) +++ trunk/wxdevcpp/source/CodeIns.pas 2012-03-19 03:02:47 UTC (rev 1481) @@ -106,7 +106,11 @@ idx: Integer; Begin For idx := 0 To pred(fList.Count) Do + Begin dispose(fList[idx]); + fList.Delete(idx); + End; + fList.Clear; fList.Free; Inherited Destroy; End; Modified: trunk/wxdevcpp/source/EditorOptfrm.dfm =================================================================== --- trunk/wxdevcpp/source/EditorOptfrm.dfm 2012-02-27 04:39:36 UTC (rev 1480) +++ trunk/wxdevcpp/source/EditorOptfrm.dfm 2012-03-19 03:02:47 UTC (rev 1481) @@ -4,8 +4,8 @@ HelpType = htKeyword BorderStyle = bsDialog Caption = 'Editor Options' - ClientHeight = 416 - ClientWidth = 429 + ClientHeight = 502 + ClientWidth = 441 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -21,15 +21,15 @@ OnKeyDown = FormKeyDown OnShow = FormShow DesignSize = ( - 429 - 416) + 441 + 502) PixelsPerInch = 96 TextHeight = 13 object PagesMain: TPageControl Left = 7 Top = 8 - Width = 415 - Height = 373 + Width = 427 + Height = 459 ActivePage = tabClassBrowsing Anchors = [akLeft, akTop, akRight, akBottom] TabIndex = 4 @@ -39,28 +39,28 @@ Caption = 'General' object grpMargin: TGroupBox Left = 248 - Top = 216 + Top = 312 Width = 155 Height = 84 Caption = 'Right Margin' TabOrder = 0 object lblMarginWidth: TLabel Left = 8 - Top = 35 + Top = 37 Width = 28 Height = 13 Caption = 'Width' end object lblMarginColor: TLabel Left = 83 - Top = 35 + Top = 37 Width = 24 Height = 13 Caption = 'Color' end object cpMarginColor: TColorPickerButton Left = 83 - Top = 50 + Top = 52 Width = 61 Height = 22 DefaultText = 'default' @@ -71,7 +71,7 @@ end object cbMarginVis: TCheckBox Left = 8 - Top = 16 + Top = 18 Width = 75 Height = 17 Caption = 'Visible' @@ -79,7 +79,7 @@ end object edMarginWidth: TSpinEdit Left = 8 - Top = 51 + Top = 53 Width = 60 Height = 22 MaxValue = 0 @@ -90,7 +90,7 @@ end object grpCaret: TGroupBox Left = 4 - Top = 216 + Top = 312 Width = 235 Height = 84 Caption = 'Caret' @@ -152,14 +152,14 @@ Left = 4 Top = 4 Width = 399 - Height = 210 + Height = 301 Caption = 'Editor Options' TabOrder = 2 object cpHighColor: TColorPickerButton - Left = 199 - Top = 185 - Width = 61 - Height = 22 + Left = 151 + Top = 264 + Width = 74 + Height = 29 DefaultText = 'default' PopupSpacing = 8 ShowSystemColors = False @@ -168,32 +168,32 @@ end object cbAppendNewline: TCheckBox Left = 8 - Top = 168 - Width = 380 + Top = 244 + Width = 193 Height = 17 Caption = 'Ensure that file ends with newline' TabOrder = 0 end object cbSpecialChars: TCheckBox Left = 8 - Top = 151 - Width = 190 + Top = 217 + Width = 170 Height = 17 Caption = 'Show Special Line Chars' TabOrder = 1 end object cbDropFiles: TCheckBox Left = 8 - Top = 134 - Width = 190 + Top = 191 + Width = 170 Height = 17 Caption = 'Insert Dropped Files' TabOrder = 2 end object cbGroupUndo: TCheckBox Left = 8 - Top = 117 - Width = 190 + Top = 165 + Width = 170 Height = 17 Hint = 'handle all changes of same type as single action' Caption = 'Group Undo' @@ -201,34 +201,34 @@ end object cbSmartUnIndent: TCheckBox Left = 8 - Top = 100 - Width = 190 - Height = 17 + Top = 140 + Width = 170 + Height = 15 Hint = 'cursor is moved to nonblank space of previous line ' Caption = 'Backspace Unindents' TabOrder = 4 end object cbTrailingBlanks: TCheckBox Left = 8 - Top = 83 - Width = 190 - Height = 17 + Top = 113 + Width = 170 + Height = 19 Hint = 'Blanks at end of lines will be saved with file' Caption = 'Keep Trailing Blanks' TabOrder = 5 end object cbTabtoSpaces: TCheckBox Left = 8 - Top = 49 - Width = 190 + Top = 63 + Width = 170 Height = 17 Caption = 'Use Tab Character' TabOrder = 6 end object cbSmartTabs: TCheckBox Left = 8 - Top = 66 - Width = 190 + Top = 89 + Width = 170 Height = 17 Hint = 'on tab cursor is moved to first nonblank space of preceeding lin' + @@ -238,8 +238,8 @@ end object cbInsertMode: TCheckBox Left = 8 - Top = 32 - Width = 190 + Top = 40 + Width = 170 Height = 17 Hint = 'editor is in insert mode on start' Caption = 'Insert Mode' @@ -248,87 +248,87 @@ object cbAutoIndent: TCheckBox Left = 8 Top = 16 - Width = 190 + Width = 170 Height = 17 Hint = 'caret will position to first non-whitespace of preceeding line' Caption = 'Auto Indent' TabOrder = 9 end object cbPastEOL: TCheckBox - Left = 199 - Top = 50 - Width = 190 + Left = 200 + Top = 63 + Width = 170 Height = 17 Hint = 'allows cursor position past end of line' Caption = 'Cursor Past EOL' TabOrder = 10 end object cbFindText: TCheckBox - Left = 199 - Top = 84 - Width = 190 - Height = 17 + Left = 200 + Top = 113 + Width = 170 + Height = 19 Hint = 'inserts text at cursor into text to find of search dialog' Caption = 'Find Text at Cursor' TabOrder = 11 end object cbHalfPage: TCheckBox - Left = 199 - Top = 117 - Width = 190 + Left = 200 + Top = 165 + Width = 170 Height = 17 Hint = 'page up/down will move text by half a page instead of full page' Caption = 'Half Page Scrolling' TabOrder = 12 end object cbScrollHint: TCheckBox - Left = 199 - Top = 134 - Width = 190 + Left = 200 + Top = 191 + Width = 170 Height = 17 Hint = 'shows current line when scrolling' Caption = 'Scroll Hint' TabOrder = 13 end object cbParserHints: TCheckBox - Left = 199 - Top = 151 - Width = 190 + Left = 200 + Top = 217 + Width = 170 Height = 17 Caption = 'Show editor hints' TabOrder = 14 end object cbSmartScroll: TCheckBox - Left = 199 - Top = 100 - Width = 190 - Height = 17 + Left = 200 + Top = 140 + Width = 170 + Height = 15 Hint = 'show scrollbars only when content is available' Caption = 'Scollbars on need' TabOrder = 15 end object cbDoubleLine: TCheckBox - Left = 199 - Top = 67 - Width = 190 + Left = 200 + Top = 89 + Width = 170 Height = 17 Hint = 'double clicking a line selects it' Caption = 'Double Click Line' TabOrder = 16 end object cbEHomeKey: TCheckBox - Left = 199 - Top = 17 - Width = 190 + Left = 200 + Top = 16 + Width = 170 Height = 17 Hint = 'enhances home key positioning, similar to visual studio' Caption = 'Enhanced home key' TabOrder = 17 end object cbPastEOF: TCheckBox - Left = 199 - Top = 33 - Width = 190 + Left = 200 + Top = 40 + Width = 170 Height = 17 Hint = 'allow cursor position past end of file' Caption = 'Cursor Past EOF' @@ -336,8 +336,8 @@ end object cbHighCurrLine: TCheckBox Left = 8 - Top = 185 - Width = 190 + Top = 276 + Width = 137 Height = 17 Caption = 'Highlight current line' TabOrder = 19 @@ -351,15 +351,15 @@ Left = 4 Top = 115 Width = 399 - Height = 180 + Height = 222 Caption = 'Gutter' TabOrder = 1 DesignSize = ( 399 - 180) + 222) object lblGutterFont: TLabel Left = 8 - Top = 86 + Top = 128 Width = 24 Height = 13 Anchors = [akLeft, akRight, akBottom] @@ -367,7 +367,7 @@ end object lblGutterWidth: TLabel Left = 321 - Top = 86 + Top = 128 Width = 28 Height = 13 Anchors = [akLeft, akRight, akBottom] @@ -376,23 +376,23 @@ end object lblGutterFontSize: TLabel Left = 200 - Top = 86 + Top = 128 Width = 23 Height = 13 Anchors = [akLeft, akRight, akBottom] Caption = 'Size:' end object cbLeadZero: TCheckBox - Left = 199 - Top = 48 + Left = 200 + Top = 72 Width = 190 Height = 15 Caption = 'Show Leading Zeros' TabOrder = 5 end object cbFirstZero: TCheckBox - Left = 199 - Top = 32 + Left = 200 + Top = 48 Width = 190 Height = 15 Caption = 'Start at Zero' @@ -400,7 +400,7 @@ end object cbLineNum: TCheckBox Left = 199 - Top = 16 + Top = 26 Width = 190 Height = 15 Caption = 'Show Line Numbers' @@ -409,7 +409,7 @@ end object cbGutterVis: TCheckBox Left = 8 - Top = 16 + Top = 26 Width = 190 Height = 15 Caption = 'Visible' @@ -417,7 +417,7 @@ end object cbGutterAuto: TCheckBox Left = 8 - Top = 32 + Top = 48 Width = 190 Height = 15 Caption = 'Auto Size' @@ -425,7 +425,7 @@ end object cbGutterFnt: TCheckBox Left = 8 - Top = 48 + Top = 72 Width = 190 Height = 15 Caption = 'Use Custom Font' @@ -434,7 +434,7 @@ end object pnlGutterPreview: TPanel Left = 12 - Top = 129 + Top = 171 Width = 374 Height = 40 Anchors = [akLeft, akRight, akBottom] @@ -450,29 +450,29 @@ end object cboGutterFont: TComboBox Left = 12 - Top = 102 + Top = 144 Width = 181 Height = 21 Anchors = [akLeft, akRight, akBottom] - ItemHeight = 13 + ItemHeight = 0 TabOrder = 6 OnChange = FontChange OnDblClick = cboDblClick end object cboGutterSize: TComboBox Left = 208 - Top = 102 + Top = 144 Width = 87 Height = 21 Anchors = [akLeft, akRight, akBottom] - ItemHeight = 13 + ItemHeight = 0 TabOrder = 7 OnChange = FontSizeChange OnDblClick = cboDblClick end object edGutterWidth: TSpinEdit Left = 328 - Top = 102 + Top = 144 Width = 57 Height = 22 Anchors = [akLeft, akRight, akBottom] @@ -484,7 +484,7 @@ end object cbGutterGradient: TCheckBox Left = 8 - Top = 64 + Top = 95 Width = 190 Height = 15 Caption = 'Draw with Gradient' @@ -527,7 +527,7 @@ Top = 32 Width = 180 Height = 21 - ItemHeight = 13 + ItemHeight = 0 TabOrder = 0 OnDblClick = cboDblClick OnSelect = FontChange @@ -537,7 +537,7 @@ Top = 32 Width = 80 Height = 21 - ItemHeight = 13 + ItemHeight = 0 TabOrder = 1 OnChange = FontSizeChange OnDblClick = cboDblClick @@ -644,7 +644,7 @@ Left = 4 Top = 195 Width = 399 - Height = 145 + Height = 198 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Font.Height = -13 @@ -810,7 +810,7 @@ Left = 5 Top = 5 Width = 396 - Height = 335 + Height = 388 ActivePage = tabCPInserts TabIndex = 0 TabOrder = 0 @@ -818,7 +818,7 @@ Caption = 'Inserts' DesignSize = ( 388 - 307) + 360) object lblCode: TLabel Left = 10 Top = 105 @@ -888,7 +888,7 @@ Left = 10 Top = 121 Width = 368 - Height = 175 + Height = 228 Anchors = [akLeft, akTop, akRight, akBottom] Ctl3D = True ParentCtl3D = False @@ -983,7 +983,7 @@ Left = 5 Top = 28 Width = 397 - Height = 310 + Height = 365 ActivePage = tabCBCompletion TabIndex = 1 TabOrder = 1 @@ -1108,6 +1108,14 @@ Height = 13 Caption = 'Files in cache:' end + object txtLoadingCache: TLabel + Left = 8 + Top = 320 + Width = 80 + Height = 13 + Caption = 'Loading cache...' + Visible = False + end object chkEnableCompletion: TCheckBox Left = 8 Top = 8 @@ -1129,7 +1137,7 @@ object lbCCC: TListBox Left = 8 Top = 120 - Width = 276 + Width = 369 Height = 155 ItemHeight = 13 ParentShowHint = False @@ -1138,9 +1146,9 @@ OnClick = actSelectFileClick end object pbCCCache: TProgressBar - Left = 292 - Top = 175 - Width = 89 + Left = 104 + Top = 318 + Width = 273 Height = 16 Min = 0 Max = 100 @@ -1148,17 +1156,17 @@ Visible = False end object btnCCCnew: TButton - Left = 292 - Top = 120 + Left = 12 + Top = 283 Width = 90 Height = 23 - Caption = 'Add' + Caption = 'Add Files' TabOrder = 4 OnClick = btnCCCnewClick end object btnCCCdelete: TButton Left = 292 - Top = 147 + Top = 283 Width = 90 Height = 23 Caption = 'Clear' @@ -1175,13 +1183,22 @@ TabOrder = 6 Value = 500 end + object btnAddNewFolder: TButton + Left = 156 + Top = 283 + Width = 90 + Height = 23 + Caption = 'Add Folder' + TabOrder = 7 + OnClick = btnAddNewFolderClick + end end end end end object btnOk: TBitBtn - Left = 166 - Top = 387 + Left = 178 + Top = 473 Width = 80 Height = 23 Anchors = [akRight, akBottom] @@ -1209,8 +1226,8 @@ NumGlyphs = 2 end object btnCancel: TBitBtn - Left = 251 - Top = 387 + Left = 263 + Top = 473 Width = 80 Height = 23 Anchors = [akRight, akBottom] @@ -1219,8 +1236,8 @@ Kind = bkCancel end object btnHelp: TBitBtn - Left = 346 - Top = 387 + Left = 358 + Top = 473 Width = 75 Height = 23 Anchors = [akRight, akBottom] @@ -1231,12 +1248,12 @@ object cpp: TSynCppSyn DefaultFilter = 'C++ Files (*.c,*.cpp,*.h,*.hpp)|*.c;*.cpp;*.h;*.hpp' Left = 7 - Top = 384 + Top = 432 end object CppTokenizer1: TCppTokenizer LogTokens = False Left = 35 - Top = 384 + Top = 432 end object CppParser1: TCppParser Enabled = True @@ -1248,7 +1265,7 @@ OnStartParsing = CppParser1StartParsing OnEndParsing = CppParser1EndParsing Left = 63 - Top = 384 + Top = 432 end object XPMenu: TXPMenu DimLevel = 30 @@ -1279,6 +1296,6 @@ XPControls = [xcMainMenu, xcPopupMenu, xcToolbar, xcControlbar, xcCombo, xcListBox, xcEdit, xcMaskEdit, xcMemo, xcRichEdit, xcMiscEdit, xcCheckBox, xcRadioButton, xcButton, xcBitBtn, xcSpeedButton, xcUpDown, xcPanel, xcTreeView, xcListView, xcProgressBar, xcHotKey] Active = False Left = 91 - Top = 384 + Top = 432 end end Modified: trunk/wxdevcpp/source/EditorOptfrm.pas =================================================================== --- trunk/wxdevcpp/source/EditorOptfrm.pas 2012-02-27 04:39:36 UTC (rev 1480) +++ trunk/wxdevcpp/source/EditorOptfrm.pas 2012-03-19 03:02:47 UTC (rev 1481) @@ -17,6 +17,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA } +{$WARN UNIT_PLATFORM OFF} + Unit EditorOptfrm; Interface @@ -24,9 +26,9 @@ Uses //dbugintf, EAB removed Gexperts debug stuff. {$IFDEF WIN32} - Windows, Messages, SysUtils, Variants, Graphics, Controls, Forms, + Windows, Messages, SysUtils, Variants, Graphics, Controls, Forms, Dialogs, ComCtrls, devTabs, StdCtrls, ExtCtrls, Spin, ColorPickerButton, - SynEdit, SynEditHighlighter, SynHighlighterCpp, CheckLst, SynMemo, + SynEdit, SynEditHighlighter, SynHighlighterCpp, CheckLst, SynMemo, FileCtrl, Buttons, ClassBrowser, CppParser, CppTokenizer, StrUtils, XPMenu, Classes; {$ENDIF} {$IFDEF LINUX} @@ -159,6 +161,8 @@ cbDefaultintoprj: TCheckBox; edCompletionDelay: TSpinEdit; cbGutterGradient: TCheckBox; + btnAddNewFolder: TButton; + txtLoadingCache: TLabel; Procedure FormCreate(Sender: TObject); Procedure FormShow(Sender: TObject); Procedure FormActivate(Sender: TObject); @@ -220,6 +224,7 @@ Line: Integer; Mark: TSynEditMark); Procedure cbHighCurrLineClick(Sender: TObject); Procedure seTabSizeChange(Sender: TObject); + procedure btnAddNewFolderClick(Sender: TObject); Private ffgColor: TColor; fbgColor: TColor; @@ -474,8 +479,8 @@ Begin If (lbCCC.ItemIndex >= 0) And - (lbCCC.ItemIndex < CppParser1.ScannedFiles.Count) then - lbCCC.Hint := CppParser1.ScannedFiles.Strings[lbCCC.ItemIndex]; + (lbCCC.ItemIndex < MainForm.CppParser1.ScannedFiles.Count) then + lbCCC.Hint := MainForm.CppParser1.ScannedFiles.Strings[lbCCC.ItemIndex]; End; @@ -802,6 +807,7 @@ chkCCCache.Enabled := chkEnableCompletion.Checked; lbCCC.Enabled := chkCCCache.Checked And chkEnableCompletion.Checked; btnCCCnew.Enabled := chkCCCache.Checked And chkEnableCompletion.Checked; + btnAddNewFolder.Enabled := chkCCCache.Checked And chkEnableCompletion.Checked; btnCCCdelete.Enabled := chkCCCache.Checked And chkEnableCompletion.Checked; // CLASS_BROWSING // @@ -1480,7 +1486,10 @@ Begin lvCodeIns.AlphaSort; For idx := 0 To dmMain.CodeInserts.Count - 1 Do + Begin Dispose(dmMain.CodeInserts.Items[idx]); + dmMain.CodeInserts.Delete(idx); + End; dmMain.CodeInserts.Clear; For idx := 0 To pred(lvCodeIns.Items.Count) Do Begin @@ -1726,12 +1735,13 @@ Procedure TEditorOptForm.btnCCCdeleteClick(Sender: TObject); Begin - If lbCCC.Items.Count = 0 Then - Exit; + // If lbCCC.Items.Count = 0 Then + // Exit; If MessageDlg('Are you sure you want to clear the cache?', mtConfirmation, [mbYes, mbNo], 0) = mrYes Then Begin DeleteFile(devDirs.Config + DEV_COMPLETION_CACHE); + CppParser1.Reset(False); // Reset parser and don't keep loaded FreeAndNil(CppParser1); CppParser1 := TCppParser.Create(Self); CppParser1.Tokenizer := CppTokenizer1; @@ -1740,6 +1750,7 @@ CppParser1.OnStartParsing := CppParser1StartParsing; CppParser1.OnEndParsing := CppParser1EndParsing; CppParser1.OnTotalProgress := CppParser1TotalProgress; + CppParser1.OnCacheProgress := NIL; lbCCC.Items.Clear; chkCCCache.Tag := 1; // mark modified End; @@ -1751,15 +1762,10 @@ Begin Screen.Cursor := crHourglass; - CppParser1.OnStartParsing := CppParser1StartParsing; - CppParser1.OnEndParsing := Nil; //We will call it ourselves - CppParser1.OnCacheProgress := CppParser1CacheProgress; - CppParser1.Load(devDirs.Config + DEV_COMPLETION_CACHE); - For I := 0 To CppParser1.CacheContents.Count - 1 Do - lbCCC.Items.Add(CompactFilename(CppParser1.CacheContents[I])); + For I := 0 To MainForm.CppParser1.CacheContents.Count - 1 Do + lbCCC.Items.Add(CompactFilename(MainForm.CppParser1.CacheContents[I])); - CppParser1EndParsing(Self); Screen.Cursor := crDefault; End; @@ -1767,6 +1773,7 @@ Begin lbCCC.Enabled := chkCCCache.Checked; btnCCCnew.Enabled := chkCCCache.Checked; + btnAddNewFolder.Enabled := chkCCCache.Checked; btnCCCdelete.Enabled := chkCCCache.Checked; End; @@ -1784,10 +1791,13 @@ Begin chkCCCache.Enabled := False; btnCCCnew.Enabled := False; + btnAddNewFolder.Enabled := False; btnCCCdelete.Enabled := False; btnOk.Enabled := False; btnCancel.Enabled := False; pbCCCache.Visible := True; + txtLoadingCache.Visible := True; + Application.ProcessMessages; End; Procedure TEditorOptForm.CppParser1EndParsing(Sender: TObject); @@ -1795,9 +1805,12 @@ chkCCCache.Enabled := True; btnCCCnew.Enabled := True; btnCCCdelete.Enabled := True; + btnAddNewFolder.Enabled := True; btnOk.Enabled := True; btnCancel.Enabled := True; pbCCCache.Visible := False; + txtLoadingCache.Visible := False; + Application.ProcessMessages; End; Procedure TEditorOptForm.CppParser1TotalProgress(Sender: TObject; @@ -1907,4 +1920,91 @@ End; +procedure TEditorOptForm.btnAddNewFolderClick(Sender: TObject); +Var + chosenDirectory : string; + filesSelected, FileList : TStringList; + I : Integer; + +begin + + if SelectDirectory('Select directory to add to cache', '', chosenDirectory) then //(SelectDirectory(chosenDirectory, [], 0)) then + begin + + Application.ProcessMessages; + Screen.Cursor := crHourglass; + + //Track the cache parse progress + HasProgressStarted := False; + CppParser1.OnStartParsing := CppParser1StartParsing; + CppParser1.OnEndParsing := CppParser1EndParsing; + CppParser1.OnTotalProgress := CppParser1TotalProgress; + + filesSelected := TStringList.Create; + filesSelected.Clear; + + FileList := TStringList.Create; + + // This is kludge to get all header files + FilesFromWildCard(chosenDirectory, '*.h', FileList, True, False, True); + For I := 0 To FileList.Count - 1 Do + filesSelected.Add(FileList[I]); + FileList.Clear; + FilesFromWildCard(chosenDirectory, '*.hpp', FileList, True, False, True); + For I := 0 To FileList.Count - 1 Do + filesSelected.Add(FileList[I]); + FileList.Clear; + FilesFromWildCard(chosenDirectory, '*.hh', FileList, True, False, True); + For I := 0 To FileList.Count - 1 Do + filesSelected.Add(FileList[I]); + FileList.Clear; + FilesFromWildCard(chosenDirectory, '*.rh', FileList, True, False, True); + For I := 0 To FileList.Count - 1 Do + filesSelected.Add(FileList[I]); + FileList.Clear; + FileList.Assign(filesSelected); + filesSelected.Clear; + // End kludge + + //Add the files to scan and then parse the list + For I := 0 To FileList.Count - 1 Do + Begin + // See if file is already in the cache + If (CppParser1.CacheContents.IndexOf(FileList[I]) = -1) Then + Begin + filesSelected.Add(FileList.Strings[I]); + CppParser1.AddFileToScan(FileList[I]); + End; + + End; + + FileList.Clear; + FileList.Free; + + CppParser1.ParseList; + + pbCCCache.Max := filesSelected.Count; + pbCCCache.StepBy(1); + + //Finally append the new items unto the listbox + For I := 0 To filesSelected.Count - 1 Do + Begin + lbCCC.Items.Add(CompactFilename(filesSelected[I])); + pbCCCache.StepIt; + End; + + filesSelected.Clear; + filesSelected.Free; + + pbCCCache.Position := pbCCCache.Max; + + CppParser1EndParsing(Self); + Screen.Cursor := crDefault; + + chkCCCache.Tag := 1; // mark modified + + end; + +end; + End. Modified: trunk/wxdevcpp/source/LangFrm.dfm =================================================================== --- trunk/wxdevcpp/source/LangFrm.dfm 2012-02-27 04:39:36 UTC (rev 1480) +++ trunk/wxdevcpp/source/LangFrm.dfm 2012-03-19 03:02:47 UTC (rev 1481) @@ -1,11 +1,11 @@ object LangForm: TLangForm - Left = 540 - Top = 292 + Left = 343 + Top = 142 BorderIcons = [] BorderStyle = bsDialog Caption = 'wxDev-C++ First-Run Configuration' - ClientHeight = 295 - ClientWidth = 416 + ClientHeight = 333 + ClientWidth = 454 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -21,16 +21,16 @@ object FinishPanel: TPanel Left = 144 Top = 8 - Width = 266 + Width = 305 Height = 249 BevelOuter = bvNone - TabOrder = 5 + TabOrder = 3 Visible = False object Label6: TLabel Left = 4 Top = 0 - Width = 255 - Height = 39 + Width = 285 + Height = 26 Caption = 'That'#39's all we need to set up wxDev-C++ for use; Click OK to exit' + ' this wizard and continue wxDev-C++'#39's start up.' @@ -39,7 +39,7 @@ object Label4: TLabel Left = 5 Top = 49 - Width = 253 + Width = 273 Height = 39 Caption = 'If you need help using wxDev-C++, please refer to the wxDev-C++ ' + @@ -50,8 +50,8 @@ object Label7: TLabel Left = 4 Top = 98 - Width = 250 - Height = 65 + Width = 282 + Height = 52 Caption = 'You can also download DevPaks (like libraries or tools) to use w' + 'ith wxDev-C++, as well as upgrade wxDev-C++ to the latest versio' + @@ -61,18 +61,18 @@ end end object CachePanel: TPanel - Left = 144 + Left = 152 Top = 8 - Width = 266 - Height = 249 + Width = 305 + Height = 281 BevelOuter = bvNone - TabOrder = 3 + TabOrder = 4 Visible = False object Label2: TLabel Left = 4 - Top = 0 - Width = 241 - Height = 65 + Top = 8 + Width = 284 + Height = 52 Caption = 'wxDev-C++ can create a cache containing the declarations found i' + 'n global include files. This will speed up project load times as' + @@ -82,9 +82,9 @@ end object Label3: TLabel Left = 4 - Top = 75 - Width = 246 - Height = 65 + Top = 83 + Width = 282 + Height = 52 Caption = 'Do you want to create the code completion cache now? This can ta' + 'ke several minutes, depending on the resources available on the ' + @@ -102,7 +102,7 @@ Visible = False object ParseLabel: TLabel Left = 16 - Top = 24 + Top = 20 Width = 65 Height = 13 Caption = 'Parsing files...' @@ -122,15 +122,16 @@ object BuildPanel: TPanel Left = 0 Top = 150 - Width = 265 - Height = 100 + Width = 305 + Height = 123 BevelOuter = bvNone TabOrder = 0 object LoadBtn: TSpeedButton - Left = 228 - Top = 67 - Width = 22 - Height = 22 + Left = 260 + Top = 87 + Width = 29 + Height = 30 + Enabled = False Glyph.Data = { 36030000424D3603000000000000360000002800000010000000100000000100 18000000000000030000120B0000120B00000000000000000000BFBFBFBFBFBF @@ -161,9 +162,9 @@ OnClick = LoadBtnClick end object YesCache: TRadioButton - Left = 8 - Top = 0 - Width = 235 + Left = 56 + Top = 10 + Width = 185 Height = 17 Caption = 'Yes, create the cache now' Checked = True @@ -171,29 +172,29 @@ TabStop = True end object NoCache: TRadioButton - Left = 8 - Top = 18 - Width = 235 + Left = 56 + Top = 33 + Width = 209 Height = 17 Caption = 'No, do not create the cache' TabOrder = 1 end object DirCheckBox: TCheckBox Left = 8 - Top = 48 - Width = 249 - Height = 17 + Top = 60 + Width = 273 + Height = 25 Caption = 'Parse this directory instead of the standard one:' TabOrder = 2 OnClick = DirCheckBoxClick end object DirEdit: TEdit - Left = 25 - Top = 68 - Width = 200 + Left = 8 + Top = 91 + Width = 241 Height = 21 - Color = clInactiveCaptionText Enabled = False + HideSelection = False TabOrder = 3 end end @@ -201,10 +202,10 @@ object SecondPanel: TPanel Left = 144 Top = 8 - Width = 266 - Height = 249 + Width = 305 + Height = 265 BevelOuter = bvNone - TabOrder = 4 + TabOrder = 5 Visible = False object SecondLabel: TLabel Left = 4 @@ -220,8 +221,8 @@ object Label5: TLabel Left = 4 Top = 62 - Width = 232 - Height = 65 + Width = 275 + Height = 52 Caption = 'Although this feature is useful, it requires more CPU power and ' + 'memory to function, and may not be suitable for all developers. ' + @@ -232,8 +233,8 @@ object Label8: TLabel Left = 7 Top = 137 - Width = 231 - Height = 65 + Width = 280 + Height = 52 Caption = 'Do note that the Class Browser is needed for the automatic gener' + 'ation of event handlers when designing wxWidgets Forms. Of cours' + @@ -242,9 +243,9 @@ WordWrap = True end object YesClassBrowser: TRadioButton - Left = 20 - Top = 210 - Width = 220 + Left = 36 + Top = 212 + Width = 250 Height = 17 Caption = 'Yes, I want to use this feature' Checked = True @@ -252,9 +253,9 @@ TabStop = True end object NoClassBrowser: TRadioButton - Left = 20 - Top = 228 - Width = 220 + Left = 36 + Top = 232 + Width = 250 Height = 17 Caption = 'No, I prefer to use wxDev-C++ without it' TabOrder = 1 @@ -263,14 +264,14 @@ object FirstPanel: TPanel Left = 144 Top = 8 - Width = 266 - Height = 249 + Width = 305 + Height = 281 BevelOuter = bvNone TabOrder = 2 object Label1: TLabel - Left = 0 - Top = 0 - Width = 247 + Left = 8 + Top = 8 + Width = 273 Height = 39 Caption = 'This is the first time you have launched wxDev-C++. Here are som' + @@ -279,23 +280,23 @@ end object GroupBox1: TGroupBox Left = 0 - Top = 48 - Width = 265 - Height = 121 + Top = 56 + Width = 297 + Height = 137 Caption = 'Select your language :' TabOrder = 1 end object ThemeGroupBox: TGroupBox Left = 0 - Top = 176 - Width = 265 + Top = 200 + Width = 297 Height = 73 Caption = 'Select your wxDev-C++ theme :' TabOrder = 2 object ThemeBox: TComboBox Left = 16 - Top = 24 - Width = 153 + Top = 22 + Width = 169 Height = 21 Style = csDropDownList ItemHeight = 13 @@ -303,10 +304,10 @@ OnChange = ThemeBoxChange end object PreviewBtn: TBitBtn - Left = 178 - Top = 24 + Left = 202 + Top = 22 Width = 75 - Height = 22 + Height = 35 Caption = '&Preview' TabOrder = 1 OnClick = PreviewBtnClick @@ -323,17 +324,17 @@ end object ListBox: TListBox Left = 8 - Top = 64 - Width = 249 - Height = 97 + Top = 72 + Width = 281 + Height = 113 ItemHeight = 13 TabOrder = 0 end end object OkBtn: TBitBtn - Left = 144 - Top = 264 - Width = 265 + Left = 152 + Top = 296 + Width = 281 Height = 25 Caption = '&Next' Default = True Modified: trunk/wxdevcpp/source/LangFrm.pas =================================================================== --- trunk/wxdevcpp/source/LangFrm.pas 2012-02-27 04:39:36 UTC (rev 1480) +++ trunk/wxdevcpp/source/LangFrm.pas 2012-03-19 03:02:47 UTC (rev 1481) @@ -24,7 +24,7 @@ Uses {$IFDEF WIN32} Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, - StdCtrls, Buttons, ExtCtrls, Menus, XPMenu, ComCtrls, + StdCtrls, Buttons, ExtCtrls, Menus, XPMenu, ComCtrls, CppParser, {$WARNINGS OFF} FileCtrl; {$WARNINGS ON} @@ -96,22 +96,28 @@ Implementation Uses - MultiLangSupport, datamod, DevThemes, devcfg, utils, main, version; + MultiLangSupport, datamod, DevThemes, devcfg, utils, main, version, + Splash; {$R *.dfm} Procedure TLangForm.UpdateList; Var idx: Integer; - sel: Integer; + sel, selEnglish: Integer; Begin ListBox.Clear; + selEnglish := 0; For idx := 0 To pred(List.Count) Do Begin sel := ListBox.Items.Add(List.Values[List.Names[idx]]); If Pos('english (original)', LowerCase(ListBox.Items[sel])) > 0 Then + begin + selEnglish := sel; ListBox.Selected[sel] := True; + end End; + ListBox.TopIndex := -1 + selEnglish; End; Function TLangForm.GetSelected: Integer; @@ -143,7 +149,9 @@ d: DWORD; sl: TStrings; Begin - DesktopFont := True; + // DesktopFont := True; + SplashForm.Hide; // Hide the splash form + HasProgressStarted := False; sl := devTheme.ThemeList; ThemeBox.Items.AddStrings(sl); @@ -185,14 +193,66 @@ ParseLabel.Caption := 'Parsing file: ' + FileName Else ParseLabel.Caption := 'Finalizing... Please wait'; - ParseLabel.Width := 236; + ParseLabel.Width := 250; Application.ProcessMessages; End; Procedure TLangForm.OkBtnClick(Sender: TObject); -Var s, f: TStringList; - i, j: Integer; +Var s: TStringList; + i: Integer; + +procedure CacheFilesFromWildcard(Directory, Mask: String; + Subdirs, ShowDirs, Multitasking: Boolean); +Var + SearchRec: TSearchRec; + Attr, Error: Integer; + fileName : string; Begin + Directory := IncludeTrailingPathDelimiter(Directory); + + { First, find the required file... } + Attr := faAnyFile; + If ShowDirs = False Then + Attr := Attr - faDirectory; + Error := FindFirst(Directory + Mask, Attr, SearchRec); + If (Error = 0) Then + Begin + While (Error = 0) Do + Begin + { Found one! } + fileName := Directory + SearchRec.Name; + If (MainForm.CppParser1.CacheContents.IndexOf(fileName) = -1) Then + MainForm.CppParser1.AddFileToScan(fileName); + + Error := FindNext(SearchRec); + If Multitasking Then + Application.ProcessMessages; + End; + FindClose(SearchRec); + End; + + { Then walk through all subdirectories. } + If Subdirs Then + Begin + Error := FindFirst(Directory + '*.*', faAnyFile, SearchRec); + If (Error = 0) Then + Begin + While (Error = 0) Do + Begin + { Found one! } + If (SearchRec.Name[1] <> '.') And (SearchRec.Attr And + faDirectory <> 0) Then + { We do this recursively! } + CacheFilesFromWildcard(Directory + SearchRec.Name, Mask, + Subdirs, ShowDirs, Multitasking); + Error := FindNext(SearchRec); + End; + FindClose(SearchRec); + End; + End; +End; + +Begin If OkBtn.Tag = 0 Then Begin OkBtn.Tag := 1; @@ -222,6 +282,7 @@ SecondPanel.Visible := False; devCodeCompletion.Enabled := False; devCodeCompletion.UseCacheFiles := False; + devClassBrowsing.Enabled := False; devClassBrowsing.ParseLocalHeaders := False; devClassBrowsing.ParseGlobalHeaders := False; SaveOptions; @@ -280,40 +341,36 @@ StrToList(devDirs.Cpp, s); End; - f := TStringList.Create; For i := 0 To s.Count - 1 Do Begin If DirectoryExists(s[i]) Then Begin - FilesFromWildcard(s[i], '*.*', f, False, False, False); + CacheFilesFromWildcard(s[i], '*.h', True, False, False); Screen.Cursor := crHourglass; Application.ProcessMessages; - For j := 0 To f.Count - 1 Do - If (MainForm.CppParser1.CacheContents.IndexOf(f[j]) = -1) Then - MainForm.CppParser1.AddFileToScan(f[j]); End Else MessageDlg('Directory "' + s[i] + '" does not exist.', mtWarning, [mbOK], 0); End; + Application.ProcessMessages; MainForm.CppParser1.ParseList; ParseLabel.Caption := 'Saving cache to disk...'; Application.ProcessMessages; MainForm.CppParser1.Save(devDirs.Config + DEV_COMPLETION_CACHE); - MainForm.CppParser1.OnStartParsing := MainForm.CppParser1StartParsing; - MainForm.CppParser1.OnEndParsing := MainForm.CppParser1EndParsing; - MainForm.CppParser1.OnTotalProgress := MainForm.CppParser1TotalProgress; - MainForm.ClassBrowser1.SetUpdateOn; Application.ProcessMessages; + Screen.Cursor := crDefault; + + s.Clear; s.Free; - f.Free; + End Else Begin - devClassBrowsing.ParseLocalHeaders := True; + devClassBrowsing.ParseLocalHeaders := False; devClassBrowsing.ParseGlobalHeaders := False; End; OkBtn.Tag := 3; @@ -322,6 +379,7 @@ OkBtn.Enabled := True; FinishPanel.Visible := True; CachePanel.Visible := False; + End; End; @@ -335,11 +393,10 @@ Procedure TLangForm.DirCheckBoxClick(Sender: TObject); Begin + DirEdit.Enabled := DirCheckBox.Checked; - If DirEdit.Enabled Then - DirEdit.Color := clCaptionText - Else - DirEdit.Color := clInactiveCaptionText; + LoadBtn.Enabled := DirCheckBox.Checked; + End; Procedure TLangForm.LoadBtnClick(Sender: TObject); Modified: trunk/wxdevcpp/source/Splash.pas =================================================================== --- trunk/wxdevcpp/source/Splash.pas 2012-02-27 04:39:36 UTC (rev 1480) +++ trunk/wxdevcpp/source/Splash.pas 2012-03-19 03:02:47 UTC (rev 1481) @@ -83,10 +83,13 @@ Procedure TSplashForm.OnCacheProgress(Sender: TObject; FileName: String; Total, Current: Integer); Begin - ProgressBar.Visible := True; - ProgressBar.Max := Total; - ProgressBar.Position := Current; - Application.ProcessMessages; + if Assigned(ProgressBar) then + begin + ProgressBar.Visible := True; + ProgressBar.Max := Total; + ProgressBar.Position := Current; + Application.ProcessMessages; + end; End; End. Modified: trunk/wxdevcpp/source/devcfg.pas =================================================================== --- trunk/wxdevcpp/source/devcfg.pas 2012-02-27 04:39:36 UTC (rev 1480) +++ trunk/wxdevcpp/source/devcfg.pas 2012-03-19 03:02:47 UTC (rev 1481) @@ -742,7 +742,7 @@ Property HiliteActiveTab: Boolean Read fHiliteActiveTab Write fHiliteActiveTab; Property AutoCompile: Integer Read fAutoCompile Write fAutoCompile; - Property NoToolTip: Boolean Read fNoToolTip Write fNoToolTip Default False; + Property NoToolTip: Boolean Read fNoToolTip Write fNoToolTip Default True; Property AutoAddDebugFlag: Integer Read fAutoAddDebugFlag Write fAutoAddDebugFlag; Property DebugCommand: String Read fDebugCommand Write fDebugCommand; @@ -1777,7 +1777,7 @@ fPrintLineNumbersMargins := False; fWatchHint := True; fWatchError := True; - fNoToolTip := False; + fNoToolTip := True; fDebugCommand := '-exec-finish'; @@ -2657,8 +2657,11 @@ For i := 0 To fOptions.Count - 1 Do Begin If Assigned(PCompilerOption(fOptions.Items[i]).optChoices) Then + Begin PCompilerOption(fOptions.Items[i]).optChoices.Free; - Dispose(fOptions.Items[i]); + End; + Dispose(fOptions.Items[i]); + End; fOptions.Clear; End; @@ -2676,8 +2679,10 @@ If Assigned(PCompilerOption(fOptions[Index]).optChoices) Then PCompilerOption(fOptions[Index]).optChoices.Free; If Assigned(fOptions[Index]) Then + Begin Dispose(fOptions[Index]); - fOptions.Delete(Index); + fOptions.Delete(Index); + End; End; Destructor TdevCompiler.Destroy; Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-02-27 04:39:36 UTC (rev 1480) +++ trunk/wxdevcpp/source/devcpp.dof 2012-03-19 03:02:47 UTC (rev 1481) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=198 +Build=466 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.198 +FileVersion=7.4.2.466 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/main.dfm =================================================================== --- trunk/wxdevcpp/source/main.dfm 2012-02-27 04:39:36 UTC (rev 1480) +++ trunk/wxdevcpp/source/main.dfm 2012-03-19 03:02:47 UTC (rev 1481) @@ -1,6 +1,6 @@ object MainForm: TMainForm - Left = 105 - Top = 139 + Left = 271 + Top = 73 Width = 667 Height = 501 Anchors = [akLeft, akTop, akBottom] Modified: trunk/wxdevcpp/source/main.pas =================================================================== --- trunk/wxdevcpp/source/main.pas 2012-02-27 04:39:36 UTC (rev 1480) +++ trunk/wxdevcpp/source/main.pas 2012-03-19 03:02:47 UTC (rev 1481) @@ -77,11 +77,11 @@ } {$WARN SYMBOL_PLATFORM OFF} -Unit main; +unit main; -Interface +interface -Uses +uses {$IFDEF WIN32} Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, Menus, StdCtrls, ComCtrls, ToolWin, ExtCtrls, Buttons, utils, @@ -108,11 +108,11 @@ ; {$ENDIF} -Type +type PTList = ^Tlist; -Type - TMainForm = Class(TForm{$IFDEF PLUGIN_BUILD}, iplug{$ENDIF}) +type + TMainForm = class(TForm{$IFDEF PLUGIN_BUILD}, iplug{$ENDIF}) MainMenu: TMainMenu; FileMenu: TMenuItem; NewprojectItem: TMenuItem; @@ -693,316 +693,316 @@ actVerboseDebugOutput: TAction; actViewDebugMemory: TAction; - Procedure FormShow(Sender: TObject); - Procedure FormClose(Sender: TObject; Var Action: TCloseAction); - Procedure FormDestroy(Sender: TObject); - Procedure ToggleBookmarkClick(Sender: TObject); - Procedure GotoBookmarkClick(Sender: TObject); - Procedure ToggleBtnClick(Sender: TObject); - Procedure GotoBtnClick(Sender: TObject); - Procedure NewAllBtnClick(Sender: TObject); - Procedure HelpBtnClick(Sender: TObject); - Procedure ProjectViewContextPopup(Sender: TObject; MousePos: TPoint; - Var Handled: Boolean); - Procedure ProjectViewDblClick(Sender: TObject); - Procedure InsertBtnClick(Sender: TObject); - Procedure Customize1Click(Sender: TObject); - Procedure ToolbarClick(Sender: TObject); - Procedure ControlBar1ContextPopup(Sender: TObject; MousePos: TPoint; - Var Handled: Boolean); - Procedure ApplicationEvents1Idle(Sender: TObject; Var Done: Boolean); + procedure FormShow(Sender: TObject); + procedure FormClose(Sender: TObject; var Action: TCloseAction); + procedure FormDestroy(Sender: TObject); + procedure ToggleBookmarkClick(Sender: TObject); + procedure GotoBookmarkClick(Sender: TObject); + procedure ToggleBtnClick(Sender: TObject); + procedure GotoBtnClick(Sender: TObject); + procedure NewAllBtnClick(Sender: TObject); + procedure HelpBtnClick(Sender: TObject); + procedure ProjectViewContextPopup(Sender: TObject; MousePos: TPoint; + var Handled: boolean); + procedure ProjectViewDblClick(Sender: TObject); + procedure InsertBtnClick(Sender: TObject); + procedure Customize1Click(Sender: TObject); + procedure ToolbarClick(Sender: TObject); + procedure ControlBar1ContextPopup(Sender: TObject; MousePos: TPoint; + var Handled: boolean); + procedure ApplicationEvents1Idle(Sender: TObject; var Done: boolean); // action executes - Procedure actNewSourceExecute(Sender: TObject); - Procedure actNewProjectExecute(Sender: TObject); - Procedure actNewResExecute(Sender: TObject); - Procedure actNewTemplateExecute(Sender: TObject); - Procedure actOpenExecute(Sender: TObject); - Procedure actHistoryClearExecute(Sender: TObject); - Procedure actSaveExecute(Sender: TObject); - Procedure actSaveAsExecute(Sender: TObject); - Procedure actSaveAllExecute(Sender: TObject); - Procedure actCloseExecute(Sender: TObject); - Procedure actCloseAllExecute(Sender: TObject); - Procedure actCloseProjectExecute(Sender: TObject); - Procedure actXHTMLExecute(Sender: TObject); - Procedure actXRTFExecute(Sender: TObject); - Procedure actXProjectExecute(Sender: TObject); - Procedure actPrintExecute(Sender: TObject); - Procedure actPrintSUExecute(Sender: TObject); - Procedure actExitExecute(Sender: TObject); - Procedure actUndoExecute(Sender: TObject); - Procedure actDeleteLineExecute(Sender: TObject); - Procedure actRedoExecute(Sender: TObject); - Procedure actCutExecute(Sender: TObject); - Procedure actCopyExecute(Sender: TObject); - Procedure actPasteExecute(Sender: TObject); - Procedure actSelectAllExecute(Sender: TObject); - Procedure actStatusbarExecute(Sender: TObject); - Procedure actFullScreenExecute(Sender: TObject); - Procedure actNextExecute(Sender: TObject); - Procedure actPrevExecute(Sender: TObject); - Procedure actCompOptionsExecute(Sender: TObject); - Procedure actEditorOptionsExecute(Sender: TObject); - Procedure actConfigToolsExecute(Sender: TObject); - Procedure actUnitRemoveExecute(Sender: TObject); - Procedure actUnitRenameExecute(Sender: TObject); - Procedure actUnitOpenExecute(Sender: TObject); - Procedure actUnitCloseExecute(Sender: TObject); - Procedure actUpdateCheckExecute(Sender: TObject); - Procedure actAboutExecute(Sender: TObject); - Procedure actHelpCustomizeExecute(Sender: TObject); - Procedure actProjectNewExecute(Sender: TObject); - Procedure actProjectAddExecute(Sender: TObject); - Procedure actProjectRemoveExecute(Sender: TObject); - Procedure actProjectOptionsExecute(Sender: TObject); - Procedure actProjectSourceExecute(Sender: TObject); - Procedure actFindExecute(Sender: TObject); - Procedure actFindAllExecute(Sender: TObject); - Procedure actReplaceExecute(Sender: TObject); - Procedure actFindNextExecute(Sender: TObject); - Procedure actGotoExecute(Sender: TObject); - Procedure actCompileExecute(Sender: TObject); - Procedure actRunExecute(Sender: TObject); - Procedure actCompRunExecute(Sender: TObject); - Procedure actRebuildExecute(Sender: TObject); - Procedure actCleanExecute(Sender: TObject); - Procedure actDebugExecute(Sender: TObject); - Procedure actEnviroOptionsExecute(Sender: TObject); - Procedure actProjectMakeFileExecute(Sender: TObject); - Procedure actMsgCopyExecute(Sender: TObject); - Procedure actMsgClearExecute(Sender: TObject); + procedure actNewSourceExecute(Sender: TObject); + procedure actNewProjectExecute(Sender: TObject); + procedure actNewResExecute(Sender: TObject); + procedure actNewTemplateExecute(Sender: TObject); + procedure actOpenExecute(Sender: TObject); + procedure actHistoryClearExecute(Sender: TObject); + procedure actSaveExecute(Sender: TObject); + procedure actSaveAsExecute(Sender: TObject); + procedure actSaveAllExecute(Sender: TObject); + procedure actCloseExecute(Sender: TObject); + procedure actCloseAllExecute(Sender: TObject); + procedure actCloseProjectExecute(Sender: TObject); + procedure actXHTMLExecute(Sender: TObject); + procedure actXRTFExecute(Sender: TObject); + procedure actXProjectExecute(Sender: TObject); + procedure actPrintExecute(Sender: TObject); + procedure actPrintSUExecute(Sender: TObject); + procedure actExitExecute(Sender: TObject); + procedure actUndoExecute(Sender: TObject); + procedure actDeleteLineExecute(Sender: TObject); + procedure actRedoExecute(Sender: TObject); + procedure actCutExecute(Sender: TObject); + procedure actCopyExecute(Sender: TObject); + procedure actPasteExecute(Sender: TObject); + procedure actSelectAllExecute(Sender: TObject); + procedure actStatusbarExecute(Sender: TObject); + procedure actFullScreenExecute(Sender: TObject); + procedure actNextExecute(Sender: TObject); + procedure actPrevExecute(Sender: TObject); + procedure actCompOptionsExecute(Sender: TObject); + procedure actEditorOptionsExecute(Sender: TObject); + procedure actConfigToolsExecute(Sender: TObject); + procedure actUnitRemoveExecute(Sender: TObject); + procedure actUnitRenameExecute(Sender: TObject); + procedure actUnitOpenExecute(Sender: TObject); + procedure actUnitCloseExecute(Sender: TObject); + procedure actUpdateCheckExecute(Sender: TObject); + procedure actAboutExecute(Sender: TObject); + procedure actHelpCustomizeExecute(Sender: TObject); + procedure actProjectNewExecute(Sender: TObject); + procedure actProjectAddExecute(Sender: TObject); + procedure actProjectRemoveExecute(Sender: TObject); + procedure actProjectOptionsExecute(Sender: TObject); + procedure actProjectSourceExecute(Sender: TObject); + procedure actFindExecute(Sender: TObject); + procedure actFindAllExecute(Sender: TObject); + procedure actReplaceExecute(Sender: TObject); + procedure actFindNextExecute(Sender: TObject); + procedure actGotoExecute(Sender: TObject); + procedure actCompileExecute(Sender: TObject); + procedure actRunExecute(Sender: TObject); + procedure actCompRunExecute(Sender: TObject); + procedure actRebuildExecute(Sender: TObject); + procedure actCleanExecute(Sender: TObject); + procedure actDebugExecute(Sender: TObject); + procedure actEnviroOptionsExecute(Sender: TObject); + procedure actProjectMakeFileExecute(Sender: TObject); + procedure actMsgCopyExecute(Sender: TObject); + procedure actMsgClearExecute(Sender: TObject); // action updates (need to make more specific) - Procedure actUpdatePageCount(Sender: TObject); + procedure actUpdatePageCount(Sender: TObject); // enable on pagecount> 0 - Procedure actUpdateProject(Sender: TObject); + procedure actUpdateProject(Sender: TObject); // enable on fproject assigned - Procedure actUpdatePageProject(Sender: TObject); + procedure actUpdatePageProject(Sender: TObject); // enable on both above - Procedure actUpdatePageorProject(Sender: TObject); + procedure actUpdatePageorProject(Sender: TObject); // enable on either of above - Procedure actUpdateEmptyEditor(Sender: TObject); + procedure actUpdateEmptyEditor(Sender: TObject); // enable on unempty editor - Procedure actUpdateDebuggerRunning(Sender: TObject); + procedure actUpdateDebuggerRunning(Sender: TObject); // enable when debugger running - Procedure actBreakPointExecute(Sender: TObject); - Procedure actIncrementalExecute(Sender: TObject); - Procedure CompilerOutputDblClick(Sender: TObject); - Procedure FindOutputDblClick(Sender: TObject); - Procedure actShowBarsExecute(Sender: TObject); - Procedure btnFullScrRevertClick(Sender: TObject); - Procedure FormContextPopup(Sender: TObject; MousePos: TPoint; - Var Handled: Boolean); - Procedure FormKeyDown(Sender: TObject; Var Key: Word; + procedure actBreakPointExecute(Sender: TObject); + procedure actIncrementalExecute(Sender: TObject); + procedure CompilerOutputDblClick(Sender: TObject); + procedure FindOutputDblClick(Sender: TObject); + procedure actShowBarsExecute(Sender: TObject); + procedure btnFullScrRevertClick(Sender: TObject); + procedure FormContextPopup(Sender: TObject; MousePos: TPoint; + var Handled: boolean); + procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState); - Procedure actAddWatchExecute(Sender: TObject); - Procedure ProjectViewClick(Sender: TObject); - Procedure actNextStepExecute(Sender: TObject); - Procedure actWatchItemExecute(Sender: TObject); - Procedure actRemoveWatchExecute(Sender: TObject); - Procedure actStepOverExecute(Sender: TObject); - Procedure actStopExecuteExecute(Sender: TObject); - Procedure actUndoUpdate(Sender: TObject); - Procedure actRedoUpdate(Sender: TObject); - Procedure actCutUpdate(Sender: TObject); - Procedure actCopyUpdate(Sender: TObject); - Procedure actPasteUpdate(Sender: TObject); - Procedure actSaveUpdate(Sender: TObject); - Procedure actSaveAsUpdate(Sender: TObject); - Procedure actFindNextUpdate(Sender: TObject); - Procedure actFileMenuExecute(Sender: TObject); - Procedure actToolsMenuExecute(Sender: TObject); - Procedure actDeleteExecute(Sender: TObject); - Procedure FormResize(Sender: TObject); - Procedure ClassBrowser1Select(Sender: TObject; Filename: TFileName; - Line: Integer); - Procedure CppParser1TotalProgress(Sender: TObject; FileName: String; - Total, Current: Integer); - Procedure CodeCompletion1Resize(Sender: TObject); - Procedure actSwapHeaderSourceUpdate(Sender: TObject); - Procedure actSwapHeaderSourceExecute(Sender: TObject); - Procedure actSyntaxCheckExecute(Sender: TObject); - Procedure actUpdateExecute(Sender: TObject); - Procedure PageControlChange(Sender: TObject); - Procedure actConfigShortcutsExecute(Sender: TObject); - Procedure DateTimeMenuItemClick(Sender: TObject); - Procedure actProgramResetExecute(Sender: TObject); - Procedure actProgramResetUpdate(Sender: TObject); - Procedure CommentheaderMenuItemClick(Sender: TObject); - Procedure PageControlMouseDown(Sender: TObject; Button: TMouseButton; - Shift: TShiftState; X, Y: Integer); - Procedure actNewTemplateUpdate(Sender: TObject); - Procedure actCommentExecute(Sender: TObject); - Procedure actUncommentExecute(Sender: TObject); - Procedure actIndentExecute(Sender: TObject); - Procedure actUnindentExecute(Sender: TObject); - Procedure PageControlDragOver(Sender, Source: TObject; X, Y: Integer; - State: TDragState; Var Accept: Boolean); - Procedure PageControlDragDrop(Sender, Source: TObject; X, Y: Integer); - Procedure actGotoFunctionExecute(Sender: TObject); - Procedure actBrowserGotoDeclUpdate(Sender: TObject); - Procedure actBrowserGotoImplUpdate(Sender: TObject); - Procedure actBrowserNewClassUpdate(Sender: TObject); - Procedure actBrowserN... [truncated message content] |
From: <tb...@us...> - 2012-02-27 04:39:43
|
Revision: 1480 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1480&view=rev Author: tbreina Date: 2012-02-27 04:39:36 +0000 (Mon, 27 Feb 2012) Log Message: ----------- Code completion cache window now fills again with the cached filenames. Clicking on filename in cache listbox will show hint with full pathname of file. Modified Paths: -------------- trunk/wxdevcpp/source/EditorOptfrm.dfm trunk/wxdevcpp/source/EditorOptfrm.pas trunk/wxdevcpp/source/LangFrm.pas trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/main.pas trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas Modified: trunk/wxdevcpp/source/EditorOptfrm.dfm =================================================================== --- trunk/wxdevcpp/source/EditorOptfrm.dfm 2012-02-27 00:10:31 UTC (rev 1479) +++ trunk/wxdevcpp/source/EditorOptfrm.dfm 2012-02-27 04:39:36 UTC (rev 1480) @@ -34,6 +34,7 @@ Anchors = [akLeft, akTop, akRight, akBottom] TabIndex = 4 TabOrder = 0 + OnChange = PagesMainChange object tabGeneral: TTabSheet Caption = 'General' object grpMargin: TGroupBox @@ -453,7 +454,7 @@ Width = 181 Height = 21 Anchors = [akLeft, akRight, akBottom] - ItemHeight = 0 + ItemHeight = 13 TabOrder = 6 OnChange = FontChange OnDblClick = cboDblClick @@ -464,7 +465,7 @@ Width = 87 Height = 21 Anchors = [akLeft, akRight, akBottom] - ItemHeight = 0 + ItemHeight = 13 TabOrder = 7 OnChange = FontSizeChange OnDblClick = cboDblClick @@ -526,7 +527,7 @@ Top = 32 Width = 180 Height = 21 - ItemHeight = 0 + ItemHeight = 13 TabOrder = 0 OnDblClick = cboDblClick OnSelect = FontChange @@ -536,7 +537,7 @@ Top = 32 Width = 80 Height = 21 - ItemHeight = 0 + ItemHeight = 13 TabOrder = 1 OnChange = FontSizeChange OnDblClick = cboDblClick @@ -986,7 +987,6 @@ ActivePage = tabCBCompletion TabIndex = 1 TabOrder = 1 - OnChange = devPages1Change object tabCBBrowser: TTabSheet Caption = 'Class browsing' object lblClassBrowserSample: TLabel @@ -1127,14 +1127,15 @@ OnClick = chkCCCacheClick end object lbCCC: TListBox - Left = 24 + Left = 8 Top = 120 - Width = 260 + Width = 276 Height = 155 ItemHeight = 13 - Sorted = True + ParentShowHint = False + ShowHint = True TabOrder = 2 - OnClick = FontChange + OnClick = actSelectFileClick end object pbCCCache: TProgressBar Left = 292 Modified: trunk/wxdevcpp/source/EditorOptfrm.pas =================================================================== --- trunk/wxdevcpp/source/EditorOptfrm.pas 2012-02-27 00:10:31 UTC (rev 1479) +++ trunk/wxdevcpp/source/EditorOptfrm.pas 2012-02-27 04:39:36 UTC (rev 1480) @@ -163,6 +163,7 @@ Procedure FormShow(Sender: TObject); Procedure FormActivate(Sender: TObject); Procedure ElementListClick(Sender: TObject); + Procedure actSelectFileClick(Sender: TObject); Procedure FontChange(Sender: TObject); Procedure FontSizeChange(Sender: TObject); Procedure cpMarginColorHint(Sender: TObject; Cell: Integer; @@ -213,7 +214,7 @@ Total, Current: Integer); Procedure CppParser1SaveProgress(Sender: TObject; FileName: String; Total, Current: Integer); - Procedure devPages1Change(Sender: TObject); + Procedure PagesMainChange(Sender: TObject); Procedure chkCBShowInheritedClick(Sender: TObject); Procedure OnGutterClick(Sender: TObject; Button: TMouseButton; X, Y, Line: Integer; Mark: TSynEditMark); @@ -469,35 +470,13 @@ End; End; -Procedure TEditorOptForm.FontChange(Sender: TObject); -Var - Size: String; +Procedure TEditorOptForm.actSelectFileClick(Sender: TObject); Begin - fGutter := Sender = cboGutterFont; - If fGutter Then - Begin - pnlGutterPreview.Font.Name := cboGutterFont.Text; - CppEdit.Gutter.Font.Name := cboGutterFont.Text; - Size := cboGutterSize.Text; - LoadFontSize; - cboGutterSize.Text := Size; - CppEdit.Gutter.Font.Name := cboGutterFont.Text; - CppEdit.Gutter.Font.Size := strtointdef(cboGutterSize.Text, 12); - CppEdit.Gutter.Width := strtointdef(edGutterWidth.Text, 12); - CppEdit.Refresh; - End - Else - Begin - pnlEditorPreview.Font.Name := cboEditorFont.Text; - Size := cboEditorSize.Text; - LoadFontSize; - cboEditorSize.Text := Size; + If (lbCCC.ItemIndex >= 0) And + (lbCCC.ItemIndex < CppParser1.ScannedFiles.Count) then + lbCCC.Hint := CppParser1.ScannedFiles.Strings[lbCCC.ItemIndex]; - CppEdit.Font.Name := cboEditorFont.Text; - CppEdit.Font.Size := strtointdef(cboEditorSize.Text, 12); - CppEdit.Refresh; - End; End; Procedure TEditorOptForm.cbGutterFntClick(Sender: TObject); @@ -1656,11 +1635,12 @@ Hits: Integer; MaxHits, MaxIndex: Integer; sl: TStrings; + filesSelected : TStringList; flt: String; Begin // the following piece of code is a quick'n'dirty way to find the base // compiler's include dir (if we 're lucky). - // we search through devDirs.C and try to locate the base dir that is + // we search through devDirs.Cpp and try to locate the base dir that is // most common between the others(!). // if no most-common dir is found, we select the first in list. // for a default installation, it should work. @@ -1672,7 +1652,7 @@ sl := TStringList.Create; Try sl.Delimiter := ';'; - sl.DelimitedText := devDirs.C; + sl.DelimitedText := devDirs.Cpp; If sl.Count > 1 Then Begin MaxHits := 0; @@ -1692,7 +1672,7 @@ CppParser1.ProjectDir := IncludeTrailingPathDelimiter(sl[MaxIndex]); End Else - CppParser1.ProjectDir := IncludeTrailingPathDelimiter(devDirs.C); + CppParser1.ProjectDir := IncludeTrailingPathDelimiter(devDirs.Cpp); Finally sl.Free; End; @@ -1701,6 +1681,7 @@ Begin BuildFilter(flt, [FLT_HEADS]); OpenDialog.Filter := flt; + If OpenDialog.Execute Then Begin Application.ProcessMessages; @@ -1712,16 +1693,33 @@ CppParser1.OnEndParsing := CppParser1EndParsing; CppParser1.OnTotalProgress := CppParser1TotalProgress; + filesSelected := TStringList.Create; + filesSelected.Clear; + //Add the files to scan and then parse the list For I := 0 To OpenDialog.Files.Count - 1 Do - CppParser1.AddFileToScan(OpenDialog.Files[I]); + Begin + // See if file is already in the cache + If (CppParser1.CacheContents.IndexOf(OpenDialog.Files[I]) = -1) Then + Begin + filesSelected.Add(OpenDialog.Files.Strings[I]); + CppParser1.AddFileToScan(OpenDialog.Files[I]); + End; + + End; + CppParser1.ParseList; Screen.Cursor := crDefault; + + //Finally append the new items unto the listbox + For I := 0 To filesSelected.Count - 1 Do + lbCCC.Items.Add(CompactFilename(filesSelected[I])); + + filesSelected.Clear; + filesSelected.Free; + chkCCCache.Tag := 1; // mark modified - //Finally append the new items unto the listbox - For I := 0 To OpenDialog.Files.Count - 1 Do - lbCCC.Items.Add(CompactFilename(OpenDialog.Files[I])); End; End; End; @@ -1751,7 +1749,7 @@ Var I: Integer; Begin - + Screen.Cursor := crHourglass; CppParser1.OnStartParsing := CppParser1StartParsing; CppParser1.OnEndParsing := Nil; //We will call it ourselves @@ -1759,7 +1757,7 @@ CppParser1.Load(devDirs.Config + DEV_COMPLETION_CACHE); For I := 0 To CppParser1.CacheContents.Count - 1 Do - lbCCC.Items.Add(CompactFilename(CppParser1.CacheContents[I])); + lbCCC.Items.Add(CompactFilename(CppParser1.CacheContents[I])); CppParser1EndParsing(Self); Screen.Cursor := crDefault; @@ -1840,9 +1838,9 @@ pbCCCache.Update; End; -Procedure TEditorOptForm.devPages1Change(Sender: TObject); +Procedure TEditorOptForm.PagesMainChange(Sender: TObject); Begin - If (devPages1.ActivePage = tabCBCompletion) And + If (PagesMain.ActivePage = tabClassBrowsing) And (CppParser1.Statements.Count = 0) Then FillCCC; End; @@ -1876,4 +1874,37 @@ CppEdit.TabWidth := seTabSize.Value; End; +Procedure TEditorOptForm.FontChange(Sender: TObject); +Var + Size: String; +Begin + + fGutter := Sender = cboGutterFont; + If fGutter Then + Begin + pnlGutterPreview.Font.Name := cboGutterFont.Text; + CppEdit.Gutter.Font.Name := cboGutterFont.Text; + Size := cboGutterSize.Text; + LoadFontSize; + cboGutterSize.Text := Size; + + CppEdit.Gutter.Font.Name := cboGutterFont.Text; + CppEdit.Gutter.Font.Size := strtointdef(cboGutterSize.Text, 12); + CppEdit.Gutter.Width := strtointdef(edGutterWidth.Text, 12); + CppEdit.Refresh; + End + Else + Begin + pnlEditorPreview.Font.Name := cboEditorFont.Text; + Size := cboEditorSize.Text; + LoadFontSize; + cboEditorSize.Text := Size; + + CppEdit.Font.Name := cboEditorFont.Text; + CppEdit.Font.Size := strtointdef(cboEditorSize.Text, 12); + CppEdit.Refresh; + End; + +End; + End. Modified: trunk/wxdevcpp/source/LangFrm.pas =================================================================== --- trunk/wxdevcpp/source/LangFrm.pas 2012-02-27 00:10:31 UTC (rev 1479) +++ trunk/wxdevcpp/source/LangFrm.pas 2012-02-27 04:39:36 UTC (rev 1480) @@ -109,7 +109,7 @@ For idx := 0 To pred(List.Count) Do Begin sel := ListBox.Items.Add(List.Values[List.Names[idx]]); - If Pos('english', LowerCase(ListBox.Items[sel])) > 0 Then + If Pos('english (original)', LowerCase(ListBox.Items[sel])) > 0 Then ListBox.Selected[sel] := True; End; End; @@ -289,6 +289,7 @@ Screen.Cursor := crHourglass; Application.ProcessMessages; For j := 0 To f.Count - 1 Do + If (MainForm.CppParser1.CacheContents.IndexOf(f[j]) = -1) Then MainForm.CppParser1.AddFileToScan(f[j]); End Else Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-02-27 00:10:31 UTC (rev 1479) +++ trunk/wxdevcpp/source/devcpp.dof 2012-02-27 04:39:36 UTC (rev 1480) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=158 +Build=198 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.158 +FileVersion=7.4.2.198 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/main.pas =================================================================== --- trunk/wxdevcpp/source/main.pas 2012-02-27 00:10:31 UTC (rev 1479) +++ trunk/wxdevcpp/source/main.pas 2012-02-27 04:39:36 UTC (rev 1480) @@ -2965,7 +2965,8 @@ Begin CppParser1.GetSourcePair(ExtractFileName(e.FileName), ccFile, hfile); - CppParser1.AddFileToScan(e.FileName); //new cc + If (CppParser1.CacheContents.IndexOf(e.FileName) = -1) Then + CppParser1.AddFileToScan(e.FileName); //new cc CppParser1.ParseList; ClassBrowser1.CurrentFile := e.FileName; CppParser1.ReParseFile(e.FileName, True); //new cc @@ -4834,7 +4835,8 @@ Begin fProject.AddUnit(Files[idx], FolderNode, False); // add under folder - CppParser1.AddFileToScan(Files[idx]); + If (CppParser1.CacheContents.IndexOf(Files[idx]) = -1) Then + CppParser1.AddFileToScan(Files[idx]); End; fProject.RebuildNodes; CppParser1.ParseList; @@ -10424,7 +10426,8 @@ fProject.AddUnit(currFile, fProject.Node, False); // add under folder If ClassBrowser1.Enabled Then Begin - CppParser1.AddFileToScan(currFile, True); + If (CppParser1.CacheContents.IndexOf(currFile) = -1) Then + CppParser1.AddFileToScan(currFile, True); CppParser1.ReParseFile(currFile, True, True); // EAB: Check this out *** End; Modified: trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas =================================================================== --- trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas 2012-02-27 00:10:31 UTC (rev 1479) +++ trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas 2012-02-27 04:39:36 UTC (rev 1480) @@ -155,10 +155,12 @@ Destructor TCodeCompletion.Destroy; Begin If Assigned(CodeComplForm) Then - begin - CodeComplForm.Close; - CodeComplForm.Free; - end + Begin + If CodeComplForm.HasParent Then + CodeComplForm.Close + Else + FreeAndNil(CodeComplForm); + End Else CodeComplForm := Nil; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-02-27 00:10:38
|
Revision: 1479 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1479&view=rev Author: tbreina Date: 2012-02-27 00:10:31 +0000 (Mon, 27 Feb 2012) Log Message: ----------- Fix for compiler progress form progress bar. New RmExe for makfile was confusing things. Added 'del /Q' to if-then Fix for wxdsgn bpl compatibility. Modified Paths: -------------- trunk/wxdevcpp/source/compiler.pas trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/plugins/wxdsgn/Designerfrm.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAnimationCtrl.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiBar.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiNoteBookPage.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiNotebook.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxColourPickerCtrl.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxDirPickerCtrl.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxFilePickerCtrl.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxFontPickerCtrl.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxRichTextStyleComboCtrl.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxRichTextStyleListBox.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxStdDialogButtonSizer.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxUtils.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxboxsizer.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxflexgridsizer.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxgridsizer.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxmemo.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxpanel.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxstaticboxsizer.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxtoolbar.pas trunk/wxdevcpp/source/plugins/wxdsgn/components/wxtreectrl.pas trunk/wxdevcpp/source/plugins/wxdsgn/wxdesigner.pas trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res Modified: trunk/wxdevcpp/source/compiler.pas =================================================================== --- trunk/wxdevcpp/source/compiler.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/compiler.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -2579,6 +2579,7 @@ Begin srch := ' ' + GenMakePath(ExtractRelativePath(fProject.FileName, fProject.Units[I].FileName), False, True) + ' '; + If Pos(srch, Line) > 0 Then Begin fil := ExtractFilename(fProject.Units[I].FileName); @@ -2610,7 +2611,8 @@ End; srch := ExtractFileName(fProject.Executable); - If (Pos(srch, Line) > 0) And (Pos(RmExe, Line) > 0) Then + If (Pos(srch, Line) > 0) And + ((Pos(RmExe, Line) > 0) Or (Pos('del /Q', Line) > 0)) Then Begin fil := srch; prog := 1; @@ -2659,6 +2661,7 @@ lblFile.Caption := fil; If (fil <> '') And (pb.Position < pb.Max) Then pb.Position := prog; + End; Application.ProcessMessages; Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/devcpp.dof 2012-02-27 00:10:31 UTC (rev 1479) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=142 +Build=158 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.142 +FileVersion=7.4.2.158 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/plugins/wxdsgn/Designerfrm.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/Designerfrm.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/Designerfrm.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -272,6 +272,8 @@ strTemp: String; Begin + hasImage := false; + If GetBlockStartAndEndPos(synEdit, strClassName, btClassNameGUIItemsCreation, intBlockStart, intBlockEnd) Then Begin //Clear Declaration and Creation Field @@ -747,7 +749,7 @@ Procedure GenerateXPM(frmNewForm: TfrmNewForm; strFileName: String; onlyForForm: Boolean); Var I: Integer; - xpmFileDir, xpmNewFileDir: String; + xpmFileDir: String; fileStrlst: TStringList; strXPMContent, frmName: String; @@ -1527,7 +1529,7 @@ strLst: TStringList; isSizerAvailable: Boolean; // isAuimanagerAvailable: boolean; - WinRect: TRect; + //WinRect: TRect; wxtoolbarintf: IWxToolBarInterface; strTemp: String; sizerParentName: String; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAnimationCtrl.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAnimationCtrl.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAnimationCtrl.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -328,7 +328,7 @@ Function TwxAnimationCtrl.GenerateXRCControlCreation(IndentString: String): TStringList; Var - tempstring: TStringList; + // tempstring: TStringList; stylstr: String; Begin Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiBar.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiBar.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiBar.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -254,12 +254,12 @@ End; Function TWxAuiBar.GenerateGUIControlCreation: String; -Var - strColorStr: String; - strStyle, parentName, strAlignment: String; - xrctlpanel, kill: Boolean; //is this panel a child of another panel - i: Integer; - wxcompInterface: IWxComponentInterface; +//Var + // strColorStr: String; + //strStyle, parentName, strAlignment: String; + // xrctlpanel, kill: Boolean; //is this panel a child of another panel + // i: Integer; + // wxcompInterface: IWxComponentInterface; Begin Result := ''; GetAuiDockDirection(Self.Wx_Aui_Dock_Direction); Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiNoteBookPage.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiNoteBookPage.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiNoteBookPage.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -260,10 +260,10 @@ End; Function TWxAuiNoteBookPage.GenerateGUIControlCreation: String; -Var - strColorStr: String; - strStyle: String; - parentName, strAlignment: String; +//Var + // strColorStr: String; + // strStyle: String; + // parentName, strAlignment: String; Begin { Result := ''; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiNotebook.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiNotebook.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxAuiNotebook.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -549,7 +549,7 @@ Var strColorStr: String; strStyle, parentName, strAlignment, strAlign: String; - strParentLabel: String; + // strParentLabel: String; Begin Result := ''; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxColourPickerCtrl.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxColourPickerCtrl.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxColourPickerCtrl.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -333,11 +333,11 @@ End; Function TWxColourPickerCtrl.GenerateXRCControlCreation(IndentString: String): TStringList; -Var - i: Integer; - wxcompInterface: IWxComponentInterface; - tempstring: TStringList; - stylstr: String; +//Var + //i: Integer; + // wxcompInterface: IWxComponentInterface; + // tempstring: TStringList; + // stylstr: String; Begin Result := TStringList.Create; @@ -369,8 +369,8 @@ Function TWxColourPickerCtrl.GenerateGUIControlCreation: String; Var - strChoice, strColorStr: String; - strStyle, parentName, strAlignment, strAlign: String; + strColorStr: String; + strStyle, parentName, strAlignment: String; Begin Result := ''; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxDirPickerCtrl.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxDirPickerCtrl.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxDirPickerCtrl.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -330,11 +330,11 @@ End; Function TWxDirPickerCtrl.GenerateXRCControlCreation(IndentString: String): TStringList; -Var - i: Integer; - wxcompInterface: IWxComponentInterface; - tempstring: TStringList; - stylstr: String; +//Var + //i: Integer; + //wxcompInterface: IWxComponentInterface; + // tempstring: TStringList; + // stylstr: String; Begin Result := TStringList.Create; @@ -367,7 +367,7 @@ Function TWxDirPickerCtrl.GenerateGUIControlCreation: String; Var strColorStr: String; - strStyle, parentName, strAlignment, strAlign: String; + strStyle, parentName, strAlignment: String; Begin Result := ''; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxFilePickerCtrl.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxFilePickerCtrl.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxFilePickerCtrl.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -352,11 +352,11 @@ End; Function TWxFilePickerCtrl.GenerateXRCControlCreation(IndentString: String): TStringList; -Var - i: Integer; - wxcompInterface: IWxComponentInterface; - tempstring: TStringList; - stylstr: String; +//Var + // i: Integer; + // wxcompInterface: IWxComponentInterface; + // tempstring: TStringList; + // stylstr: String; Begin Result := TStringList.Create; @@ -389,7 +389,7 @@ Function TWxFilePickerCtrl.GenerateGUIControlCreation: String; Var strColorStr: String; - strStyle, parentName, strAlignment, strAlign: String; + strStyle, parentName, strAlignment: String; Begin Result := ''; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxFontPickerCtrl.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxFontPickerCtrl.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxFontPickerCtrl.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -324,11 +324,11 @@ End; Function TWxFontPickerCtrl.GenerateXRCControlCreation(IndentString: String): TStringList; -Var - i: Integer; - wxcompInterface: IWxComponentInterface; - tempstring: TStringList; - stylstr: String; +//Var + // i: Integer; + // wxcompInterface: IWxComponentInterface; + // tempstring: TStringList; + // stylstr: String; Begin Result := TStringList.Create; @@ -361,7 +361,7 @@ Function TWxFontPickerCtrl.GenerateGUIControlCreation: String; Var strColorStr: String; - strStyle, parentName, strAlignment, strAlign: String; + strStyle, parentName, strAlignment: String; Begin Result := ''; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxRichTextStyleComboCtrl.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxRichTextStyleComboCtrl.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxRichTextStyleComboCtrl.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -533,7 +533,7 @@ Function TwxRichTextStyleComboCtrl.GenerateGUIControlCreation: String; Var strColorStr: String; - i: Integer; + // i: Integer; strStyle, parentName, strAlignment: String; Begin Result := ''; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxRichTextStyleListBox.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxRichTextStyleListBox.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxRichTextStyleListBox.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -427,7 +427,7 @@ Function TwxRichTextStyleListBox.GenerateXRCControlCreation(IndentString: String): TStringList; Var stylestring: String; - i: Integer; + // i: Integer; Begin Result := TStringList.Create; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxStdDialogButtonSizer.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxStdDialogButtonSizer.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxStdDialogButtonSizer.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -230,9 +230,9 @@ Function TWxStdDialogButtonSizer.GenerateXRCControlCreation(IndentString: String): TStringList; Var - i: Integer; + // i: Integer; wxcompInterface: IWxComponentInterface; - tempstring: TStringList; + // tempstring: TStringList; Begin Result := TStringList.Create; //NUKLEAR ZELPH no creation without sizer parent, check unneded Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxUtils.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxUtils.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxUtils.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -4609,7 +4609,7 @@ List: TList; NotebookPage: TTabSheet; Notebook: TPageControl; - ToolbarParent: TToolBar; + // ToolbarParent: TToolBar; Begin If Sender Is TControl Then @@ -5130,7 +5130,7 @@ Function GenerateXPMDirectly(bmp: TBitmap; strCompName: String; strParentName: String; strFileName: String): Boolean; Var - xpmFileDir, xpmNewFileDir: String; + xpmFileDir: String; fileStrlst: TStringList; strXPMContent: String; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxboxsizer.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxboxsizer.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxboxsizer.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -390,7 +390,7 @@ Var I: Integer; isAuimanagerAvailable: Boolean; - wxAuimanagerInterface: IWxAuiManagerInterface; + // wxAuimanagerInterface: IWxAuiManagerInterface; Begin isAuimanagerAvailable := False; If self.Parent.Parent Is TForm Then Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxflexgridsizer.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxflexgridsizer.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxflexgridsizer.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -350,7 +350,7 @@ Var I: Integer; isAuimanagerAvailable: Boolean; - wxAuimanagerInterface: IWxAuiManagerInterface; + // wxAuimanagerInterface: IWxAuiManagerInterface; Begin isAuimanagerAvailable := False; If self.Parent.Parent Is TForm Then Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxgridsizer.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxgridsizer.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxgridsizer.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -356,7 +356,7 @@ Var I: Integer; isAuimanagerAvailable: Boolean; - wxAuimanagerInterface: IWxAuiManagerInterface; + // wxAuimanagerInterface: IWxAuiManagerInterface; Begin isAuimanagerAvailable := False; If self.Parent.Parent Is TForm Then Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxmemo.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxmemo.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxmemo.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -523,7 +523,7 @@ strColorStr: String; strStyle, parentName, strAlignment: String; i: Integer; - strParentLabel: String; + // strParentLabel: String; Begin Result := ''; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxpanel.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxpanel.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxpanel.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -370,10 +370,10 @@ Var strColorStr: String; strStyle, parentName, strAlignment: String; - xrctlpanel, kill: Boolean; //is this panel a child of another panel - i: Integer; - wxcompInterface: IWxComponentInterface; - strParentLabel: String; + xrctlpanel: Boolean; //is this panel a child of another panel + // i: Integer; + // wxcompInterface: IWxComponentInterface; + // strParentLabel: String; Begin Result := ''; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxstaticboxsizer.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxstaticboxsizer.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxstaticboxsizer.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -436,7 +436,7 @@ Var I: Integer; isAuimanagerAvailable: Boolean; - wxAuimanagerInterface: IWxAuiManagerInterface; + // wxAuimanagerInterface: IWxAuiManagerInterface; Begin isAuimanagerAvailable := False; If self.Parent.Parent Is TForm Then Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxtoolbar.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxtoolbar.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxtoolbar.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -470,7 +470,7 @@ Var strColorStr: String; strStyle, parentName, strAlignment: String; - strParentLabel: String; + // strParentLabel: String; Begin Result := ''; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/components/wxtreectrl.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/components/wxtreectrl.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/components/wxtreectrl.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -649,6 +649,7 @@ index, indexLevel, lastLevel: Integer; Begin Result := ''; + index := 0; lastLevel := 0; If FWx_PaneCaption = '' Then FWx_PaneCaption := Self.Name; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdesigner.pas =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/wxdesigner.pas 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/wxdesigner.pas 2012-02-27 00:10:31 UTC (rev 1479) @@ -273,7 +273,7 @@ Function ReloadForm(FileName: String): Boolean; Procedure ReloadFromFile(FileName: String; fileToReloadFrom: String); Procedure TerminateEditor(FileName: String); - Procedure Destroy; + Procedure DestroyDLL; Procedure OnDockableFormClosed(Sender: TObject; Var Action: TCloseAction); Function IsSource(FileName: String): Boolean; Function GetDefaultText(FileName: String): String; @@ -822,7 +822,7 @@ ELDesigner1.SnapToGrid := ini.ReadBool('wxWidgets', 'cbSnapToGrid', ELDesigner1.SnapToGrid); ELDesigner1.GenerateXRC := ini.ReadBool('wxWidgets', 'cbGenerateXRC', ELDesigner1.GenerateXRC); ELDesigner1.Floating := ini.ReadBool('wxWidgets', 'cbFloating', ELDesigner1.Floating); - XRCGEN := ELDesigner1.GenerateXRC; //Nuklear Zelph + XRCGEN := ELDesigner1.GenerateXRC; //Nuklear Zelph // String format tells us what function to wrap strings with in the generated C++ code // Possible values are wxT(), _T(), and _() StringFormat := ini.ReadString('wxWidgets', 'cbStringFormat', StringFormat); @@ -2695,7 +2695,7 @@ dlgInterface: IWxDialogNonInsertableInterface; tlbrInterface: IWxToolBarInsertableInterface; nontlbrInterface: IWxToolBarNonInsertableInterface; - compObj: TComponent; + //compObj: TComponent; I: Integer; Function GetNonAllowAbleControlCountForFrame(winCtrl: TWinControl): Integer; @@ -4672,7 +4672,7 @@ End; End; -Procedure TWXDsgn.Destroy; +Procedure TWXDsgn.DestroyDLL; Begin editors.Free; ComponentPalette.Free; Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-02-26 22:27:53 UTC (rev 1478) +++ trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-02-27 00:10:31 UTC (rev 1479) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=31 +Build=33 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName= FileDescription=wxDev-C++ RAD add-on -FileVersion=7.4.2.31 +FileVersion=7.4.2.33 InternalName= LegalCopyright= LegalTrademarks= Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-02-26 22:28:00
|
Revision: 1478 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1478&view=rev Author: tbreina Date: 2012-02-26 22:27:53 +0000 (Sun, 26 Feb 2012) Log Message: ----------- Fixed delete current profile. Now it correctly reverts to profile 0 after deletion. Fixed all of the compiler warnings and hints about unused variables. Should compile cleanly now. Modified Paths: -------------- trunk/wxdevcpp/source/CompOptionsFrm.pas trunk/wxdevcpp/source/NewTemplateFm.pas trunk/wxdevcpp/source/ProjectOptionsFrm.pas trunk/wxdevcpp/source/Search_Center.pas trunk/wxdevcpp/source/datamod.pas trunk/wxdevcpp/source/debugger.pas trunk/wxdevcpp/source/devcfg.pas trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/editor.pas trunk/wxdevcpp/source/main.dfm trunk/wxdevcpp/source/main.pas trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas trunk/wxdevcpp/source/packages/VistaAltFixUnit.pas trunk/wxdevcpp/source/plugins/interfaces/iplugin.pas trunk/wxdevcpp/source/plugins/interfaces/iplugin_dll.pas trunk/wxdevcpp/source/project.pas trunk/wxdevcpp/source/utils.pas Modified: trunk/wxdevcpp/source/CompOptionsFrm.pas =================================================================== --- trunk/wxdevcpp/source/CompOptionsFrm.pas 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/CompOptionsFrm.pas 2012-02-26 22:27:53 UTC (rev 1478) @@ -534,6 +534,9 @@ tempName: String; {$ENDIF} Begin + + pluginSettings := nil; + //SaveSettings; EAB devCompilerSet.LoadSet(cmbCompilerSetComp.ItemIndex); @@ -575,6 +578,9 @@ tempName: String; {$ENDIF PLUGIN_BUILD} Begin + + pluginSettings := nil; + With devCompilerSet Do Begin fBins := BinDir; Modified: trunk/wxdevcpp/source/NewTemplateFm.pas =================================================================== --- trunk/wxdevcpp/source/NewTemplateFm.pas 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/NewTemplateFm.pas 2012-02-26 22:27:53 UTC (rev 1478) @@ -337,6 +337,8 @@ End; tmpIni := TIniFile.Create(filename); + C := 0; + With tmpIni Do Try WriteInteger('Template', 'ver', 3); @@ -411,7 +413,7 @@ TempProject.Profiles[i].ResourceIncludes.DelimitedText); End; - C := 0; + // C := 0; For I := 0 To lstFiles.Items.Count - 1 Do If lstFiles.Checked[I] Then Begin Modified: trunk/wxdevcpp/source/ProjectOptionsFrm.pas =================================================================== --- trunk/wxdevcpp/source/ProjectOptionsFrm.pas 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/ProjectOptionsFrm.pas 2012-02-26 22:27:53 UTC (rev 1478) @@ -494,6 +494,9 @@ tempName: String; {$ENDIF PLUGIN_BUILD} Begin + + pluginSettings := nil; + If CurrentProfile = Nil Then exit; With CurrentProfile Do @@ -1653,11 +1656,15 @@ [mbYes, mbNo], 0) = mrNo Then Exit; + // Remove the current profile fProfiles.Remove(cmbProfileSetComp.ItemIndex); + + // Change profile to first one cmbProfileSetComp.ItemIndex := 0; CurrentProfileIndex := 0; UpdateProfileList(0); - cmbProfileSetCompChange(cmbProfileSetComp); + + cmbProfileSetCompChange(nil); End; Procedure TfrmProjectOptions.btnRenameProfileSetClick(Sender: TObject); Modified: trunk/wxdevcpp/source/Search_Center.pas =================================================================== --- trunk/wxdevcpp/source/Search_Center.pas 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/Search_Center.pas 2012-02-26 22:27:53 UTC (rev 1478) @@ -166,6 +166,8 @@ End Else Begin + startTmp := 0; endTmp := 0; + If (ssoReplaceAll In fOptions) And Not UseSelection Then Begin startTmp := fEditor.Text.SelStart; @@ -181,7 +183,7 @@ If (ssoReplaceAll In fOptions) And Not UseSelection Then Begin fEditor.Text.SelStart := startTmp; - fEditor.Text.SelEnd := startTmp; + fEditor.Text.SelEnd := endTmp; End; End; Result := True; Modified: trunk/wxdevcpp/source/datamod.pas =================================================================== --- trunk/wxdevcpp/source/datamod.pas 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/datamod.pas 2012-02-26 22:27:53 UTC (rev 1478) @@ -279,6 +279,11 @@ resultAssigned: Boolean; {$ENDIF} Begin + + {$IFDEF PLUGIN_BUILD} + ResultAssigned := False; + {$ENDIF} + UpdateHighlighter; result := Nil; If devEditor.UseSyntax Then Modified: trunk/wxdevcpp/source/debugger.pas =================================================================== --- trunk/wxdevcpp/source/debugger.pas 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/debugger.pas 2012-02-26 22:27:53 UTC (rev 1478) @@ -442,7 +442,7 @@ Procedure RemoveBreakpoint(breakpoint: TBreakpoint); Virtual; Abstract; Procedure RemoveAllBreakpoints; Procedure RefreshBreakpoints; - Procedure RefreshWatches; Virtual; Abstract; + //Procedure RefreshWatches; Virtual; Abstract; Procedure RefreshBreakpoint(Var breakpoint: TBreakpoint); Virtual; Abstract; Function BreakpointExists(filename: String; line: Integer): Boolean; @@ -569,7 +569,7 @@ Procedure AddBreakpoint(breakpoint: TBreakpoint); Override; Procedure RemoveBreakpoint(breakpoint: TBreakpoint); Override; Procedure RefreshBreakpoint(Var breakpoint: TBreakpoint); Override; -// procedure RefreshWatches; override; + //procedure RefreshWatches; override; //Variable watches Procedure RefreshContext(refresh: ContextDataSet = @@ -684,7 +684,7 @@ Procedure AddBreakpoint(breakpoint: TBreakpoint); Override; Procedure RemoveBreakpoint(breakpoint: TBreakpoint); Override; Procedure RefreshBreakpoint(Var breakpoint: TBreakpoint); Override; - Procedure RefreshWatches; Override; + //Procedure RefreshWatches; Override; //Variable watches Procedure RefreshContext(refresh: ContextDataSet = @@ -727,10 +727,15 @@ Var BufMem: Pchar; // The originally allocated memory (pointer 'buf' gets moved!) BytesAvailable: DWORD; + + {$ifdef DISPLAYOUTPUT} PipeBufSize: DWORD; + BufType: DWORD; + {$ENDIF} + BytesToRead: DWORD; LastRead: DWORD; - BufType: DWORD; + TotalBytesRead: DWORD; ReadSuccess: Boolean; @@ -743,7 +748,10 @@ BytesAvailable := 0; BytesToRead := 0; LastRead := 0; + + {$ifdef DISPLAYOUTPUT} TotalBytesRead := 0; + {$ENDIF} While (Not Terminated) Do Begin @@ -1644,7 +1652,7 @@ Value: String; ValStrings: TStringList; start: Integer; - Buffer, Output: String; + Output: String; Begin start := 0; @@ -2458,7 +2466,7 @@ Initial parse of Disassembly display. } Var - line: String; + // line: String; List: String; CurrentFuncName: String; next: Integer; @@ -3036,7 +3044,7 @@ Var Output: String; Vari: String; // This is called Var in the GDB spec ! - start: Integer; + // start: Integer; Val: String; Local: PWatchVar; @@ -3044,7 +3052,7 @@ Val := SplitResult(Str, @Vari); Output := Vari; Output := Output + ' = '; - start := Pos(wxStringBase, Val); + // start := Pos(wxStringBase, Val); If (Vari = GDBname) Then // a name of a Tuple Begin New(Local); @@ -3100,9 +3108,6 @@ List.Add(Local); Output := Output + Val; - - - End; End @@ -4138,8 +4143,8 @@ Procedure TGDBDebugger.RefreshContext(refresh: ContextDataSet); Var - I: Integer; - Node: TListItem; + // I: Integer; + // Node: TListItem; Command: TCommand; Begin If Not Executing Then @@ -5006,7 +5011,7 @@ Function TGDBDebugger.GetToken(buf: Pchar; bsize: PLongInt; Token: PInteger): Pchar; Var - OutputBuffer: String; + // OutputBuffer: String; c, s: Pchar; sToken: String; @@ -5583,10 +5588,10 @@ Procedure TCDBDebugger.RefreshContext(refresh: ContextDataSet); Var - I: Integer; - Node: TTreeNode; + // I: Integer; + // Node: TTreeNode; Command: TCommand; - MemberName: String; + // MemberName: String; Begin If Not Executing Then Exit; @@ -5627,17 +5632,12 @@ End; Procedure TCDBDebugger.AddWatch(varname: String; when: TWatchBreakOn); -Var - Command: TCommand; - bpType: String; - Watch: PWatch; Begin - End; -Procedure TCDBDebugger.RefreshWatches; -Begin -End; +//Procedure TCDBDebugger.RefreshWatches; +//Begin +//End; Procedure TCDBDebugger.OnCallStack(Output: TStringList); Var Modified: trunk/wxdevcpp/source/devcfg.pas =================================================================== --- trunk/wxdevcpp/source/devcfg.pas 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/devcfg.pas 2012-02-26 22:27:53 UTC (rev 1478) @@ -1154,6 +1154,8 @@ {$ENDIF PLUGIN_BUILD} Begin + pluginSettings := nil; + devCompilerSet.WriteSets; // ID_COMPILER_MINGW = 0; @@ -3423,8 +3425,8 @@ goodRCDir{$ENDIF}: String; msg: String; tempStr: String; - maindir: String; - makeSig, mingwmakeSig: String; + // maindir: String; + //makeSig, mingwmakeSig: String; defaultDataForPlugins: Boolean; dummy: String; i: Integer; @@ -3651,8 +3653,14 @@ pluginSettings: TSettings; {$ENDIF PLUGIN_BUILD} Begin + +{$IFDEF PLUGIN_BUILD} + pluginSettings := nil; +{$ENDIF PLUGIN_BUILD} + If Index < 0 Then Exit; + With devData Do Begin key := OPT_COMPILERSETS + '_' + IntToStr(Index); Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/devcpp.dof 2012-02-26 22:27:53 UTC (rev 1478) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=93 +Build=142 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.93 +FileVersion=7.4.2.142 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/editor.pas =================================================================== --- trunk/wxdevcpp/source/editor.pas 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/editor.pas 2012-02-26 22:27:53 UTC (rev 1478) @@ -514,7 +514,7 @@ Allow: Boolean; {$IFDEF PLUGIN_BUILD} // i: Integer; - pluginCatched: Boolean; + //pluginCatched: Boolean; {$ENDIF} Begin If assigned(fTabSheet) Then Modified: trunk/wxdevcpp/source/main.dfm =================================================================== --- trunk/wxdevcpp/source/main.dfm 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/main.dfm 2012-02-26 22:27:53 UTC (rev 1478) @@ -1372,7 +1372,7 @@ object CompilerOutput: TListView Left = 0 Top = 0 - Width = 632 + Width = 647 Height = 98 Align = alClient BevelOuter = bvRaised @@ -1411,7 +1411,7 @@ object ResourceOutput: TListBox Left = 0 Top = 0 - Width = 632 + Width = 647 Height = 98 Align = alClient BevelKind = bkSoft @@ -1431,7 +1431,7 @@ Left = 0 Top = 0 Width = 225 - Height = 97 + Height = 98 Align = alLeft Caption = 'Information :' TabOrder = 0 @@ -1486,13 +1486,13 @@ Left = 225 Top = 0 Width = 422 - Height = 97 + Height = 98 Align = alClient Caption = 'Compile log :' TabOrder = 1 DesignSize = ( 422 - 97) + 98) object LogOutput: TMemo Left = 7 Top = 16 @@ -1514,7 +1514,7 @@ Left = 0 Top = 0 Width = 647 - Height = 97 + Height = 98 ActivePage = tabDebugOutput Align = alClient TabIndex = 4 @@ -1525,7 +1525,7 @@ object lvBacktrace: TListView Left = 0 Top = 0 - Width = 624 + Width = 639 Height = 70 Align = alClient Columns = < @@ -1560,7 +1560,7 @@ object lvLocals: TListView Left = 0 Top = 0 - Width = 624 + Width = 639 Height = 70 Align = alClient Columns = < @@ -1588,7 +1588,7 @@ object lvThreads: TListView Left = 0 Top = 0 - Width = 624 + Width = 639 Height = 70 Align = alClient Columns = < @@ -1616,7 +1616,7 @@ Left = 0 Top = 0 Width = 639 - Height = 69 + Height = 70 Align = alClient Indent = 19 PopupMenu = DebugVarsPopup @@ -1689,7 +1689,7 @@ object FindOutput: TListView Left = 0 Top = 0 - Width = 632 + Width = 647 Height = 98 Align = alClient BevelOuter = bvRaised @@ -1734,7 +1734,7 @@ Left = 0 Top = 0 Width = 651 - Height = 60 + Height = 61 Align = alClient Checkboxes = True Columns = < @@ -1769,7 +1769,7 @@ end object TodoSettings: TPanel Left = 0 - Top = 60 + Top = 61 Width = 651 Height = 41 Align = alBottom @@ -2340,7 +2340,7 @@ Left = 0 Top = 0 Width = 184 - Height = 167 + Height = 168 Align = alClient ChangeDelay = 1 DragMode = dmAutomatic @@ -2372,7 +2372,7 @@ Left = 0 Top = 0 Width = 184 - Height = 167 + Height = 168 Align = alClient Images = dmMain.ClassImages ReadOnly = True @@ -4565,7 +4565,6 @@ end object ClearallWatchPop: TMenuItem Caption = '&Clear all' - OnClick = ClearallWatchPopClick end end object DevCppDDEServer: TDdeServerConv Modified: trunk/wxdevcpp/source/main.pas =================================================================== --- trunk/wxdevcpp/source/main.pas 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/main.pas 2012-02-26 22:27:53 UTC (rev 1478) @@ -942,7 +942,6 @@ Procedure actAttachProcessUpdate(Sender: TObject); Procedure actAttachProcessExecute(Sender: TObject); Procedure actModifyWatchExecute(Sender: TObject); - Procedure ClearallWatchPopClick(Sender: TObject); Procedure PageControlChanging(Sender: TObject; Var AllowChange: Boolean); Procedure mnuCVSClick(Sender: TObject); @@ -1990,7 +1989,6 @@ toolbar: TToolBar; i, j: Integer; panel1: TForm; - panel2: TForm; {$ENDIF PLUGIN_BUILD} Begin If IsWindow(HelpWindow) Then @@ -2103,7 +2101,7 @@ devPluginToolbarsY.AddToolbarsY(plugins[i].GetPluginName, toolbar.Top); End; - plugins[i].Destroy; + plugins[i].DestroyDLL; plugins[i] := Nil; End; {$ENDIF PLUGIN_BUILD} @@ -3181,7 +3179,6 @@ Var e: TEditor; Saved: Boolean; - intActivePage, i: Integer; Begin Saved := False; Result := False; @@ -3964,9 +3961,6 @@ Procedure TMainForm.actNewProjectExecute(Sender: TObject); Var s: String; -{$IFDEF PLUGIN_BUILD} - i: Integer; -{$ENDIF} Begin With TNewProjectForm.Create(Self) Do Try @@ -4098,14 +4092,10 @@ prj: Integer; flt: String; {$IFDEF PLUGIN_BUILD} - filters: TStringList; - built: Boolean; - j, I: Integer; + j: Integer; {$ENDIF} Begin - - built := False; prj := -1; flt := ''; BuildFilter(flt, ftOpen); @@ -4821,11 +4811,6 @@ flt: String; idx: Integer; FolderNode: TTreeNode; - filtersBuilt: Boolean; -{$IFDEF PLUGIN_BUILD} - i, j: Integer; - filters: TStringList; -{$ENDIF} Begin If Not assigned(fProject) Then exit; @@ -5229,8 +5214,7 @@ Procedure TMainForm.doDebugAfterCompile(Sender: TObject); Var e: TEditor; - idx, idx2: Integer; - s: String; + idx: Integer; Begin PrepareDebugger; If assigned(fProject) Then @@ -5318,7 +5302,7 @@ [rfReplaceAll]), fCompiler.RunParams); fDebugger.RefreshBreakpoints; - fDebugger.RefreshWatches; + //fDebugger.RefreshWatches; End; End; @@ -5343,8 +5327,6 @@ Begin - debugValue := True; - // see if debugging is enabled debugEnabled := devCompiler.FindOption('-g3', optDebug, idxDebug); If debugEnabled Then @@ -5366,7 +5348,6 @@ If Not (debugEnabled) Then Begin - If devData.AutoAddDebugFlag = -1 Then Begin MessageResult := @@ -5375,8 +5356,6 @@ 'Don''t show this again', MB_ICONQUESTION Or MB_YESNOCANCEL); - - If MessageResult > 0 Then devData.AutoAddDebugFlag := abs(MessageResult); MessageResult := abs(MessageResult); @@ -5391,13 +5370,6 @@ Else debugValue := True; - // End; - - - // If MessageDlg(Lang[ID_MSG_NODEBUGSYMBOLS], mtConfirmation, - // [mbYes, mbNo], 0) = mrYes Then - // Begin - If ((devCompiler.CompilerType = ID_COMPILER_MINGW) Or (devCompiler.CompilerType = ID_COMPILER_LINUX)) Then Begin @@ -5485,7 +5457,7 @@ Procedure TMainForm.actDebugExecute(Sender: TObject); Var UpToDate: Boolean; - MessageResult, spos: Integer; + MessageResult: Integer; linker_original: String; opts: TProjProfile; idx: Integer; @@ -7276,7 +7248,6 @@ idx: Integer; current: Integer; e: TEditor; - curFilename, tempFileName: String; {$IFDEF PLUGIN_BUILD} //tempEditor: TEditor; //pluginCatched : Boolean; @@ -8770,7 +8741,7 @@ ProcessListForm.ProcessList[ ProcessListForm.ProcessCombo.ItemIndex])); fDebugger.RefreshBreakpoints; - fDebugger.RefreshWatches; + //fDebugger.RefreshWatches; fDebugger.Go; End Finally @@ -8781,9 +8752,6 @@ Procedure TMainForm.actModifyWatchExecute(Sender: TObject); Var - val: String; - i: Integer; - n: TTreeNode; Watch: PWatchPt; Begin @@ -8814,13 +8782,6 @@ End; End; -Procedure TMainForm.ClearallWatchPopClick(Sender: TObject); -Var - node: TTreeNode; -Begin - -End; - Procedure TMainForm.HideCodeToolTip; Var CurrentEditor: TEditor; @@ -8927,7 +8888,6 @@ // _Loaded: boolean; // _InProject: Boolean; Begin - Result := False; classname := trim(classname); //CppParser1.GetClassesList(TStrings()); @@ -9831,7 +9791,6 @@ items: TList; menuItem: TMenuItem; toolbar: TToolBar; - tabs: TTabSheet; i, j, idx, temp_left, temp_top, setIndex: Integer; AClass: TPersistentClass; loadablePlugins: TStringList; @@ -9853,6 +9812,8 @@ ToolsMenuOffset := 0; loadablePlugins := ListDirectory(devDirs.Exec + '\plugins\*.*', faDirectory); + pluginSettings := nil; + {$IFNDEF PLUGIN_TESTING} For i := 0 To loadablePlugins.Count - 1 Do Begin @@ -10784,12 +10745,6 @@ If Locals is a null pointer, clear the on-screen list, otherwise, add Locals to the on-screen display } -Var - I: Integer; - ListItem: TListItem; - - Local: PWatchVar; - Begin If (Locals = Nil) Then Modified: trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas =================================================================== --- trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/packages/Parser/CodeCompletion.pas 2012-02-26 22:27:53 UTC (rev 1478) @@ -155,7 +155,10 @@ Destructor TCodeCompletion.Destroy; Begin If Assigned(CodeComplForm) Then - FreeAndNil(CodeComplForm) + begin + CodeComplForm.Close; + CodeComplForm.Free; + end Else CodeComplForm := Nil; Modified: trunk/wxdevcpp/source/packages/VistaAltFixUnit.pas =================================================================== --- trunk/wxdevcpp/source/packages/VistaAltFixUnit.pas 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/packages/VistaAltFixUnit.pas 2012-02-26 22:27:53 UTC (rev 1478) @@ -69,7 +69,7 @@ FApplicationEvents: TApplicationEvents; FRepaintAll: Boolean; Procedure ApplicationEventsIdle(Sender: TObject; Var Done: Boolean); - Function VistaWithTheme: Boolean; + // Function VistaWithTheme: Boolean; Public Constructor Create(AOwner: TComponent); Override; Destructor Destroy; Override; @@ -162,18 +162,18 @@ Inherited; End; -Function TVistaAltFix.VistaWithTheme: Boolean; -Var - OSVersionInfo: TOSVersionInfo; -Begin - OSVersionInfo.dwOSVersionInfoSize := SizeOf(OSVersionInfo); +//Function TVistaAltFix.VistaWithTheme: Boolean; +//Var +// OSVersionInfo: TOSVersionInfo; +//Begin +// OSVersionInfo.dwOSVersionInfoSize := SizeOf(OSVersionInfo); //if GetVersionEx(OSVersionInfo) and // (OSVersionInfo.dwMajorVersion >= 6) and // ThemeServices.ThemesEnabled then // Result := True // else - Result := False; -End; + // Result := False; +//End; { TFormObj } Modified: trunk/wxdevcpp/source/plugins/interfaces/iplugin.pas =================================================================== --- trunk/wxdevcpp/source/plugins/interfaces/iplugin.pas 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/plugins/interfaces/iplugin.pas 2012-02-26 22:27:53 UTC (rev 1478) @@ -20,10 +20,10 @@ type IPlug_In = interface(IInterface) ['{C9E8FCF9-BEBD-4A51-80C1-16AF5197BBB3}'] - + //Startup and shutdown procedure Initialize(name: String; module: HModule; _parent: HWND; _controlBar: TControlBar; _owner: TForm; Config: String; toolbar_x: Integer; toolbar_y: Integer); - procedure Destroy; + procedure DestroyDLL; procedure TestReport; //Properties Modified: trunk/wxdevcpp/source/plugins/interfaces/iplugin_dll.pas =================================================================== --- trunk/wxdevcpp/source/plugins/interfaces/iplugin_dll.pas 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/plugins/interfaces/iplugin_dll.pas 2012-02-26 22:27:53 UTC (rev 1478) @@ -22,7 +22,6 @@ controlBar: TControlBar; owner: TWinControl; tool: TToolBar; - button: TToolButton; plugin_name: String; C_TestReport: procedure(h: HWND); cdecl; C_CutExecute: procedure; cdecl; @@ -83,7 +82,7 @@ procedure CutExecute; procedure CopyExecute; procedure PasteExecute; - procedure Destroy; + procedure DestroyDLL; procedure OnToolbarEvent(WM_COMMAND: Word); procedure SetBoolInspectorDataClear(b: Boolean); procedure SetDisablePropertyBuilding(b: Boolean); @@ -300,7 +299,7 @@ self.C_PasteExecute; end; -procedure TPlug_In_DLL.Destroy; +Procedure TPlug_In_DLL.DestroyDLL; begin if (@self.C_Destroy <> nil) then self.C_Destroy; Modified: trunk/wxdevcpp/source/project.pas =================================================================== --- trunk/wxdevcpp/source/project.pas 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/project.pas 2012-02-26 22:27:53 UTC (rev 1478) @@ -291,11 +291,7 @@ End; Function TProjUnit.Save: Boolean; -{$IFDEF PLUGIN_BUILD} -Var - i: Integer; - boolForm: Boolean; -{$ENDIF} + Procedure DisableFileWatch; Var idx: Integer; @@ -1068,10 +1064,6 @@ End; Procedure TProject.Update; -{$IFDEF PLUGIN_BUILD} -Var - i: Integer; -{$ENDIF} Begin With finifile Do Begin @@ -1613,11 +1605,11 @@ Procedure TProject.LoadProfiles; Var - i, profileCount, resetCompilers, AutoSelectMissingCompiler: Integer; + i, profileCount, AutoSelectMissingCompiler: Integer; NewProfile: TProjProfile; CompilerType: String; Begin - ResetCompilers := 0; + finifile.Section := 'Project'; profilecount := finifile.Read('ProfilesCount', 0); fProfiles.useGPP := finifile.Read('useGPP', True); @@ -1727,7 +1719,6 @@ End; End; - Inc(ResetCompilers); End; fProfiles.Add(NewProfile); End; @@ -1799,7 +1790,7 @@ s := ChangeFileExt(Filename, '.layout'); // SetCurrentDir(ExtractFilePath(Filename)); // EAB: FileIsReadOnly depends on current dir. - If FileExists(s) And (FileGetAttr(s) And faReadOnly <> 0) Then + If FileExists(s) Then //And (FileGetAttr(s) And faReadOnly <> 0) Then exit; layIni := TIniFile.Create(s); Try Modified: trunk/wxdevcpp/source/utils.pas =================================================================== --- trunk/wxdevcpp/source/utils.pas 2012-02-23 21:39:49 UTC (rev 1477) +++ trunk/wxdevcpp/source/utils.pas 2012-02-26 22:27:53 UTC (rev 1478) @@ -329,7 +329,7 @@ nRead: DWORD; aBuf: Array[0..101] Of Char; sa: TSecurityAttributes; - hOutputReadTmp, hOutputRead, hOutputWrite, hInputWriteTmp, hInputRead, + hOutputRead, hOutputWrite, hInputWriteTmp, hInputRead, hInputWrite, hErrorWrite: THandle; FOutput: String; CurrentLine: String; @@ -340,6 +340,8 @@ sa.nLength := SizeOf(TSecurityAttributes); sa.lpSecurityDescriptor := Nil; sa.bInheritHandle := True; + hErrorWrite := 0; + hInputWrite := 0; CreatePipe(hOutputRead, hOutputWrite, @sa, 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-02-23 21:39:56
|
Revision: 1477 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1477&view=rev Author: tbreina Date: 2012-02-23 21:39:49 +0000 (Thu, 23 Feb 2012) Log Message: ----------- Debugger execution now checks if debug flag was added in compiler profile and asks if the user wants to add it. Modified Paths: -------------- trunk/wxdevcpp/source/debugger.pas trunk/wxdevcpp/source/devcfg.pas trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/main.pas trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res Modified: trunk/wxdevcpp/source/debugger.pas =================================================================== --- trunk/wxdevcpp/source/debugger.pas 2012-02-21 00:22:55 UTC (rev 1476) +++ trunk/wxdevcpp/source/debugger.pas 2012-02-23 21:39:49 UTC (rev 1477) @@ -413,6 +413,7 @@ //Common events Procedure OnNoDebuggingSymbolsFound; + Procedure AddDebuggerSwitches; Procedure OnAccessViolation; Procedure OnBreakpoint; @@ -1183,7 +1184,7 @@ //============================================================= -Procedure TDebugger.OnNoDebuggingSymbolsFound; +Procedure TDebugger.AddDebuggerSwitches; Var opt: TCompilerOption; idx: Integer; @@ -1191,84 +1192,96 @@ opts: TProjProfile; Begin - If MessageDlg(Lang[ID_MSG_NODEBUGSYMBOLS], mtConfirmation, - [mbYes, mbNo], 0) = mrYes Then + + If ((devCompiler.CompilerType = ID_COMPILER_MINGW) Or + (devCompiler.CompilerType = ID_COMPILER_LINUX)) Then Begin - CloseDebugger(Nil); - If ((devCompiler.CompilerType = ID_COMPILER_MINGW) Or - (devCompiler.CompilerType = ID_COMPILER_LINUX)) Then + If devCompiler.FindOption('-g3', opt, idx) Then Begin - If devCompiler.FindOption('-g3', opt, idx) Then - Begin - opt.optValue := 1; - If Not Assigned(MainForm.fProject) Then - devCompiler.Options[idx] := opt; + opt.optValue := 1; + If Not Assigned(MainForm.fProject) Then + devCompiler.Options[idx] := opt; // set global debugging option only if not working with a project - MainForm.SetProjCompOpt(idx, True); + MainForm.SetProjCompOpt(idx, True); // set the project's correpsonding option too // remove "-s" from the linker''s command line - If Assigned(MainForm.fProject) Then - Begin - opts := MainForm.fProject.CurrentProfile; + If Assigned(MainForm.fProject) Then + Begin + opts := MainForm.fProject.CurrentProfile; // look for "-s" in all the possible ways // NOTE: can't just search for "-s" because we might get confused with // some other option starting with "-s...." - spos := Pos('-s ', opts.Linker); // following more opts - If spos = 0 Then - spos := Pos('-s'#13, opts.Linker); // end of line - If spos = 0 Then - spos := Pos('-s_@@_', opts.Linker); + spos := Pos('-s ', opts.Linker); // following more opts + If spos = 0 Then + spos := Pos('-s'#13, opts.Linker); // end of line + If spos = 0 Then + spos := Pos('-s_@@_', opts.Linker); // end of line (dev 4.9.7.3+) - If (spos = 0) And (Length(opts.Linker) >= 2) And + If (spos = 0) And (Length(opts.Linker) >= 2) And // end of string - (Copy(opts.Linker, Length(opts.Linker) - 1, 2) = - '-s') Then - spos := Length(opts.Linker) - 1; + (Copy(opts.Linker, Length(opts.Linker) - 1, 2) = + '-s') Then + spos := Length(opts.Linker) - 1; // if found, delete it - If spos > 0 Then - Delete(opts.Linker, spos, 2); + If spos > 0 Then + Delete(opts.Linker, spos, 2); - End; + End; // remove "--no-export-all-symbols" from the linker''s command line - If Assigned(MainForm.fProject) Then - Begin - opts := MainForm.fProject.CurrentProfile; + If Assigned(MainForm.fProject) Then + Begin + opts := MainForm.fProject.CurrentProfile; // look for "--no-export-all-symbols" - spos := Pos('--no-export-all-symbols', opts.Linker); + spos := Pos('--no-export-all-symbols', opts.Linker); // following more opts // if found, delete it - If spos > 0 Then - Delete(opts.Linker, spos, - length('--no-export-all-symbols')); + If spos > 0 Then + Delete(opts.Linker, spos, + length('--no-export-all-symbols')); - End; + End; // remove -s from the compiler options - If devCompiler.FindOption('-s', opt, idx) Then - Begin - opt.optValue := 0; - If Not Assigned(MainForm.fProject) Then - devCompiler.Options[idx] := opt; - // set global debugging option only if not working with a project - MainForm.SetProjCompOpt(idx, False); - // set the project's correpsonding option too - End; - End; - End - Else - If devCompiler.CompilerType In ID_COMPILER_VC Then - If devCompiler.FindOption('/ZI', opt, idx) Then + If devCompiler.FindOption('-s', opt, idx) Then Begin - opt.optValue := 1; + opt.optValue := 0; If Not Assigned(MainForm.fProject) Then devCompiler.Options[idx] := opt; - MainForm.SetProjCompOpt(idx, True); - MainForm.fProject.CurrentProfile.Linker := - MainForm.fProject.CurrentProfile.Linker + '/Debug'; + // set global debugging option only if not working with a project + MainForm.SetProjCompOpt(idx, False); + // set the project's correpsonding option too End; + End; + End + Else + If devCompiler.CompilerType In ID_COMPILER_VC Then + If devCompiler.FindOption('/ZI', opt, idx) Then + Begin + opt.optValue := 1; + If Not Assigned(MainForm.fProject) Then + devCompiler.Options[idx] := opt; + MainForm.SetProjCompOpt(idx, True); + MainForm.fProject.CurrentProfile.Linker := + MainForm.fProject.CurrentProfile.Linker + '/Debug'; + End; + +End; + + +//============================================================= + +Procedure TDebugger.OnNoDebuggingSymbolsFound; +Begin + If MessageDlg(Lang[ID_MSG_NODEBUGSYMBOLS], mtConfirmation, + [mbYes, mbNo], 0) = mrYes Then + Begin + CloseDebugger(Nil); + + AddDebuggerSwitches; + MainForm.Compiler.OnCompilationEnded := MainForm.doDebugAfterCompile; MainForm.actRebuildExecute(Nil); End; Modified: trunk/wxdevcpp/source/devcfg.pas =================================================================== --- trunk/wxdevcpp/source/devcfg.pas 2012-02-21 00:22:55 UTC (rev 1476) +++ trunk/wxdevcpp/source/devcfg.pas 2012-02-23 21:39:49 UTC (rev 1477) @@ -655,6 +655,7 @@ fHiliteActiveTab: Boolean; // Hilite the Active Editor Page Tab fAutoCompile: Integer; // automatically compile when out-of-date fNoToolTip: Boolean; // Don't use Tooltips + fAutoAddDebugFlag : Integer; //Automatically add debug flag if not present at debug start fDebugCommand: String; // Custom command to send to debugger (default is "finish") @@ -741,7 +742,8 @@ Property HiliteActiveTab: Boolean Read fHiliteActiveTab Write fHiliteActiveTab; Property AutoCompile: Integer Read fAutoCompile Write fAutoCompile; - Property NoToolTip: Boolean Read fNoToolTip Write fNoToolTip Default True; + Property NoToolTip: Boolean Read fNoToolTip Write fNoToolTip Default False; + Property AutoAddDebugFlag: Integer Read fAutoAddDebugFlag Write fAutoAddDebugFlag; Property DebugCommand: String Read fDebugCommand Write fDebugCommand; //Execution @@ -1719,6 +1721,7 @@ fOpenStyle := 0; fdblFiles := False; fAutoCompile := -1; + fAutoAddDebugFlag := -1; fToolbarMain := True; fToolbarMainX := 11; @@ -1772,7 +1775,7 @@ fPrintLineNumbersMargins := False; fWatchHint := True; fWatchError := True; - fNoToolTip := True; + fNoToolTip := False; fDebugCommand := '-exec-finish'; Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-02-21 00:22:55 UTC (rev 1476) +++ trunk/wxdevcpp/source/devcpp.dof 2012-02-23 21:39:49 UTC (rev 1477) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=78 +Build=93 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.78 +FileVersion=7.4.2.93 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/main.pas =================================================================== --- trunk/wxdevcpp/source/main.pas 2012-02-21 00:22:55 UTC (rev 1476) +++ trunk/wxdevcpp/source/main.pas 2012-02-23 21:39:49 UTC (rev 1477) @@ -988,6 +988,8 @@ Procedure OnWatches(Locals: PTList); + Function AddDebuggerSwitches: Boolean; + Private HelpWindow: HWND; fToDoList: TList; @@ -5324,12 +5326,172 @@ fDebugger.Go; End; +///////////////////////////////////// + +Function TMainForm.AddDebuggerSwitches: Boolean; +Var + opt: TCompilerOption; + idx: Integer; + spos: Integer; + opts: TProjProfile; + + MessageResult: Integer; + optDebug: TCompilerOption; + idxDebug: Integer; + debugEnabled: Boolean; + debugValue: Boolean; + +Begin + + debugValue := True; + + // see if debugging is enabled + debugEnabled := devCompiler.FindOption('-g3', optDebug, idxDebug); + If debugEnabled Then + Begin + If Assigned(fProject) Then + Begin + If (fProject.CurrentProfile.CompilerOptions <> '') And + (fProject.CurrentProfile.CompilerOptions[idxDebug + 1] = '1') Then + debugEnabled := True + Else + debugEnabled := False; + End + Else + debugEnabled := (optDebug.optValue > 0); + End; + + Result := debugEnabled; + + If Not (debugEnabled) Then + Begin + + + If devData.AutoAddDebugFlag = -1 Then + Begin + MessageResult := + devMessageBox(Self, + Lang[ID_MSG_NODEBUGSYMBOLS], 'wxDev-C++', + 'Don''t show this again', + MB_ICONQUESTION Or MB_YESNOCANCEL); + + + + If MessageResult > 0 Then + devData.AutoAddDebugFlag := abs(MessageResult); + MessageResult := abs(MessageResult); + End + Else + MessageResult := devData.AutoAddDebugFlag; + + If MessageResult = mrCancel Then + Exit; + If MessageResult = mrNO Then + debugValue := False + Else + debugValue := True; + + // End; + + + // If MessageDlg(Lang[ID_MSG_NODEBUGSYMBOLS], mtConfirmation, + // [mbYes, mbNo], 0) = mrYes Then + // Begin + + If ((devCompiler.CompilerType = ID_COMPILER_MINGW) Or + (devCompiler.CompilerType = ID_COMPILER_LINUX)) Then + Begin + If (debugValue) Then + Begin + If devCompiler.FindOption('-g3', opt, idx) Then + Begin + opt.optValue := 1; + If Not Assigned(MainForm.fProject) Then + devCompiler.Options[idx] := opt; + // set global debugging option only if not working with a project + MainForm.SetProjCompOpt(idx, True); + // set the project's correpsonding option too + + // remove "-s" from the linker''s command line + If Assigned(MainForm.fProject) Then + Begin + opts := MainForm.fProject.CurrentProfile; + // look for "-s" in all the possible ways + // NOTE: can't just search for "-s" because we might get confused with + // some other option starting with "-s...." + spos := Pos('-s ', opts.Linker); // following more opts + If spos = 0 Then + spos := Pos('-s'#13, opts.Linker); // end of line + If spos = 0 Then + spos := Pos('-s_@@_', opts.Linker); + // end of line (dev 4.9.7.3+) + If (spos = 0) And (Length(opts.Linker) >= 2) And + // end of string + (Copy(opts.Linker, Length(opts.Linker) - 1, 2) = + '-s') Then + spos := Length(opts.Linker) - 1; + + // if found, delete it + If spos > 0 Then + Delete(opts.Linker, spos, 2); + + End; + + // remove "--no-export-all-symbols" from the linker''s command line + If Assigned(MainForm.fProject) Then + Begin + opts := MainForm.fProject.CurrentProfile; + // look for "--no-export-all-symbols" + spos := Pos('--no-export-all-symbols', opts.Linker); + // following more opts + // if found, delete it + If spos > 0 Then + Delete(opts.Linker, spos, + length('--no-export-all-symbols')); + + End; + + // remove -s from the compiler options + If devCompiler.FindOption('-s', opt, idx) Then + Begin + opt.optValue := 0; + If Not Assigned(MainForm.fProject) Then + devCompiler.Options[idx] := opt; + // set global debugging option only if not working with a project + MainForm.SetProjCompOpt(idx, False); + // set the project's correpsonding option too + End; + End; + + End + Else + If devCompiler.CompilerType In ID_COMPILER_VC Then + If devCompiler.FindOption('/ZI', opt, idx) Then + Begin + opt.optValue := 1; + If Not Assigned(MainForm.fProject) Then + devCompiler.Options[idx] := opt; + MainForm.SetProjCompOpt(idx, True); + MainForm.fProject.CurrentProfile.Linker := + MainForm.fProject.CurrentProfile.Linker + '/Debug'; + End; + + End; + + End; + +End; + Procedure TMainForm.actDebugExecute(Sender: TObject); Var UpToDate: Boolean; MessageResult, spos: Integer; linker_original: String; opts: TProjProfile; + idx: Integer; + optCompiler: TCompilerOption; + originalDebugFlag: Boolean; + Begin linker_original := ''; // Trying to supress bug #3469393 @@ -5339,19 +5501,11 @@ If Assigned(fProject) Then Begin - // remove "--no-export-all-symbols" from the linker''s command line opts := fProject.CurrentProfile; linker_original := opts.Linker; - // look for "--no-export-all-symbols" - spos := Pos('--no-export-all-symbols', opts.Linker); - // following more opts - // if found, delete it - If spos > 0 Then - Delete(opts.Linker, spos, length('--no-export-all-symbols')); + originalDebugFlag := AddDebuggerSwitches; - fProject.CurrentProfile := opts; - //Save all the files then set the UI status actSaveAllExecute(Self); (Sender As TAction).Tag := 0; @@ -5397,14 +5551,19 @@ End; End; + fProject.CurrentProfile.Linker := linker_original; + fProject.CurrentProfile := opts; + devCompiler.FindOption('-g3', optCompiler, idx); + SetProjCompOpt(idx, originalDebugFlag); + doDebugAfterCompile(Sender); End Else // We are not in a project (single file compilation) - MessageDlg('You cannot debug outside of a project.' - + #13#10 + 'Please add file to project and then re-try.', mtInformation, + MessageDlg('You cannot debug outside of a project.' + + #13#10 + 'Please add file to project and then re-try.', mtInformation, [mbOk], 0); @@ -6988,10 +7147,12 @@ //todo: disable profiling for non gcc compilers // see if profiling is enabled If (assigned(fProject) And - ((fProject.CurrentProfile.compilerType <> ID_COMPILER_MINGW) Or - (fProject.CurrentProfile.compilerType <> ID_COMPILER_LINUX))) Then + Not (fProject.CurrentProfile.compilerType + In [ID_COMPILER_MINGW, ID_COMPILER_LINUX])) Then Begin - ShowMessage('Profiling is Disabled for Non-MingW compilers.'); + ShowMessage(Format('Profiling is Disabled for Non-MingW compilers.' + + ' Compiler type #%d' + , [fProject.CurrentProfile.compilerType])); exit; End; prof := devCompiler.FindOption('-pg', optP, idxP); Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof =================================================================== --- trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-02-21 00:22:55 UTC (rev 1476) +++ trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.dof 2012-02-23 21:39:49 UTC (rev 1477) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=30 +Build=31 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName= FileDescription=wxDev-C++ RAD add-on -FileVersion=7.4.2.30 +FileVersion=7.4.2.31 InternalName= LegalCopyright= LegalTrademarks= Modified: trunk/wxdevcpp/source/plugins/wxdsgn/wxdsgn.res =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-02-21 00:23:02
|
Revision: 1476 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1476&view=rev Author: tbreina Date: 2012-02-21 00:22:55 +0000 (Tue, 21 Feb 2012) Log Message: ----------- Directory for gcc lib changed. Manifest RM makefile line updated for Visual C++ Fix for remove unit in class browser. Modified Paths: -------------- trunk/wxdevcpp/source/EditorOptfrm.dfm trunk/wxdevcpp/source/EditorOptfrm.pas trunk/wxdevcpp/source/Envirofrm.dfm trunk/wxdevcpp/source/compiler.pas trunk/wxdevcpp/source/devcpp.dof trunk/wxdevcpp/source/devcpp.drc trunk/wxdevcpp/source/devcpp.res trunk/wxdevcpp/source/main.pas trunk/wxdevcpp/source/project.pas trunk/wxdevcpp/source/version.pas Modified: trunk/wxdevcpp/source/EditorOptfrm.dfm =================================================================== --- trunk/wxdevcpp/source/EditorOptfrm.dfm 2012-02-20 20:58:51 UTC (rev 1475) +++ trunk/wxdevcpp/source/EditorOptfrm.dfm 2012-02-21 00:22:55 UTC (rev 1476) @@ -30,9 +30,9 @@ Top = 8 Width = 415 Height = 373 - ActivePage = tabGeneral + ActivePage = tabClassBrowsing Anchors = [akLeft, akTop, akRight, akBottom] - TabIndex = 0 + TabIndex = 4 TabOrder = 0 object tabGeneral: TTabSheet Caption = 'General' Modified: trunk/wxdevcpp/source/EditorOptfrm.pas =================================================================== --- trunk/wxdevcpp/source/EditorOptfrm.pas 2012-02-20 20:58:51 UTC (rev 1475) +++ trunk/wxdevcpp/source/EditorOptfrm.pas 2012-02-21 00:22:55 UTC (rev 1476) @@ -1751,6 +1751,7 @@ Var I: Integer; Begin + Screen.Cursor := crHourglass; CppParser1.OnStartParsing := CppParser1StartParsing; CppParser1.OnEndParsing := Nil; //We will call it ourselves Modified: trunk/wxdevcpp/source/Envirofrm.dfm =================================================================== --- trunk/wxdevcpp/source/Envirofrm.dfm 2012-02-20 20:58:51 UTC (rev 1475) +++ trunk/wxdevcpp/source/Envirofrm.dfm 2012-02-21 00:22:55 UTC (rev 1476) @@ -27,10 +27,10 @@ Top = 8 Width = 403 Height = 375 - ActivePage = tabAssocs + ActivePage = tabGeneral Anchors = [akLeft, akTop, akRight, akBottom] MultiLine = True - TabIndex = 4 + TabIndex = 0 TabOrder = 0 object tabGeneral: TTabSheet Caption = 'General' @@ -159,8 +159,6 @@ Width = 97 Height = 17 Caption = 'No tooltips' - Checked = True - State = cbChecked TabOrder = 9 end end Modified: trunk/wxdevcpp/source/compiler.pas =================================================================== --- trunk/wxdevcpp/source/compiler.pas 2012-02-20 20:58:51 UTC (rev 1475) +++ trunk/wxdevcpp/source/compiler.pas 2012-02-21 00:22:55 UTC (rev 1476) @@ -921,7 +921,7 @@ ExtractRelativePath(Makefile, fProject.Executable) + '.manifest" /outputresource:"' + ExtractRelativePath( Makefile, fProject.Executable) + ';#2"'); - writeln(F, #9 + '@rm "' + ExtractRelativePath( + writeln(F, #9 + '@$(RM) "' + ExtractRelativePath( Makefile, fProject.Executable) + '.manifest"'); End; End; Modified: trunk/wxdevcpp/source/devcpp.dof =================================================================== --- trunk/wxdevcpp/source/devcpp.dof 2012-02-20 20:58:51 UTC (rev 1475) +++ trunk/wxdevcpp/source/devcpp.dof 2012-02-21 00:22:55 UTC (rev 1476) @@ -62,7 +62,7 @@ MajorVer=7 MinorVer=4 Release=2 -Build=57 +Build=78 Debug=0 PreRelease=0 Special=0 @@ -73,7 +73,7 @@ [Version Info Keys] CompanyName=wxDev-C++ Developers FileDescription=wxDev-C++ IDE -FileVersion=7.4.2.57 +FileVersion=7.4.2.78 InternalName=devcpp.exe LegalCopyright=Copyright Bloodshed Software and the wxDev-C++ Developers LegalTrademarks= Modified: trunk/wxdevcpp/source/devcpp.drc =================================================================== --- trunk/wxdevcpp/source/devcpp.drc 2012-02-20 20:58:51 UTC (rev 1475) +++ trunk/wxdevcpp/source/devcpp.drc 2012-02-21 00:22:55 UTC (rev 1476) @@ -659,11 +659,11 @@ version_VC2005_C_INCLUDE_DIR, "Include\\common;Include\\VC2005;" version_VC2005_RC_INCLUDE_DIR, "include\\common;" version_VC2003_BIN_DIR, "Bin\\VC2003;Bin;" - version_VC2003_LIB_DIR, "Lib\\VC2003" + version_VC2003_LIB_DIR, "Lib\\VC2003;" version_VC2003_C_INCLUDE_DIR, "Include\\common;Include\\VC2003;" version_VC2003_RC_INCLUDE_DIR, "include\\common;" version_VC6_BIN_DIR, "Bin\\VC6;Bin;" - version_VC6_LIB_DIR, "Lib\\VC6" + version_VC6_LIB_DIR, "Lib\\VC6;" version_VC6_C_INCLUDE_DIR, "Include\\common;Include\\VC6;" version_VC6_RC_INCLUDE_DIR, "include\\common;" version_DMARS_BIN_DIR, "Bin;Bin\\dmars;" @@ -674,13 +674,13 @@ version_DEV_NEWLOOK_THEME, "New Look" version_DEV_BLUE_THEME, "Blue" version_DEV_CLASSIC_THEME, "Classic" - version_GCC_BIN_DIR, "Bin;" - version_GCC_LIB_DIR, "Lib\\wx\\gcc_lib" - version_GCC_C_INCLUDE_DIR, "Include;" + version_GCC_BIN_DIR, "bin;" + version_GCC_LIB_DIR, "lib;lib\\wx\\gcc_lib;" + version_GCC_C_INCLUDE_DIR, "include;" version_GCC_RC_INCLUDE_DIR, "include\\common;" - version_VC2010_BIN_DIR, "Bin\\VC2010;Bin;" - version_VC2010_LIB_DIR, "Lib\\wx\\vc_lib" - version_VC2010_C_INCLUDE_DIR, "Include\\common;Include\\VC2010;" + version_VC2010_BIN_DIR, "bin\\VC2010;bin;" + version_VC2010_LIB_DIR, "lib;lib\\wx\\vc_lib;" + version_VC2010_C_INCLUDE_DIR, "include\\common;include\\VC2010;" version_VC2010_RC_INCLUDE_DIR, "include\\common;" version_VC2008_BIN_DIR, "Bin\\VC2008;Bin;" version_VC2008_LIB_DIR, "Lib\\VC2008" Modified: trunk/wxdevcpp/source/devcpp.res =================================================================== (Binary files differ) Modified: trunk/wxdevcpp/source/main.pas =================================================================== --- trunk/wxdevcpp/source/main.pas 2012-02-20 20:58:51 UTC (rev 1475) +++ trunk/wxdevcpp/source/main.pas 2012-02-21 00:22:55 UTC (rev 1476) @@ -4685,11 +4685,11 @@ If Not assigned(fProject) Then exit; -{$IFDEF WIN32} + While ProjectView.SelectionCount > 0 Do Begin node := ProjectView.Selections[0]; -{$ENDIF} + If Not assigned(node) Or (node.Level < 1) Then Continue; @@ -5396,12 +5396,18 @@ Exit; End; End; - End; - fProject.CurrentProfile.Linker := linker_original; + fProject.CurrentProfile.Linker := linker_original; - doDebugAfterCompile(Sender); + doDebugAfterCompile(Sender); + End + Else // We are not in a project (single file compilation) + MessageDlg('You cannot debug outside of a project.' + + #13#10 + 'Please add file to project and then re-try.', mtInformation, + [mbOk], 0); + + End Else If Assigned(fDebugger) Then Modified: trunk/wxdevcpp/source/project.pas =================================================================== --- trunk/wxdevcpp/source/project.pas 2012-02-20 20:58:51 UTC (rev 1475) +++ trunk/wxdevcpp/source/project.pas 2012-02-21 00:22:55 UTC (rev 1476) @@ -279,15 +279,14 @@ Destructor TProjUnit.Destroy; Begin + If Assigned(fEditor) Then FreeAndNil(fEditor) - Else + else fEditor := Nil; - If Assigned(fNode) Then - FreeAndNil(fNode) - Else - fNode := Nil; + fNode := Nil; + Inherited; End; Modified: trunk/wxdevcpp/source/version.pas =================================================================== --- trunk/wxdevcpp/source/version.pas 2012-02-20 20:58:51 UTC (rev 1475) +++ trunk/wxdevcpp/source/version.pas 2012-02-21 00:22:55 UTC (rev 1476) @@ -65,15 +65,15 @@ DEV_INTERNAL_THEME = 'New Look'; // default directories - GCC_BIN_DIR = 'Bin;'; - GCC_LIB_DIR = 'Lib' + pd + 'wx' + pd + 'gcc_lib'; - GCC_C_INCLUDE_DIR = 'Include;'; + GCC_BIN_DIR = 'bin;'; + GCC_LIB_DIR = 'lib;lib' + pd + 'wx' + pd + 'gcc_lib;'; + GCC_C_INCLUDE_DIR = 'include;'; GCC_RC_INCLUDE_DIR = 'include' + pd + 'common;'; //Vc++ - VC2010_BIN_DIR = 'Bin' + pd + 'VC2010;Bin;'; - VC2010_LIB_DIR = 'Lib' + pd + 'wx' + pd + 'vc_lib'; - VC2010_C_INCLUDE_DIR = 'Include' + pd + 'common;Include' + pd + 'VC2010;'; + VC2010_BIN_DIR = 'bin' + pd + 'VC2010;bin;'; + VC2010_LIB_DIR = 'lib;lib' + pd + 'wx' + pd + 'vc_lib;'; + VC2010_C_INCLUDE_DIR = 'include' + pd + 'common;include' + pd + 'VC2010;'; VC2010_RC_INCLUDE_DIR = 'include' + pd + 'common;'; VC2008_BIN_DIR = 'Bin' + pd + 'VC2008;Bin;'; @@ -87,12 +87,12 @@ VC2005_RC_INCLUDE_DIR = 'include' + pd + 'common;'; VC2003_BIN_DIR = 'Bin' + pd + 'VC2003;Bin;'; - VC2003_LIB_DIR = 'Lib' + pd + 'VC2003'; + VC2003_LIB_DIR = 'Lib' + pd + 'VC2003;'; VC2003_C_INCLUDE_DIR = 'Include' + pd + 'common;Include' + pd + 'VC2003;'; VC2003_RC_INCLUDE_DIR = 'include' + pd + 'common;'; VC6_BIN_DIR = 'Bin' + pd + 'VC6;Bin;'; - VC6_LIB_DIR = 'Lib' + pd + 'VC6'; + VC6_LIB_DIR = 'Lib' + pd + 'VC6;'; VC6_C_INCLUDE_DIR = 'Include' + pd + 'common;Include' + pd + 'VC6;'; VC6_RC_INCLUDE_DIR = 'include' + pd + 'common;'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-02-20 20:58:57
|
Revision: 1475 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1475&view=rev Author: tbreina Date: 2012-02-20 20:58:51 +0000 (Mon, 20 Feb 2012) Log Message: ----------- Remove CP.exe. Not needed for devpak_batchmaker Removed Paths: ------------- trunk/devpak_batchmaker/CP.COM Deleted: trunk/devpak_batchmaker/CP.COM =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-02-20 20:57:44
|
Revision: 1474 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1474&view=rev Author: tbreina Date: 2012-02-20 20:57:38 +0000 (Mon, 20 Feb 2012) Log Message: ----------- Updated devpak_batchmaker. Using Windows command shell CHOICE rather than CP.exe Modified Paths: -------------- trunk/devpak_batchmaker/common_vars.bat Modified: trunk/devpak_batchmaker/common_vars.bat =================================================================== --- trunk/devpak_batchmaker/common_vars.bat 2012-02-20 20:23:37 UTC (rev 1473) +++ trunk/devpak_batchmaker/common_vars.bat 2012-02-20 20:57:38 UTC (rev 1474) @@ -37,7 +37,7 @@ set /P WXCODE= set BUILDBASE=Y -%STARTDIR%\CP /T:Y,5 Do you wish to build the BASE libraries (Default = %BUILDBASE%)? +CHOICE /T 5 /D %BUILDBASE% /M "Do you wish to build the BASE libraries (Default = %BUILDBASE%)?" IF ERRORLEVEL 1 GOTO BaseKeyPressed GOTO BuildBaseEND :BaseKeyPressed @@ -52,7 +52,7 @@ set BUILDCONTRIB=N -%STARTDIR%\CP /T:Y,5 Do you wish to build the CONTRIB libraries (Default = %BUILDCONTRIB%)? +CHOICE /T 5 /D %BUILDCONTRIB% /M "Do you wish to build the CONTRIB libraries (Default = %BUILDCONTRIB%)?" IF ERRORLEVEL 1 GOTO ContribKeyPressed GOTO BuildContribEND :ContribKeyPressed @@ -67,7 +67,7 @@ set BUILD3RDP=N -%STARTDIR%\CP /T:Y,5 Do you wish to build the 3RD PARTY libraries (Default = %BUILD3RDP%)? +CHOICE /T 5 /D %BUILD3RDP% /M "Do you wish to build the 3RD PARTY libraries (Default = %BUILD3RDP%)?" IF ERRORLEVEL 1 GOTO 3RDPKeyPressed GOTO BUILD3RDPEND :3RDPKeyPressed @@ -82,7 +82,7 @@ set BUILDGCC=Y -%STARTDIR%\CP /T:Y,5 Do you wish to build using the GCC compiler (Default = %BUILDGCC%)? +CHOICE /T 5 /D %BUILDGCC% /M "Do you wish to build using the GCC compiler (Default = %BUILDGCC%)?" IF ERRORLEVEL 1 GOTO GCCKeyPressed GOTO BUILDGCCEND :GCCKeyPressed @@ -97,7 +97,7 @@ set BUILDVC=N -%STARTDIR%\CP /T:N,5 Do you wish to build using the Microsoft compiler (Default = %BUILDVC%)? +CHOICE /T 5 /D %BUILDVC% /M "Do you wish to build using the Microsoft compiler (Default = %BUILDVC%)?" IF ERRORLEVEL 1 GOTO VCKeyPressed GOTO BUILDVCEND :VCKeyPressed @@ -107,7 +107,7 @@ :BUILDVCEND set BUILDDMC=N -%STARTDIR%\CP /T:N,5 Do you wish to build using the Digital Mars compiler (Default = %BUILDVC%)? +CHOICE /T 5 /D %BUILDDMC% /M "Do you wish to build using the Digital Mars compiler (Default = %BUILDVC%)?" IF ERRORLEVEL 1 GOTO DMCKeyPressed GOTO BUILDDMCEND :DMCKeyPressed @@ -117,7 +117,7 @@ :BUILDDMCEND set BUILDBCC=N -%STARTDIR%\CP /T:N,5 Do you wish to build using the Borland compiler (Default = %BUILDVC%)? +CHOICE /T 5 /D %BUILDBCC% /M "Do you wish to build using the Borland compiler (Default = %BUILDVC%)?" IF ERRORLEVEL 1 GOTO BCCKeyPressed GOTO BUILDBCCEND :BCCKeyPressed This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-02-20 20:23:44
|
Revision: 1473 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1473&view=rev Author: tbreina Date: 2012-02-20 20:23:37 +0000 (Mon, 20 Feb 2012) Log Message: ----------- Updated devpak batchmaker templates Modified Paths: -------------- trunk/devpak_batchmaker/Project1.dev trunk/devpak_batchmaker/Project10.dev trunk/devpak_batchmaker/Project11.dev trunk/devpak_batchmaker/Project2.dev trunk/devpak_batchmaker/Project3.dev trunk/devpak_batchmaker/Project4.dev trunk/devpak_batchmaker/Project5.dev trunk/devpak_batchmaker/Project6.dev trunk/devpak_batchmaker/Project9.dev Modified: trunk/devpak_batchmaker/Project1.dev =================================================================== --- trunk/devpak_batchmaker/Project1.dev 2012-02-20 20:11:29 UTC (rev 1472) +++ trunk/devpak_batchmaker/Project1.dev 2012-02-20 20:23:37 UTC (rev 1473) @@ -39,7 +39,7 @@ AutoIncBuildNrOnRebuild=0 AutoIncBuildNrOnCompile=0 -[Profile0] +[Profile1] ProfileName=MingW gcc Type=0 ObjFiles= @@ -51,13 +51,13 @@ Compiler= CppCompiler= Linker=-mwindows_@@_-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 +PreprocDefines=__WXMSW___@@___GNUWIN32___@@__UNICODE_@@_ CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -65,9 +65,10 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=0 -compilerType=0 +CompilerType=0 +ImagesOutput=Images\ -[Profile1] +[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -76,8 +77,8 @@ PrivateResource= ResourceIncludes= MakeIncludes= -Compiler= -CppCompiler= +Compiler=/MD_@@_ +CppCompiler=/MD_@@_ Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ PreprocDefines=_@@_ CompilerSettings=000000000000010000000000000000000000 @@ -85,7 +86,7 @@ ExeOutput=Output\Visual C++ ObjectOutput=Objects\Visual C++ OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -93,4 +94,7 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=9 -compilerType=9 +CompilerType=9 +ImagesOutput=Images\ + + Modified: trunk/devpak_batchmaker/Project10.dev =================================================================== --- trunk/devpak_batchmaker/Project10.dev 2012-02-20 20:11:29 UTC (rev 1472) +++ trunk/devpak_batchmaker/Project10.dev 2012-02-20 20:23:37 UTC (rev 1473) @@ -110,7 +110,7 @@ OverrideBuildCmd=0 BuildCmd= -[Profile0] +[Profile1] ProfileName=MingW gcc Type=0 ObjFiles= @@ -122,13 +122,13 @@ Compiler= CppCompiler= Linker=-mwindows_@@_-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 +PreprocDefines=__WXMSW___@@___GNUWIN32___@@__UNICODE_@@_ CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -136,9 +136,10 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=0 -compilerType=0 +CompilerType=0 +ImagesOutput=Images\ -[Profile1] +[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -147,8 +148,8 @@ PrivateResource= ResourceIncludes= MakeIncludes= -Compiler= -CppCompiler= +Compiler=/MD_@@_ +CppCompiler=/MD_@@_ Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ PreprocDefines=_@@_ CompilerSettings=000000000000010000000000000000000000 @@ -156,7 +157,7 @@ ExeOutput=Output\Visual C++ ObjectOutput=Objects\Visual C++ OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -164,5 +165,7 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=9 -compilerType=9 +CompilerType=9 +ImagesOutput=Images\ + Modified: trunk/devpak_batchmaker/Project11.dev =================================================================== --- trunk/devpak_batchmaker/Project11.dev 2012-02-20 20:11:29 UTC (rev 1472) +++ trunk/devpak_batchmaker/Project11.dev 2012-02-20 20:23:37 UTC (rev 1473) @@ -119,7 +119,7 @@ OverrideBuildCmd=0 BuildCmd= -[Profile0] +[Profile1] ProfileName=MingW gcc Type=0 ObjFiles= @@ -131,13 +131,13 @@ Compiler= CppCompiler= Linker=-mwindows_@@_-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 +PreprocDefines=__WXMSW___@@___GNUWIN32___@@__UNICODE_@@_ CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -145,9 +145,10 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=0 -compilerType=0 +CompilerType=0 +ImagesOutput=Images\ -[Profile1] +[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -156,8 +157,8 @@ PrivateResource= ResourceIncludes= MakeIncludes= -Compiler= -CppCompiler= +Compiler=/MD_@@_ +CppCompiler=/MD_@@_ Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ PreprocDefines=_@@_ CompilerSettings=000000000000010000000000000000000000 @@ -165,7 +166,7 @@ ExeOutput=Output\Visual C++ ObjectOutput=Objects\Visual C++ OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -173,5 +174,5 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=9 -compilerType=9 - +CompilerType=9 +ImagesOutput=Images\ Modified: trunk/devpak_batchmaker/Project2.dev =================================================================== --- trunk/devpak_batchmaker/Project2.dev 2012-02-20 20:11:29 UTC (rev 1472) +++ trunk/devpak_batchmaker/Project2.dev 2012-02-20 20:23:37 UTC (rev 1473) @@ -48,7 +48,7 @@ AutoIncBuildNrOnRebuild=0 AutoIncBuildNrOnCompile=0 -[Profile0] +[Profile1] ProfileName=MingW gcc Type=0 ObjFiles= @@ -60,13 +60,13 @@ Compiler= CppCompiler= Linker=-mwindows_@@_-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 +PreprocDefines=__WXMSW___@@___GNUWIN32___@@__UNICODE_@@_ CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -74,9 +74,10 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=0 -compilerType=0 +CompilerType=0 +ImagesOutput=Images\ -[Profile1] +[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -85,8 +86,8 @@ PrivateResource= ResourceIncludes= MakeIncludes= -Compiler= -CppCompiler= +Compiler=/MD_@@_ +CppCompiler=/MD_@@_ Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ PreprocDefines=_@@_ CompilerSettings=000000000000010000000000000000000000 @@ -94,7 +95,7 @@ ExeOutput=Output\Visual C++ ObjectOutput=Objects\Visual C++ OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -102,5 +103,7 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=9 -compilerType=9 +CompilerType=9 +ImagesOutput=Images\ + Modified: trunk/devpak_batchmaker/Project3.dev =================================================================== --- trunk/devpak_batchmaker/Project3.dev 2012-02-20 20:11:29 UTC (rev 1472) +++ trunk/devpak_batchmaker/Project3.dev 2012-02-20 20:23:37 UTC (rev 1473) @@ -58,7 +58,7 @@ AutoIncBuildNrOnRebuild=0 AutoIncBuildNrOnCompile=0 -[Profile0] +[Profile1] ProfileName=MingW gcc Type=0 ObjFiles= @@ -70,13 +70,13 @@ Compiler= CppCompiler= Linker=-mwindows_@@_-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 +PreprocDefines=__WXMSW___@@___GNUWIN32___@@__UNICODE_@@_ CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -84,9 +84,10 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=0 -compilerType=0 +CompilerType=0 +ImagesOutput=Images\ -[Profile1] +[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -95,8 +96,8 @@ PrivateResource= ResourceIncludes= MakeIncludes= -Compiler= -CppCompiler= +Compiler=/MD_@@_ +CppCompiler=/MD_@@_ Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ PreprocDefines=_@@_ CompilerSettings=000000000000010000000000000000000000 @@ -104,7 +105,7 @@ ExeOutput=Output\Visual C++ ObjectOutput=Objects\Visual C++ OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -112,5 +113,7 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=9 -compilerType=9 +CompilerType=9 +ImagesOutput=Images\ + Modified: trunk/devpak_batchmaker/Project4.dev =================================================================== --- trunk/devpak_batchmaker/Project4.dev 2012-02-20 20:11:29 UTC (rev 1472) +++ trunk/devpak_batchmaker/Project4.dev 2012-02-20 20:23:37 UTC (rev 1473) @@ -68,7 +68,7 @@ AutoIncBuildNrOnRebuild=0 AutoIncBuildNrOnCompile=0 -[Profile0] +[Profile1] ProfileName=MingW gcc Type=0 ObjFiles= @@ -80,13 +80,13 @@ Compiler= CppCompiler= Linker=-mwindows_@@_-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 +PreprocDefines=__WXMSW___@@___GNUWIN32___@@__UNICODE_@@_ CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -94,9 +94,10 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=0 -compilerType=0 +CompilerType=0 +ImagesOutput=Images\ -[Profile1] +[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -105,8 +106,8 @@ PrivateResource= ResourceIncludes= MakeIncludes= -Compiler= -CppCompiler= +Compiler=/MD_@@_ +CppCompiler=/MD_@@_ Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ PreprocDefines=_@@_ CompilerSettings=000000000000010000000000000000000000 @@ -114,7 +115,7 @@ ExeOutput=Output\Visual C++ ObjectOutput=Objects\Visual C++ OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -122,5 +123,10 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=9 +CompilerType=9 +ImagesOutput=Images\ + + +=9 compilerType=9 Modified: trunk/devpak_batchmaker/Project5.dev =================================================================== --- trunk/devpak_batchmaker/Project5.dev 2012-02-20 20:11:29 UTC (rev 1472) +++ trunk/devpak_batchmaker/Project5.dev 2012-02-20 20:23:37 UTC (rev 1473) @@ -78,7 +78,7 @@ AutoIncBuildNrOnRebuild=0 AutoIncBuildNrOnCompile=0 -[Profile0] +[Profile1] ProfileName=MingW gcc Type=0 ObjFiles= @@ -90,13 +90,13 @@ Compiler= CppCompiler= Linker=-mwindows_@@_-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 +PreprocDefines=__WXMSW___@@___GNUWIN32___@@__UNICODE_@@_ CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -104,9 +104,10 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=0 -compilerType=0 +CompilerType=0 +ImagesOutput=Images\ -[Profile1] +[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -115,8 +116,8 @@ PrivateResource= ResourceIncludes= MakeIncludes= -Compiler= -CppCompiler= +Compiler=/MD_@@_ +CppCompiler=/MD_@@_ Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ PreprocDefines=_@@_ CompilerSettings=000000000000010000000000000000000000 @@ -124,7 +125,7 @@ ExeOutput=Output\Visual C++ ObjectOutput=Objects\Visual C++ OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -132,5 +133,7 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=9 -compilerType=9 +CompilerType=9 +ImagesOutput=Images\ + Modified: trunk/devpak_batchmaker/Project6.dev =================================================================== --- trunk/devpak_batchmaker/Project6.dev 2012-02-20 20:11:29 UTC (rev 1472) +++ trunk/devpak_batchmaker/Project6.dev 2012-02-20 20:23:37 UTC (rev 1473) @@ -88,7 +88,7 @@ AutoIncBuildNrOnRebuild=0 AutoIncBuildNrOnCompile=0 -[Profile0] +[Profile1] ProfileName=MingW gcc Type=0 ObjFiles= @@ -100,13 +100,13 @@ Compiler= CppCompiler= Linker=-mwindows_@@_-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 +PreprocDefines=__WXMSW___@@___GNUWIN32___@@__UNICODE_@@_ CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -114,9 +114,10 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=0 -compilerType=0 +CompilerType=0 +ImagesOutput=Images\ -[Profile1] +[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -125,8 +126,8 @@ PrivateResource= ResourceIncludes= MakeIncludes= -Compiler= -CppCompiler= +Compiler=/MD_@@_ +CppCompiler=/MD_@@_ Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ PreprocDefines=_@@_ CompilerSettings=000000000000010000000000000000000000 @@ -134,7 +135,7 @@ ExeOutput=Output\Visual C++ ObjectOutput=Objects\Visual C++ OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -142,5 +143,7 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=9 -compilerType=9 +CompilerType=9 +ImagesOutput=Images\ + Modified: trunk/devpak_batchmaker/Project9.dev =================================================================== --- trunk/devpak_batchmaker/Project9.dev 2012-02-20 20:11:29 UTC (rev 1472) +++ trunk/devpak_batchmaker/Project9.dev 2012-02-20 20:23:37 UTC (rev 1473) @@ -118,7 +118,7 @@ AutoIncBuildNrOnRebuild=0 AutoIncBuildNrOnCompile=0 -[Profile0] +[Profile1] ProfileName=MingW gcc Type=0 ObjFiles= @@ -130,13 +130,13 @@ Compiler= CppCompiler= Linker=-mwindows_@@_-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 +PreprocDefines=__WXMSW___@@___GNUWIN32___@@__UNICODE_@@_ CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -144,9 +144,10 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=0 -compilerType=0 +CompilerType=0 +ImagesOutput=Images\ -[Profile1] +[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -155,8 +156,8 @@ PrivateResource= ResourceIncludes= MakeIncludes= -Compiler= -CppCompiler= +Compiler=/MD_@@_ +CppCompiler=/MD_@@_ Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ PreprocDefines=_@@_ CompilerSettings=000000000000010000000000000000000000 @@ -164,7 +165,7 @@ ExeOutput=Output\Visual C++ ObjectOutput=Objects\Visual C++ OverrideOutput=0 -OverrideOutputName= +OverrideOutputName=calendar.exe HostApplication= CommandLine= UseCustomMakefile=0 @@ -172,5 +173,7 @@ IncludeVersionInfo=0 SupportXPThemes=0 CompilerSet=9 -compilerType=9 +CompilerType=9 +ImagesOutput=Images\ + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-02-20 20:11:35
|
Revision: 1472 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1472&view=rev Author: tbreina Date: 2012-02-20 20:11:29 +0000 (Mon, 20 Feb 2012) Log Message: ----------- Updated devpak batchmaker templates Modified Paths: -------------- trunk/devpak_batchmaker/Project1.dev trunk/devpak_batchmaker/Project10.dev trunk/devpak_batchmaker/Project11.dev trunk/devpak_batchmaker/Project2.dev trunk/devpak_batchmaker/Project3.dev trunk/devpak_batchmaker/Project4.dev trunk/devpak_batchmaker/Project5.dev trunk/devpak_batchmaker/Project6.dev trunk/devpak_batchmaker/Project9.dev Modified: trunk/devpak_batchmaker/Project1.dev =================================================================== --- trunk/devpak_batchmaker/Project1.dev 2012-02-20 04:40:25 UTC (rev 1471) +++ trunk/devpak_batchmaker/Project1.dev 2012-02-20 20:11:29 UTC (rev 1472) @@ -6,8 +6,8 @@ PchSource=-1 Ver=3 IsCpp=1 -ProfilesCount=3 -ProfileIndex=1 +ProfilesCount=2 +ProfileIndex=0 Folders= [Unit1] @@ -52,7 +52,7 @@ CppCompiler= Linker=-mwindows_@@_-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 -CompilerSettings=0000000001001000000000 +CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW @@ -68,34 +68,6 @@ compilerType=0 [Profile1] -ProfileName=Visual C++ 2005 -Type=0 -ObjFiles= -Includes= -Libs= -PrivateResource= -ResourceIncludes= -MakeIncludes= -Compiler= -CppCompiler= -Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ -PreprocDefines=_@@_ -CompilerSettings=000000000000010000000000000000000000 -Icon= -ExeOutput=Output\Visual C++ 2005 -ObjectOutput=Objects\Visual C++ 2005 -OverrideOutput=0 -OverrideOutputName= -HostApplication= -CommandLine= -UseCustomMakefile=0 -CustomMakefile= -IncludeVersionInfo=0 -SupportXPThemes=0 -CompilerSet=1 -compilerType=1 - -[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -120,5 +92,5 @@ CustomMakefile= IncludeVersionInfo=0 SupportXPThemes=0 -CompilerSet=5 -compilerType=5 +CompilerSet=9 +compilerType=9 Modified: trunk/devpak_batchmaker/Project10.dev =================================================================== --- trunk/devpak_batchmaker/Project10.dev 2012-02-20 04:40:25 UTC (rev 1471) +++ trunk/devpak_batchmaker/Project10.dev 2012-02-20 20:11:29 UTC (rev 1472) @@ -6,7 +6,7 @@ PchSource=-1 Ver=3 IsCpp=1 -ProfilesCount=3 +ProfilesCount=2 ProfileIndex=0 Folders= @@ -123,7 +123,7 @@ CppCompiler= Linker=-mwindows_@@_-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 -CompilerSettings=0000000001001000000000 +CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW @@ -139,34 +139,6 @@ compilerType=0 [Profile1] -ProfileName=Visual C++ 2005 -Type=0 -ObjFiles= -Includes= -Libs= -PrivateResource= -ResourceIncludes= -MakeIncludes= -Compiler= -CppCompiler= -Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ -PreprocDefines=_@@_ -CompilerSettings=000000000000010000000000000000000000 -Icon= -ExeOutput=Output\Visual C++ 2005 -ObjectOutput=Objects\Visual C++ 2005 -OverrideOutput=0 -OverrideOutputName= -HostApplication= -CommandLine= -UseCustomMakefile=0 -CustomMakefile= -IncludeVersionInfo=0 -SupportXPThemes=0 -CompilerSet=1 -compilerType=1 - -[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -191,5 +163,6 @@ CustomMakefile= IncludeVersionInfo=0 SupportXPThemes=0 -CompilerSet=5 -compilerType=5 +CompilerSet=9 +compilerType=9 + Modified: trunk/devpak_batchmaker/Project11.dev =================================================================== --- trunk/devpak_batchmaker/Project11.dev 2012-02-20 04:40:25 UTC (rev 1471) +++ trunk/devpak_batchmaker/Project11.dev 2012-02-20 20:11:29 UTC (rev 1472) @@ -6,7 +6,7 @@ PchSource=-1 Ver=3 IsCpp=1 -ProfilesCount=3 +ProfilesCount=2 ProfileIndex=0 Folders= @@ -132,7 +132,7 @@ CppCompiler= Linker=-mwindows_@@_-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 -CompilerSettings=0000000001001000000000 +CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW @@ -148,34 +148,6 @@ compilerType=0 [Profile1] -ProfileName=Visual C++ 2005 -Type=0 -ObjFiles= -Includes= -Libs= -PrivateResource= -ResourceIncludes= -MakeIncludes= -Compiler= -CppCompiler= -Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ -PreprocDefines=_@@_ -CompilerSettings=000000000000010000000000000000000000 -Icon= -ExeOutput=Output\Visual C++ 2005 -ObjectOutput=Objects\Visual C++ 2005 -OverrideOutput=0 -OverrideOutputName= -HostApplication= -CommandLine= -UseCustomMakefile=0 -CustomMakefile= -IncludeVersionInfo=0 -SupportXPThemes=0 -CompilerSet=1 -compilerType=1 - -[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -200,5 +172,6 @@ CustomMakefile= IncludeVersionInfo=0 SupportXPThemes=0 -CompilerSet=5 -compilerType=5 +CompilerSet=9 +compilerType=9 + Modified: trunk/devpak_batchmaker/Project2.dev =================================================================== --- trunk/devpak_batchmaker/Project2.dev 2012-02-20 04:40:25 UTC (rev 1471) +++ trunk/devpak_batchmaker/Project2.dev 2012-02-20 20:11:29 UTC (rev 1472) @@ -6,7 +6,7 @@ PchSource=-1 Ver=3 IsCpp=1 -ProfilesCount=3 +ProfilesCount=2 ProfileIndex=0 Folders= @@ -61,7 +61,7 @@ CppCompiler= Linker=-mwindows_@@_-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 -CompilerSettings=0000000001001000000000 +CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW @@ -77,34 +77,6 @@ compilerType=0 [Profile1] -ProfileName=Visual C++ 2005 -Type=0 -ObjFiles= -Includes= -Libs= -PrivateResource= -ResourceIncludes= -MakeIncludes= -Compiler= -CppCompiler= -Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ -PreprocDefines=_@@_ -CompilerSettings=000000000000010000000000000000000000 -Icon= -ExeOutput=Output\Visual C++ 2005 -ObjectOutput=Objects\Visual C++ 2005 -OverrideOutput=0 -OverrideOutputName= -HostApplication= -CommandLine= -UseCustomMakefile=0 -CustomMakefile= -IncludeVersionInfo=0 -SupportXPThemes=0 -CompilerSet=1 -compilerType=1 - -[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -129,5 +101,6 @@ CustomMakefile= IncludeVersionInfo=0 SupportXPThemes=0 -CompilerSet=5 -compilerType=5 +CompilerSet=9 +compilerType=9 + Modified: trunk/devpak_batchmaker/Project3.dev =================================================================== --- trunk/devpak_batchmaker/Project3.dev 2012-02-20 04:40:25 UTC (rev 1471) +++ trunk/devpak_batchmaker/Project3.dev 2012-02-20 20:11:29 UTC (rev 1472) @@ -6,7 +6,7 @@ PchSource=-1 Ver=3 IsCpp=1 -ProfilesCount=3 +ProfilesCount=2 ProfileIndex=0 Folders= @@ -71,7 +71,7 @@ CppCompiler= Linker=-mwindows_@@_-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 -CompilerSettings=0000000001001000000000 +CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW @@ -87,34 +87,6 @@ compilerType=0 [Profile1] -ProfileName=Visual C++ 2005 -Type=0 -ObjFiles= -Includes= -Libs= -PrivateResource= -ResourceIncludes= -MakeIncludes= -Compiler= -CppCompiler= -Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ -PreprocDefines=_@@_ -CompilerSettings=000000000000010000000000000000000000 -Icon= -ExeOutput=Output\Visual C++ 2005 -ObjectOutput=Objects\Visual C++ 2005 -OverrideOutput=0 -OverrideOutputName= -HostApplication= -CommandLine= -UseCustomMakefile=0 -CustomMakefile= -IncludeVersionInfo=0 -SupportXPThemes=0 -CompilerSet=1 -compilerType=1 - -[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -139,5 +111,6 @@ CustomMakefile= IncludeVersionInfo=0 SupportXPThemes=0 -CompilerSet=5 -compilerType=5 +CompilerSet=9 +compilerType=9 + Modified: trunk/devpak_batchmaker/Project4.dev =================================================================== --- trunk/devpak_batchmaker/Project4.dev 2012-02-20 04:40:25 UTC (rev 1471) +++ trunk/devpak_batchmaker/Project4.dev 2012-02-20 20:11:29 UTC (rev 1472) @@ -6,7 +6,7 @@ PchSource=-1 Ver=3 IsCpp=1 -ProfilesCount=3 +ProfilesCount=2 ProfileIndex=0 Folders= @@ -81,7 +81,7 @@ CppCompiler= Linker=-mwindows_@@_-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 -CompilerSettings=0000000001001000000000 +CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW @@ -97,34 +97,6 @@ compilerType=0 [Profile1] -ProfileName=Visual C++ 2005 -Type=0 -ObjFiles= -Includes= -Libs= -PrivateResource= -ResourceIncludes= -MakeIncludes= -Compiler= -CppCompiler= -Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ -PreprocDefines=_@@_ -CompilerSettings=000000000000010000000000000000000000 -Icon= -ExeOutput=Output\Visual C++ 2005 -ObjectOutput=Objects\Visual C++ 2005 -OverrideOutput=0 -OverrideOutputName= -HostApplication= -CommandLine= -UseCustomMakefile=0 -CustomMakefile= -IncludeVersionInfo=0 -SupportXPThemes=0 -CompilerSet=1 -compilerType=1 - -[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -149,5 +121,6 @@ CustomMakefile= IncludeVersionInfo=0 SupportXPThemes=0 -CompilerSet=5 -compilerType=5 +CompilerSet=9 +compilerType=9 + Modified: trunk/devpak_batchmaker/Project5.dev =================================================================== --- trunk/devpak_batchmaker/Project5.dev 2012-02-20 04:40:25 UTC (rev 1471) +++ trunk/devpak_batchmaker/Project5.dev 2012-02-20 20:11:29 UTC (rev 1472) @@ -6,7 +6,7 @@ PchSource=-1 Ver=3 IsCpp=1 -ProfilesCount=3 +ProfilesCount=2 ProfileIndex=0 Folders= @@ -91,7 +91,7 @@ CppCompiler= Linker=-mwindows_@@_-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 -CompilerSettings=0000000001001000000000 +CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW @@ -107,34 +107,6 @@ compilerType=0 [Profile1] -ProfileName=Visual C++ 2005 -Type=0 -ObjFiles= -Includes= -Libs= -PrivateResource= -ResourceIncludes= -MakeIncludes= -Compiler= -CppCompiler= -Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ -PreprocDefines=_@@_ -CompilerSettings=000000000000010000000000000000000000 -Icon= -ExeOutput=Output\Visual C++ 2005 -ObjectOutput=Objects\Visual C++ 2005 -OverrideOutput=0 -OverrideOutputName= -HostApplication= -CommandLine= -UseCustomMakefile=0 -CustomMakefile= -IncludeVersionInfo=0 -SupportXPThemes=0 -CompilerSet=1 -compilerType=1 - -[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -159,5 +131,6 @@ CustomMakefile= IncludeVersionInfo=0 SupportXPThemes=0 -CompilerSet=5 -compilerType=5 +CompilerSet=9 +compilerType=9 + Modified: trunk/devpak_batchmaker/Project6.dev =================================================================== --- trunk/devpak_batchmaker/Project6.dev 2012-02-20 04:40:25 UTC (rev 1471) +++ trunk/devpak_batchmaker/Project6.dev 2012-02-20 20:11:29 UTC (rev 1472) @@ -6,7 +6,7 @@ PchSource=-1 Ver=3 IsCpp=1 -ProfilesCount=3 +ProfilesCount=2 ProfileIndex=0 Folders= @@ -101,7 +101,7 @@ CppCompiler= Linker=-mwindows_@@_-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 -CompilerSettings=0000000001001000000000 +CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW @@ -117,34 +117,6 @@ compilerType=0 [Profile1] -ProfileName=Visual C++ 2005 -Type=0 -ObjFiles= -Includes= -Libs= -PrivateResource= -ResourceIncludes= -MakeIncludes= -Compiler= -CppCompiler= -Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ -PreprocDefines=_@@_ -CompilerSettings=000000000000010000000000000000000000 -Icon= -ExeOutput=Output\Visual C++ 2005 -ObjectOutput=Objects\Visual C++ 2005 -OverrideOutput=0 -OverrideOutputName= -HostApplication= -CommandLine= -UseCustomMakefile=0 -CustomMakefile= -IncludeVersionInfo=0 -SupportXPThemes=0 -CompilerSet=1 -compilerType=1 - -[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -169,5 +141,6 @@ CustomMakefile= IncludeVersionInfo=0 SupportXPThemes=0 -CompilerSet=5 -compilerType=5 +CompilerSet=9 +compilerType=9 + Modified: trunk/devpak_batchmaker/Project9.dev =================================================================== --- trunk/devpak_batchmaker/Project9.dev 2012-02-20 04:40:25 UTC (rev 1471) +++ trunk/devpak_batchmaker/Project9.dev 2012-02-20 20:11:29 UTC (rev 1472) @@ -6,7 +6,7 @@ PchSource=-1 Ver=3 IsCpp=1 -ProfilesCount=3 +ProfilesCount=2 ProfileIndex=0 Folders= @@ -131,7 +131,7 @@ CppCompiler= Linker=-mwindows_@@_-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 -CompilerSettings=0000000001001000000000 +CompilerSettings=0000000000000000000000 Icon= ExeOutput=Output\MingW ObjectOutput=Objects\MingW @@ -147,34 +147,6 @@ compilerType=0 [Profile1] -ProfileName=Visual C++ 2005 -Type=0 -ObjFiles= -Includes= -Libs= -PrivateResource= -ResourceIncludes= -MakeIncludes= -Compiler= -CppCompiler= -Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxscintilla.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_ -PreprocDefines=_@@_ -CompilerSettings=000000000000010000000000000000000000 -Icon= -ExeOutput=Output\Visual C++ 2005 -ObjectOutput=Objects\Visual C++ 2005 -OverrideOutput=0 -OverrideOutputName= -HostApplication= -CommandLine= -UseCustomMakefile=0 -CustomMakefile= -IncludeVersionInfo=0 -SupportXPThemes=0 -CompilerSet=1 -compilerType=1 - -[Profile2] ProfileName=MS Visual C++ Type=0 ObjFiles= @@ -199,5 +171,6 @@ CustomMakefile= IncludeVersionInfo=0 SupportXPThemes=0 -CompilerSet=5 -compilerType=5 +CompilerSet=9 +compilerType=9 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tb...@us...> - 2012-02-20 04:40:31
|
Revision: 1471 http://wxdsgn.svn.sourceforge.net/wxdsgn/?rev=1471&view=rev Author: tbreina Date: 2012-02-20 04:40:25 +0000 (Mon, 20 Feb 2012) Log Message: ----------- More templates Modified Paths: -------------- trunk/devpak_batchmaker/Templates/4-DLL.template Modified: trunk/devpak_batchmaker/Templates/4-DLL.template =================================================================== --- trunk/devpak_batchmaker/Templates/4-DLL.template 2012-02-20 04:33:25 UTC (rev 1470) +++ trunk/devpak_batchmaker/Templates/4-DLL.template 2012-02-20 04:40:25 UTC (rev 1471) @@ -57,7 +57,7 @@ MakeIncludes= Compiler=-DBUILDING_DLL=1 CppCompiler=-DBUILDING_DLL=1 -Linker=--no-export-all-symbols_@@_-Wl,--add-stdcall-alias +Linker=-Wl,--add-stdcall-alias PreprocDefines= CompilerSettings=0000000000000000000000 Icon= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |