another fix for wxUSE_DRAG_AND_DROP==0 build

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

diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index 8480c4760f9f6dc3585a759616fd792108eb78dc..a4353eaf9d0ac851fe77a274cdf387e7cfcdccf2 100644 (file)
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -73,17 +73,13 @@ public:
     virtual int GetCharWidth() const;
     virtual void GetTextExtent(const wxString& string,
         int *x, int *y,
-        int *descent = (int *) NULL,
-        int *externalLeading = (int *) NULL,
+        int *descent = NULL,
+        int *externalLeading = NULL,
         const wxFont *theFont = (const wxFont *) NULL)
         const;
 
     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);
+        const wxRect* rect = NULL );
 
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget( wxDropTarget *dropTarget );
@@ -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();
 
@@ -206,7 +205,7 @@ private:
 // optimisation, it will be reenabled as soon as the object goes out from scope.
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxNoOptimize
+class WXDLLIMPEXP_CORE wxNoOptimize
 {
 public:
     wxNoOptimize() { ms_count++; }