Menu
▾
▴
[Wxdsgn-svn] SF.net SVN: wxdsgn:[1478] trunk/wxdevcpp/source
|
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.
|