fixed wxUniCharRef::IsAscii() definition

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

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index f7a15340747e926e6190cac3b012344feb4f5b40..5e94dffd648f621e711847c7b85a9506d95721f1 100644 (file)
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -63,7 +63,7 @@ public:
     wxAuiNotebook* GetNotebook() const;
     
 #if wxUSE_MENUS
     wxAuiNotebook* GetNotebook() const;
     
 #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);


@@ -74,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();


@@ -222,6 +222,7 @@ protected:
     wxString m_title;
     wxIcon m_icon;
     wxIconBundle m_icon_bundle;
     wxString m_title;
     wxIcon m_icon;
     wxIconBundle m_icon_bundle;

+    bool m_activate_on_create;

 
 #if wxUSE_MENUS
     wxMenuBar* m_pMenuBar;
 
 #if wxUSE_MENUS
     wxMenuBar* m_pMenuBar;


@@ -255,7 +256,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: