Last part from weak ref patch for event sink disconnection

[wxWidgets.git] / include / wx / generic / mdig.h

diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index d7c560d2c31093dda6faa3290349d1c09b10a3b1..11f75518b6c813094b9ee09f2bf82491e1d41121 100644 (file)
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -20,17 +20,16 @@
 #include "wx/panel.h"
 #include "wx/notebook.h"
 
 #include "wx/panel.h"
 #include "wx/notebook.h"
 

-extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
-extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[];

 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGenericMDIParentFrame;
-class WXDLLEXPORT wxGenericMDIClientWindow;
-class WXDLLEXPORT wxGenericMDIChildFrame;
+class WXDLLIMPEXP_FWD_CORE wxGenericMDIParentFrame;
+class WXDLLIMPEXP_FWD_CORE wxGenericMDIClientWindow;
+class WXDLLIMPEXP_FWD_CORE wxGenericMDIChildFrame;

 
 //-----------------------------------------------------------------------------
 // wxGenericMDIParentFrame
 
 //-----------------------------------------------------------------------------
 // wxGenericMDIParentFrame


@@ -153,14 +152,6 @@ public:
     virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
 #endif
 
     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 bars
     virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
 #if wxUSE_TOOLBAR
     // no toolbar bars
     virtual wxToolBar* CreateToolBar( long WXUNUSED(style),


@@ -171,8 +162,7 @@ public:
 #endif
 
     // no icon
 #endif
 
     // no icon

-    void SetIcon( const wxIcon& WXUNUSED(icon) ) { }
-    void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }
+    virtual void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }

 
     // no maximize etc
     virtual void Maximize( bool WXUNUSED(maximize) = true) { /* Has no effect */ }
 
     // no maximize etc
     virtual void Maximize( bool WXUNUSED(maximize) = true) { /* Has no effect */ }


@@ -209,6 +199,11 @@ protected:
 
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
 
     virtual void DoMoveWindow(int x, int y, int width, int height);
 

+    // no size hints
+    virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH),
+                                int WXUNUSED(maxW), int WXUNUSED(maxH),
+                                int WXUNUSED(incW), int WXUNUSED(incH)) {}
+

     // This function needs to be called when a size change is confirmed,
     // we needed this function to prevent any body from the outside
     // changing the panel... it messes the UI layout when we would allow it.
     // This function needs to be called when a size change is confirmed,
     // we needed this function to prevent any body from the outside
     // changing the panel... it messes the UI layout when we would allow it.