Many more corrections and clarifications to virtual index list model use

[wxWidgets.git] / include / wx / aui / tabmdi.h

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index a4f6a93820c5702d6d69026cf2352bb64b6c6ccf..e4e7b8182cb56d9f1d0f579093b6cb08020ade2a 100644 (file)
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -28,9 +28,9 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_AUI wxAuiMDIParentFrame;
-class WXDLLIMPEXP_AUI wxAuiMDIClientWindow;
-class WXDLLIMPEXP_AUI wxAuiMDIChildFrame;
+class WXDLLIMPEXP_FWD_AUI wxAuiMDIParentFrame;
+class WXDLLIMPEXP_FWD_AUI wxAuiMDIClientWindow;
+class WXDLLIMPEXP_FWD_AUI wxAuiMDIChildFrame;

 
 //-----------------------------------------------------------------------------
 // wxAuiMDIParentFrame
 
 //-----------------------------------------------------------------------------
 // wxAuiMDIParentFrame


@@ -61,7 +61,7 @@ public:
     void SetArtProvider(wxAuiTabArt* provider);
     wxAuiTabArt* GetArtProvider();
     wxAuiNotebook* GetNotebook() const;
     void SetArtProvider(wxAuiTabArt* provider);
     wxAuiTabArt* GetArtProvider();
     wxAuiNotebook* GetNotebook() const;

-    
+

 #if wxUSE_MENUS
     wxMenu* GetWindowMenu() const { return m_pWindowMenu; }
     void SetWindowMenu(wxMenu* pMenu);
 #if wxUSE_MENUS
     wxMenu* GetWindowMenu() const { return m_pWindowMenu; }
     void SetWindowMenu(wxMenu* pMenu);


@@ -71,8 +71,6 @@ public:
 
     void SetChildMenuBar(wxAuiMDIChildFrame *pChild);
 
 
     void SetChildMenuBar(wxAuiMDIChildFrame *pChild);
 

-    virtual bool ProcessEvent(wxEvent& event);
-

     wxAuiMDIChildFrame *GetActiveChild() const;
     void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);
 
     wxAuiMDIChildFrame *GetActiveChild() const;
     void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);
 


@@ -105,6 +103,8 @@ protected:
     void DoHandleMenu(wxCommandEvent &event);
 #endif // wxUSE_MENUS
 
     void DoHandleMenu(wxCommandEvent &event);
 #endif // wxUSE_MENUS
 

+    virtual bool ProcessEvent(wxEvent& event);
+

     virtual void DoGetClientSize(int *width, int *height) const;
 
 private:
     virtual void DoGetClientSize(int *width, int *height) const;
 
 private:


@@ -147,7 +147,7 @@ public:
 
     virtual void SetIcons(const wxIconBundle& icons);
     virtual const wxIconBundle& GetIcons() const;
 
     virtual void SetIcons(const wxIconBundle& icons);
     virtual const wxIconBundle& GetIcons() const;

-    
+

     virtual void SetIcon(const wxIcon& icon);
     virtual const wxIcon& GetIcon() const;
 
     virtual void SetIcon(const wxIcon& icon);
     virtual const wxIcon& GetIcon() const;
 


@@ -162,27 +162,20 @@ public:
                                          long WXUNUSED(style) = 1,
                                          wxWindowID WXUNUSED(winid) = 1,
                                          const wxString& WXUNUSED(name) = wxEmptyString)
                                          long WXUNUSED(style) = 1,
                                          wxWindowID WXUNUSED(winid) = 1,
                                          const wxString& WXUNUSED(name) = wxEmptyString)

-      { return (wxStatusBar*)NULL; }
+      { return NULL; }

 
 

-    virtual wxStatusBar *GetStatusBar() const { return (wxStatusBar*)NULL; }
+    virtual wxStatusBar *GetStatusBar() const { return NULL; }

     virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {}
     virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
 #endif
 
     virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {}
     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),
                                      wxWindowID WXUNUSED(winid),
                                      const wxString& WXUNUSED(name))
 #if wxUSE_TOOLBAR
     // no toolbar bars
     virtual wxToolBar* CreateToolBar(long WXUNUSED(style),
                                      wxWindowID WXUNUSED(winid),
                                      const wxString& WXUNUSED(name))

-        { return (wxToolBar*)NULL; }
-    virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
+        { return NULL; }
+    virtual wxToolBar *GetToolBar() const { return NULL; }

 #endif
 
 
 #endif
 
 


@@ -203,12 +196,16 @@ public:
 
     void SetMDIParentFrame(wxAuiMDIParentFrame* parent);
     wxAuiMDIParentFrame* GetMDIParentFrame() const;
 
     void SetMDIParentFrame(wxAuiMDIParentFrame* parent);
     wxAuiMDIParentFrame* GetMDIParentFrame() const;

-    
+

 protected:
     void Init();
     virtual void DoSetSize(int x, int y, int width, int height, int size_flags);
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
 protected:
     void Init();
     virtual void DoSetSize(int x, int y, int width, int height, int size_flags);
     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)) {}

 public:
     // This function needs to be called when a size change is confirmed,
     // we needed this function to prevent anybody from the outside
 public:
     // This function needs to be called when a size change is confirmed,
     // we needed this function to prevent anybody from the outside