give a name to the enumeration of the values which can be passed to OnDrawItem to...

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

diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index 5556bd97f727811650653c666ac395c00293c384..b28d6706e5c6fb3639173625ef64bcade3dc304e 100644 (file)
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -20,8 +20,8 @@
 
 class WXDLLIMPEXP_CORE wxWindowX11 : public wxWindowBase
 {
-    friend class WXDLLEXPORT wxDC;
-    friend class WXDLLEXPORT wxWindowDC;
+    friend class WXDLLIMPEXP_FWD_CORE wxDC;
+    friend class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 
 public:
     wxWindowX11() { Init(); }
@@ -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();
 
@@ -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++; }