fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

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

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index f448605382f6fe0a2925358c24c5ce6005c08b27..1084829cf0eb7fd3c0da4e50e552edb3207c6216 100644 (file)
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -21,15 +21,16 @@
 #include "wx/frame.h"
 #include "wx/panel.h"
 #include "wx/notebook.h"
 #include "wx/frame.h"
 #include "wx/panel.h"
 #include "wx/notebook.h"

+#include "wx/icon.h"

 #include "wx/aui/auibook.h"
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 #include "wx/aui/auibook.h"
 
 //-----------------------------------------------------------------------------
 // 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


@@ -57,8 +58,12 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                 const wxString& name = wxFrameNameStr );
 
                 long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
                 const wxString& name = wxFrameNameStr );
 

+    void SetArtProvider(wxAuiTabArt* provider);
+    wxAuiTabArt* GetArtProvider();
+    wxAuiNotebook* GetNotebook() const;
+    

 #if wxUSE_MENUS
 #if wxUSE_MENUS

-    wxMenu* GetWindowMenu() const { return m_pWindowMenu; };
+    wxMenu* GetWindowMenu() const { return m_pWindowMenu; }

     void SetWindowMenu(wxMenu* pMenu);
 
     virtual void SetMenuBar(wxMenuBar *pMenuBar);
     void SetWindowMenu(wxMenu* pMenu);
 
     virtual void SetMenuBar(wxMenuBar *pMenuBar);


@@ -69,13 +74,13 @@ public:
     virtual bool ProcessEvent(wxEvent& event);
 
     wxAuiMDIChildFrame *GetActiveChild() const;
     virtual bool ProcessEvent(wxEvent& event);
 
     wxAuiMDIChildFrame *GetActiveChild() const;

-    inline void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);
+    void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);

 
     wxAuiMDIClientWindow *GetClientWindow() const;
     virtual wxAuiMDIClientWindow *OnCreateClient();
 
     virtual void Cascade() { /* Has no effect */ }
 
     wxAuiMDIClientWindow *GetClientWindow() const;
     virtual wxAuiMDIClientWindow *OnCreateClient();
 
     virtual void Cascade() { /* Has no effect */ }

-    virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) { }
+    virtual void Tile(wxOrientation orient = wxHORIZONTAL);

     virtual void ArrangeIcons() { /* Has no effect */ }
     virtual void ActivateNext();
     virtual void ActivatePrevious();
     virtual void ArrangeIcons() { /* Has no effect */ }
     virtual void ActivateNext();
     virtual void ActivatePrevious();


@@ -140,9 +145,17 @@ public:
     virtual void SetTitle(const wxString& title);
     virtual wxString GetTitle() const;
 
     virtual void SetTitle(const wxString& title);
     virtual wxString GetTitle() 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 Activate();
     virtual bool Destroy();
 
     virtual void Activate();
     virtual bool Destroy();
 

+    virtual bool Show(bool show = true);
+

 #if wxUSE_STATUSBAR
     // no status bars
     virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1,
 #if wxUSE_STATUSBAR
     // no status bars
     virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1,


@@ -156,13 +169,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),


@@ -172,9 +178,6 @@ public:
     virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
 #endif
 
     virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
 #endif
 

-    // no icon
-    void SetIcon(const wxIcon& WXUNUSED(icon)) { }
-    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 */ }


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

-
-protected:
-    wxAuiMDIParentFrame *m_pMDIParentFrame;
-    wxRect            m_mdi_newrect;
-    wxRect            m_mdi_currect;
-    wxString          m_title;
-
-#if wxUSE_MENUS
-    wxMenuBar        *m_pMenuBar;
-#endif // wxUSE_MENUS
-
+    

 protected:
     void Init();
 protected:
     void Init();

-
-    virtual bool Show(bool show = true);

     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);
 
     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


@@ -218,6 +213,21 @@ public:
     void ApplyMDIChildFrameRect();
     void DoShow(bool show);
 
     void ApplyMDIChildFrameRect();
     void DoShow(bool show);
 

+protected:
+    wxAuiMDIParentFrame* m_pMDIParentFrame;
+    wxRect m_mdi_newrect;
+    wxRect m_mdi_currect;
+    wxString m_title;
+    wxIcon m_icon;
+    wxIconBundle m_icon_bundle;
+    bool m_activate_on_create;
+
+#if wxUSE_MENUS
+    wxMenuBar* m_pMenuBar;
+#endif // wxUSE_MENUS
+
+
+

 private:
     DECLARE_DYNAMIC_CLASS(wxAuiMDIChildFrame)
     DECLARE_EVENT_TABLE()
 private:
     DECLARE_DYNAMIC_CLASS(wxAuiMDIChildFrame)
     DECLARE_EVENT_TABLE()


@@ -244,7 +254,8 @@ public:
 protected:
 
     void PageChanged(int old_selection, int new_selection);
 protected:
 
     void PageChanged(int old_selection, int new_selection);

-    void OnPageChanged(wxAuiNotebookEvent& event);
+    void OnPageClose(wxAuiNotebookEvent& evt);
+    void OnPageChanged(wxAuiNotebookEvent& evt);

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