From f7ff95ea38d6ede0753b80c613e7071881426d2b Mon Sep 17 00:00:00 2001 From: Wizzup? Date: Mon, 4 Jan 2010 19:56:53 +0000 Subject: [PATCH] Several compilation fixes. git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@372 3f818213-9676-44b0-a9b4-5e4c4e03d09d --- Units/MMLCore/window.pas | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/Units/MMLCore/window.pas b/Units/MMLCore/window.pas index b642811..52e834a 100644 --- a/Units/MMLCore/window.pas +++ b/Units/MMLCore/window.pas @@ -234,8 +234,12 @@ procedure TMWindow.OnSetTarget(NewTarget,OldTarget : TTargetWindowMode); begin case OldTarget of w_Window: begin + {$IFDEF WINDOWS} if not Self.TargetDC= Self.DesktopDC then ReleaseDC(Self.TargetHandle,Self.TargetDC); + {$ELSE} + raise Exception.Create('Handle/DC not supported on Linux'); + {$ENDIF} end; w_XWindow: Self.FreeReturnData; end; @@ -295,11 +299,27 @@ var begin case Self.TargetMode of w_BMP : result := TargetBitmap <> nil; - w_Window : result := IsWindow(self.TargetHandle); + w_Window : + begin + {$IFDEF WINDOWS} + result := IsWindow(self.TargetHandle); + {$ELSE} + Raise Exception.Create('TargetValid: Linux and w_Window'); + result := False; + {$ENDIF} + end; w_ArrayPtr : result := ArrayPtr <> nil; - w_HDC : result := Self.TargetDC <> 0; + w_HDC : + begin + {$IFDEF WINDOWS} + result := Self.TargetDC <> 0; + {$ELSE} + Raise Exception.Create('TargetValid: Linux and w_HDC'); + result := False; + {$ENDIF} + end; w_XWindow : begin - {$IFDEF LINUX} + {$IFDEF LINUX} old_handler := XSetErrorHandler(@MufasaXErrorHandler); { There must be a better way to do this, at least with less overhead. } if XGetWindowAttributes(Self.XDisplay, Self.CurWindow, @Attrib) = 0 then @@ -650,7 +670,7 @@ var begin if Self.Frozen then raise Exception.CreateFMT('You cannot set a target when Frozen',[]); - OnSetTarget(w_XWindow,Self.TargetMode) + OnSetTarget(w_XWindow,Self.TargetMode); Self.CurWindow := XWindow; end; {$ENDIF}