summaryrefslogtreecommitdiff
path: root/src/corelib/gdi
diff options
context:
space:
mode:
authorgraemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf>2007-08-16 22:25:51 +0000
committergraemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf>2007-08-16 22:25:51 +0000
commite79ea347696ace24847855858dc6933f17e38b16 (patch)
tree3f39889c0a487a413471d497d20154b0b5047a5b /src/corelib/gdi
parent3dd56613512accb42a9cb8a986bad0e8f2635eae (diff)
downloadfpGUI-e79ea347696ace24847855858dc6933f17e38b16.tar.xz
* Fixed bug where GFX based applications crashed on run.
* Fixed GDI bug where mouse cursor didn't change at the edges of a window. * Fixed a minor bug in the reporting of coordinates in the eventtest example.
Diffstat (limited to 'src/corelib/gdi')
-rw-r--r--src/corelib/gdi/gfx_gdi.pas13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/corelib/gdi/gfx_gdi.pas b/src/corelib/gdi/gfx_gdi.pas
index 70c8aa16..83b25bbf 100644
--- a/src/corelib/gdi/gfx_gdi.pas
+++ b/src/corelib/gdi/gfx_gdi.pas
@@ -506,11 +506,9 @@ begin
// {$IFDEF DEBUG} write(w.ClassName + ': '); {$ENDIF}
//Writeln('Hittest: ',IntToHex((lParam and $FFFF),4));
if (lParam and $FFFF) <= 1 then
- begin
- w.DoSetMouseCursor;
-// ptkSetMouseCursor(wg.WinHandle, wg.MouseCursor);
- end
-// else Result := Windows.DefWindowProc(hwnd, uMsg, wParam, lParam);
+ w.DoSetMouseCursor
+ else
+ Windows.DefWindowProc(hwnd, uMsg, wParam, lParam);
end;
@@ -797,7 +795,10 @@ var
mp: boolean;
begin
timerid := 0;
- ltimerWnd := TfpgWindowImpl(wapplication.MainForm).WinHandle;
+ if Assigned(wapplication.MainForm) then
+ ltimerWnd := TfpgWindowImpl(wapplication.MainForm).WinHandle
+ else
+ ltimerWnd := 0;
if (atimeoutms >= 0) and (not DoMessagesPending) then
begin