Native wxBitmapComboBox patch for GTK+

[wxWidgets.git] / include / wx / gtk / mdi.h

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index ee20c378be3493131f6d069d4fb9b222cb6c6db5..53a3cdecebb9a69067e6b8164d8cad90338749ba 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -12,6 +12,9 @@
 
 #include "wx/frame.h"
 
+class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
+class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
+
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
 //-----------------------------------------------------------------------------
@@ -58,11 +61,11 @@ public:
     wxMDIClientWindow  *m_clientWindow;
     bool                m_justInserted;
 
-    virtual void GtkOnSize();
     virtual void OnInternalIdle();
 
 protected:
     void Init();
+    virtual void DoGetClientSize(int* width, int* height) const;
 
 private:
     friend class wxMDIChildFrame;
@@ -115,14 +118,6 @@ public:
     virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
 #endif
 
-    // no size hints
-    virtual void DoSetSizeHints( int WXUNUSED(minW),
-                                 int WXUNUSED(minH),
-                                 int WXUNUSED(maxW) = wxDefaultCoord,
-                                 int WXUNUSED(maxH) = wxDefaultCoord,
-                                 int WXUNUSED(incW) = wxDefaultCoord,
-                                 int WXUNUSED(incH) = wxDefaultCoord) {}
-
 #if wxUSE_TOOLBAR
     // no toolbar
     virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
@@ -165,6 +160,11 @@ protected:
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
+    // no size hints
+    virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH),
+                                int WXUNUSED(maxW), int WXUNUSED(maxH),
+                                int WXUNUSED(incW), int WXUNUSED(incH)) {}
+
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)