Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h
index 2da0bdd809e8b516330ff09229c341a860880509..875083174778ec10fb852a9513539129ab72b8b1 100644 (file)
--- a/include/wx/aui/tabmdi.h
+++ b/include/wx/aui/tabmdi.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/generic/tabmdi.h
+// Name:        wx/aui/tabmdi.h

 // Purpose:     Generic MDI (Multiple Document Interface) classes
 // Author:      Hans Van Leemputten
 // Modified by: Benjamin I. Williams / Kirix Corporation
 // Created:     29/07/2002
 // Purpose:     Generic MDI (Multiple Document Interface) classes
 // Author:      Hans Van Leemputten
 // Modified by: Benjamin I. Williams / Kirix Corporation
 // Created:     29/07/2002

-// RCS-ID:      $Id$

 // Copyright:   (c) Hans Van Leemputten
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Hans Van Leemputten
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -61,7 +60,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 +70,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);
 


@@ -87,7 +84,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


@@ -103,8 +99,11 @@ protected:
     void AddWindowMenu(wxMenuBar *pMenuBar);
 
     void DoHandleMenu(wxCommandEvent &event);
     void AddWindowMenu(wxMenuBar *pMenuBar);
 
     void DoHandleMenu(wxCommandEvent &event);

+    void DoHandleUpdateUI(wxUpdateUIEvent &event);

 #endif // wxUSE_MENUS
 
 #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:


@@ -138,7 +137,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
 


@@ -147,7 +146,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;
 


@@ -196,10 +195,10 @@ public:
 
     void SetMDIParentFrame(wxAuiMDIParentFrame* parent);
     wxAuiMDIParentFrame* GetMDIParentFrame() const;
 
     void SetMDIParentFrame(wxAuiMDIParentFrame* parent);
     wxAuiMDIParentFrame* GetMDIParentFrame() const;

-    
+

 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 +214,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;


@@ -244,16 +243,20 @@ class WXDLLIMPEXP_AUI wxAuiMDIClientWindow : public wxAuiNotebook
 public:
     wxAuiMDIClientWindow();
     wxAuiMDIClientWindow(wxAuiMDIParentFrame *parent, long style = 0);
 public:
     wxAuiMDIClientWindow();
     wxAuiMDIClientWindow(wxAuiMDIParentFrame *parent, long style = 0);

-    ~wxAuiMDIClientWindow();

 
     virtual bool CreateClient(wxAuiMDIParentFrame *parent,
                               long style = wxVSCROLL | wxHSCROLL);
 
     virtual int SetSelection(size_t page);
 
     virtual bool CreateClient(wxAuiMDIParentFrame *parent,
                               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);