Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index 053d539d381d2bb369219385efb34fc97ffbc417..cf9005bfc68401f847eb4f07cb8e7f21d2f86973 100644 (file)
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -85,7 +85,6 @@ public:
 
 protected:
     wxAuiMDIClientWindow*   m_pClientWindow;
 
 protected:
     wxAuiMDIClientWindow*   m_pClientWindow;

-    wxAuiMDIChildFrame*     m_pActiveChild;

     wxEvent*                m_pLastEvt;
 
 #if wxUSE_MENUS
     wxEvent*                m_pLastEvt;
 
 #if wxUSE_MENUS


@@ -101,6 +100,7 @@ protected:
     void AddWindowMenu(wxMenuBar *pMenuBar);
 
     void DoHandleMenu(wxCommandEvent &event);
     void AddWindowMenu(wxMenuBar *pMenuBar);
 
     void DoHandleMenu(wxCommandEvent &event);

+    void DoHandleUpdateUI(wxUpdateUIEvent &event);

 #endif // wxUSE_MENUS
 
     virtual bool ProcessEvent(wxEvent& event);
 #endif // wxUSE_MENUS
 
     virtual bool ProcessEvent(wxEvent& event);


@@ -138,7 +138,7 @@ public:
                 const wxString& name = wxFrameNameStr);
 
 #if wxUSE_MENUS
                 const wxString& name = wxFrameNameStr);
 
 #if wxUSE_MENUS

-    virtual void SetMenuBar(wxMenuBar *menu_bar);
+    virtual void SetMenuBar(wxMenuBar *menuBar);

     virtual wxMenuBar *GetMenuBar() const;
 #endif // wxUSE_MENUS
 
     virtual wxMenuBar *GetMenuBar() const;
 #endif // wxUSE_MENUS
 


@@ -199,7 +199,7 @@ public:
 
 protected:
     void Init();
 
 protected:
     void Init();

-    virtual void DoSetSize(int x, int y, int width, int height, int size_flags);
+    virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags);

     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // no size hints
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     // no size hints


@@ -215,12 +215,12 @@ public:
 
 protected:
     wxAuiMDIParentFrame* m_pMDIParentFrame;
 
 protected:
     wxAuiMDIParentFrame* m_pMDIParentFrame;

-    wxRect m_mdi_newrect;
-    wxRect m_mdi_currect;
+    wxRect m_mdiNewRect;
+    wxRect m_mdiCurRect;

     wxString m_title;
     wxIcon m_icon;
     wxString m_title;
     wxIcon m_icon;

-    wxIconBundle m_icon_bundle;
-    bool m_activate_on_create;
+    wxIconBundle m_iconBundle;
+    bool m_activateOnCreate;

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


@@ -249,10 +249,15 @@ public:
                               long style = wxVSCROLL | wxHSCROLL);
 
     virtual int SetSelection(size_t page);
                               long style = wxVSCROLL | wxHSCROLL);
 
     virtual int SetSelection(size_t page);

+    virtual wxAuiMDIChildFrame* GetActiveChild();
+    virtual void SetActiveChild(wxAuiMDIChildFrame* pChildFrame)
+    {
+        SetSelection(GetPageIndex(pChildFrame));
+    }

 
 protected:
 
 
 protected:
 

-    void PageChanged(int old_selection, int new_selection);
+    void PageChanged(int oldSelection, int newSelection);

     void OnPageClose(wxAuiNotebookEvent& evt);
     void OnPageChanged(wxAuiNotebookEvent& evt);
     void OnSize(wxSizeEvent& evt);
     void OnPageClose(wxAuiNotebookEvent& evt);
     void OnPageChanged(wxAuiNotebookEvent& evt);
     void OnSize(wxSizeEvent& evt);