paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-12 20:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed win32 intf showmoadl and lazconf

Browse Source 
git-svn-id: trunk@4588 -
This commit is contained in:
mattias 2003-09-09 11:11:02 +00:00
parent b93c3874b3
commit fb960f29e0
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ide/include/win32/lazconf.inc
View File

@ -103,7 +103,7 @@ end;
function FindDefaultCompilerPath: string; function FindDefaultCompilerPath: string;
begin begin
Result:=SearchFileInPath('ppc386.exe','',GetEnv('PATH'),':', Result:=SearchFileInPath('ppc386.exe','',GetEnv('PATH'),';',
[sffDontSearchInBasePath]); [sffDontSearchInBasePath]);
if Result<>'' then exit; if Result<>'' then exit;
Result:='c:\pp\bin\win32\ppc386.exe'; Result:='c:\pp\bin\win32\ppc386.exe';
@ -112,7 +112,7 @@ end;
function FindDefaultMakePath: string; function FindDefaultMakePath: string;
begin begin
Result:=SearchFileInPath('make.exe','',GetEnv('PATH'),':', Result:=SearchFileInPath('make.exe','',GetEnv('PATH'),';',
[sffDontSearchInBasePath]); [sffDontSearchInBasePath]);
end; end;
@ -142,7 +142,6 @@ begin
Result:='c:\temp\'; Result:='c:\temp\';
if DirectoryExists(Result) then exit; if DirectoryExists(Result) then exit;
Result:='c:\windows\temp\'; Result:='c:\windows\temp\';
if DirectoryExists(Result) then exit;
end; end;
procedure GetDefaultCompilerFilenames(List: TStrings); procedure GetDefaultCompilerFilenames(List: TStrings);
@ -161,14 +160,17 @@ end;
---------------------------------------------------------------------------} ---------------------------------------------------------------------------}
procedure InternalInit; procedure InternalInit;
begin begin
PrimaryConfigPath:=ExtractFilePath(Paramstr(0)); PrimaryConfigPath:=ChompPathDelim(ExtractFilePath(Paramstr(0)));
{ This need some work. Probably one can use the Windows API to SecondaryConfigPath:=GetEnv('WINDIR');
get the system path. } If SecondaryConfigPath = '' Then
SecondaryConfigPath:='\windows\system'; SecondaryConfigPath:='c:\windows';
end; end;
{ {
$Log$ $Log$
Revision 1.14 2003/09/09 11:11:02 mattias
fixed win32 intf showmoadl and lazconf
Revision 1.13 2003/08/25 12:16:14 marco Revision 1.13 2003/08/25 12:16:14 marco
* reverted last patch. CVS dirty. * reverted last patch. CVS dirty.

6
lcl/interfaces/win32/win32callback.inc
View File

@ -306,6 +306,9 @@ Begin
WM_DESTROY: WM_DESTROY:
Begin Begin
Assert(False, 'Trace:WindowProc - Got WM_DESTROY'); Assert(False, 'Trace:WindowProc - Got WM_DESTROY');
If OwnerObject Is TCustomForm then
If fsModal in TCustomForm(OwnerObject).FormState then
EnumThreadWindows(GetWindowThreadProcessId(Window,nil),@EnableWindowsProc, Window);
EnumProps(Window, @PropEnumProc); EnumProps(Window, @PropEnumProc);
LMessage.Msg := LM_DESTROY; LMessage.Msg := LM_DESTROY;
PostQuitMessage(0); PostQuitMessage(0);
@ -754,6 +757,9 @@ end;
{ {
$Log$ $Log$
Revision 1.57 2003/09/09 11:11:02 mattias
fixed win32 intf showmoadl and lazconf
Revision 1.56 2003/09/08 12:21:48 mattias Revision 1.56 2003/09/08 12:21:48 mattias
added fpImage reader/writer hooks to TBitmap added fpImage reader/writer hooks to TBitmap