X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..66db4345cfd449cc9a74f544916fab5e2a6b0e80:/include/wx/generic/mdig.h

diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index 39c2ee2ff2..bee3506d09 100644
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -20,7 +20,10 @@
 #include "wx/panel.h"
 #include "wx/notebook.h"
 
-extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
+class WXDLLIMPEXP_FWD_CORE wxIcon;
+class WXDLLIMPEXP_FWD_CORE wxIconBundle;
+
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[];
 
 
 //-----------------------------------------------------------------------------
@@ -35,7 +38,7 @@ class WXDLLIMPEXP_FWD_CORE wxGenericMDIChildFrame;
 // wxGenericMDIParentFrame
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGenericMDIParentFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxGenericMDIParentFrame: public wxFrame
 {
 public:
     wxGenericMDIParentFrame();
@@ -108,7 +111,7 @@ private:
 // wxGenericMDIChildFrame
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGenericMDIChildFrame: public wxPanel
+class WXDLLIMPEXP_CORE wxGenericMDIChildFrame: public wxPanel
 {
 public:
     wxGenericMDIChildFrame();
@@ -152,14 +155,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 bars
     virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
@@ -170,6 +165,7 @@ public:
 #endif
 
     // no icon
+    void SetIcon(const wxIcon& WXUNUSED(icon)) { }
     virtual void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }
 
     // no maximize etc
@@ -207,6 +203,11 @@ protected:
 
     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.
@@ -223,7 +224,7 @@ private:
 // wxGenericMDIClientWindow
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxGenericMDIClientWindow: public wxNotebook
+class WXDLLIMPEXP_CORE wxGenericMDIClientWindow: public wxNotebook
 {
 public:
     wxGenericMDIClientWindow();
@@ -236,7 +237,7 @@ public:
 protected:
     void PageChanged(int OldSelection, int newSelection);
 
-    void OnPageChanged(wxNotebookEvent& event);
+    void OnPageChanged(wxBookCtrlEvent& event);
     void OnSize(wxSizeEvent& event);
 
 private:
@@ -265,7 +266,7 @@ class wxMDIChildFrame ;
 // wxMDIParentFrame
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxGenericMDIParentFrame
 {
 public:
     wxMDIParentFrame() {}
@@ -291,7 +292,7 @@ private:
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMDIChildFrame: public wxGenericMDIChildFrame
+class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxGenericMDIChildFrame
 {
 public:
     wxMDIChildFrame() {}
@@ -314,7 +315,7 @@ private:
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxMDIClientWindow: public wxGenericMDIClientWindow
+class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxGenericMDIClientWindow
 {
 public:
     wxMDIClientWindow() {}