don't lock the gs_prevCS critical section recursively (replaces patch 1857581)

[wxWidgets.git] / include / wx / x11 / window.h

diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index 8480c4760f9f6dc3585a759616fd792108eb78dc..6c04d16eac9c859f4483102634c4f1f05cfbfc5c 100644 (file)
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -81,10 +81,6 @@ public:
     virtual void ScrollWindow( int dx, int dy,
         const wxRect* rect = (wxRect *) NULL );
 
-    virtual void DoSetSizeHints(int minW, int minH,
-        int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
-        int incW = wxDefaultCoord, int incH = wxDefaultCoord);
-
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget );
 #endif // wxUSE_DRAG_AND_DROP
@@ -179,6 +175,9 @@ protected:
         int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetClientSize(int width, int height);
     virtual void DoMoveWindow(int x, int y, int width, int height);
+    virtual void DoSetSizeHints(int minW, int minH,
+        int maxW, int maxH,
+        int incW, int incH);
     virtual void DoCaptureMouse();
     virtual void DoReleaseMouse();