Removed wxPropertyGridInterface::SetPropertyAttributes()

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

diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index 39c2ee2ff2dd59e5047f13a3ebc7713d3966bd5a..bee3506d099170da2b68be92a99f5a8fa73380a0 100644 (file)
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -20,7 +20,10 @@
 #include "wx/panel.h"
 #include "wx/notebook.h"
 
 #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
 //-----------------------------------------------------------------------------
 
 // wxGenericMDIParentFrame
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGenericMDIParentFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxGenericMDIParentFrame: public wxFrame

 {
 public:
     wxGenericMDIParentFrame();
 {
 public:
     wxGenericMDIParentFrame();


@@ -108,7 +111,7 @@ private:
 // wxGenericMDIChildFrame
 //-----------------------------------------------------------------------------
 
 // wxGenericMDIChildFrame
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGenericMDIChildFrame: public wxPanel
+class WXDLLIMPEXP_CORE wxGenericMDIChildFrame: public wxPanel

 {
 public:
     wxGenericMDIChildFrame();
 {
 public:
     wxGenericMDIChildFrame();


@@ -152,14 +155,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),


@@ -170,6 +165,7 @@ public:
 #endif
 
     // no icon
 #endif
 
     // no icon

+    void SetIcon(const wxIcon& WXUNUSED(icon)) { }

     virtual void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }
 
     // no maximize etc
     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);
 
 
     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.


@@ -223,7 +224,7 @@ private:
 // wxGenericMDIClientWindow
 //-----------------------------------------------------------------------------
 
 // wxGenericMDIClientWindow
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxGenericMDIClientWindow: public wxNotebook
+class WXDLLIMPEXP_CORE wxGenericMDIClientWindow: public wxNotebook

 {
 public:
     wxGenericMDIClientWindow();
 {
 public:
     wxGenericMDIClientWindow();


@@ -236,7 +237,7 @@ public:
 protected:
     void PageChanged(int OldSelection, int newSelection);
 
 protected:
     void PageChanged(int OldSelection, int newSelection);
 

-    void OnPageChanged(wxNotebookEvent& event);
+    void OnPageChanged(wxBookCtrlEvent& event);

     void OnSize(wxSizeEvent& event);
 
 private:
     void OnSize(wxSizeEvent& event);
 
 private:


@@ -265,7 +266,7 @@ class wxMDIChildFrame ;
 // wxMDIParentFrame
 //-----------------------------------------------------------------------------
 
 // wxMDIParentFrame
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxGenericMDIParentFrame

 {
 public:
     wxMDIParentFrame() {}
 {
 public:
     wxMDIParentFrame() {}


@@ -291,7 +292,7 @@ private:
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMDIChildFrame: public wxGenericMDIChildFrame
+class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxGenericMDIChildFrame

 {
 public:
     wxMDIChildFrame() {}
 {
 public:
     wxMDIChildFrame() {}


@@ -314,7 +315,7 @@ private:
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMDIClientWindow: public wxGenericMDIClientWindow
+class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxGenericMDIClientWindow

 {
 public:
     wxMDIClientWindow() {}
 {
 public:
     wxMDIClientWindow() {}