compilation fix for other (than GTK/MSW) ports

[wxWidgets.git] / src / mgl / window.cpp

diff --git a/src/mgl/window.cpp b/src/mgl/window.cpp
index 61e992901fd0f4cea532e80d63103a599f451689..8f3bb0905a71900b8554ddb47a3d1325fabbf3a4 100644 (file)
--- a/src/mgl/window.cpp
+++ b/src/mgl/window.cpp
@@ -180,6 +180,8 @@ static ibool wxWindowMouseHandler(window_t *wnd, event_t *e)
     wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
     wxPoint where = win->ScreenToClient(wxPoint(e->where_x, e->where_y));
     
+    if ( !win->IsEnabled() ) return FALSE;
+    
     wxEventType type = wxEVT_NULL;
     wxMouseEvent event;
     event.SetEventObject(win);
@@ -387,6 +389,9 @@ static ibool wxWindowKeybHandler(window_t *wnd, event_t *e)
 {
     wxEventType type = wxEVT_NULL;
     wxWindowMGL *win = (wxWindowMGL*)MGL_wmGetWindowUserData(wnd);
+
+    if ( !win->IsEnabled() ) return FALSE;
+
     wxPoint where = win->ScreenToClient(wxPoint(e->where_x, e->where_y));
     
     wxKeyEvent event;
@@ -847,9 +852,7 @@ void wxWindowMGL::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
         y = currentY;
 
-#if 0 // FIXME_MGL -- what's this good for?
     AdjustForParentClientOrigin(x, y, sizeFlags);
-#endif
 
     wxSize size(-1, -1);
     if ( width == -1 )