4 files changed, 15 insertions, 8 deletions
diff --git a/gfx/gdi/gfx_gdi.pas b/gfx/gdi/gfx_gdi.pas
index 2be9f903..b04a4bb7 100644
--- a/gfx/gdi/gfx_gdi.pas
+++ b/gfx/gdi/gfx_gdi.pas
@@ -189,6 +189,8 @@ type
     procedure   UpdateWindowButtons;
     function    DoMouseEnterLeaveCheck(uMsg, wParam, lParam: Cardinal): Boolean;
     procedure   EvInternalPaint;
+    { Event processing methods }
+    procedure   EvPaint; override;
   public
     { Constructors / Destructors }
     constructor Create(AParent: TFCustomWindow; AWindowOptions: TFWindowOptions); override;
@@ -217,7 +219,7 @@ type
     procedure   EvMouseReleased(AButton: TMouseButton; const AMousePos: TPoint); override;
     procedure   EvMouseMove(const AMousePos: TPoint); override;
     procedure   EvMouseWheel(AWheelDelta: Single; const AMousePos: TPoint); override;
-    procedure   EvPaint; override;
+//    procedure   EvPaint; override;
     procedure   EvMove; override;
     procedure   EvResize; override;
     procedure   EvShow; override;
@@ -1655,7 +1657,7 @@ begin
 
   { Execution of user paint code }
 
-  EvPaint();
+  EvPaint;
 
   { Flushes the result to the screen }
 
diff --git a/gfx/gfxbase.pas b/gfx/gfxbase.pas
index c525a13b..9b5c2724 100644
--- a/gfx/gfxbase.pas
+++ b/gfx/gfxbase.pas
@@ -505,6 +505,8 @@ type
     procedure SetTitle(const ATitle: String); virtual;
     procedure DoSetCursor; virtual; abstract;
     function  GetHandle: PtrUInt; virtual; abstract;
+
+    procedure EvPaint; virtual; abstract;
   public
     { Constructors / Destructors }
     constructor Create(AParent: TFCustomWindow; AWindowOptions: TFWindowOptions); virtual;
@@ -535,7 +537,7 @@ type
     procedure EvMouseReleased(AButton: TMouseButton; const AMousePos: TPoint); virtual; abstract;
     procedure EvMouseMove(const AMousePos: TPoint); virtual; abstract;
     procedure EvMouseWheel(AWheelDelta: Single; const AMousePos: TPoint); virtual; abstract;
-    procedure EvPaint; virtual; abstract;
+//    procedure EvPaint; virtual; abstract;
     procedure EvMove; virtual; abstract;
     procedure EvResize; virtual; abstract;
     procedure EvShow; virtual; abstract;
diff --git a/gfx/x11/fpgfxpackage.pas b/gfx/x11/fpgfxpackage.pas
index e3e60e76..f6e51e3b 100644
--- a/gfx/x11/fpgfxpackage.pas
+++ b/gfx/x11/fpgfxpackage.pas
@@ -7,7 +7,7 @@ unit fpgfxpackage;
 interface
 
 uses
-  GfxBase, GFX_X11, gfxinterface, schar16, unitkeys, fpgfx, GELImage, 
+  GfxBase, GFX_X11, gfxinterface, schar16, unitkeys, fpgfx, GELDirty, GELImage, 
     CommandLineParams, fpUTF8Utils; 
 
 implementation
diff --git a/gfx/x11/gfx_x11.pas b/gfx/x11/gfx_x11.pas
index 8ee0aa5d..f438bf77 100644
--- a/gfx/x11/gfx_x11.pas
+++ b/gfx/x11/gfx_x11.pas
@@ -241,6 +241,9 @@ type
     procedure   DoSetCursor; override;
     function    GetHandle: PtrUInt; override;
     procedure   UpdateMotifWMHints;
+
+    { Event processing methods }
+    procedure   EvPaint; override;
   public
     { Constructors / Destructors }
     constructor Create(AParent: TFCustomWindow; AWindowOptions: TFWindowOptions); override;
@@ -269,7 +272,7 @@ type
     procedure   EvMouseReleased(AButton: TMouseButton; const AMousePos: TPoint); override;
     procedure   EvMouseMove(const AMousePos: TPoint); override;
     procedure   EvMouseWheel(AWheelDelta: Single; const AMousePos: TPoint); override;
-    procedure   EvPaint; override;
+//    procedure   EvPaint; override;
     procedure   EvMove; override;
     procedure   EvResize; override;
     procedure   EvShow; override;
@@ -1011,7 +1014,7 @@ end;
 procedure TX11Application.Run;
 var
   XEvent: TXEvent;
-  WindowEntry: TFCustomWindow;
+  WindowEntry: TX11Window;
   MouseButton: TMouseButton;
   Sum: Integer;
   NewEvent: TXEvent;
@@ -1041,7 +1044,7 @@ begin
     // According to a comment in X.h, the valid event types start with 2!
     if XEvent._type >= 2 then
     begin
-      WindowEntry := FindWindowByXID(XEvent.XAny.Window);
+      WindowEntry := TX11Window(FindWindowByXID(XEvent.XAny.Window));
 
       if not Assigned(WindowEntry) then
       begin
@@ -1049,7 +1052,7 @@ begin
         continue;
       end;
       
-      TX11Window(WindowEntry).FXEvent := @XEvent;
+      WindowEntry.FXEvent := @XEvent;
 
       case XEvent._type of
        X.DestroyNotify: