X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3219eea2611e91189557bc10dc0a11bb76bba37..54aa3821fc7c1df012efc5e5dd4a09ab5ed8d90d:/include/wx/aui/tabmdi.h diff --git a/include/wx/aui/tabmdi.h b/include/wx/aui/tabmdi.h index 70758e04eb..6f0ee3c6fe 100644 --- a/include/wx/aui/tabmdi.h +++ b/include/wx/aui/tabmdi.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/generic/mdig.h +// Name: wx/generic/tabmdi.h // Purpose: Generic MDI (Multiple Document Interface) classes // Author: Hans Van Leemputten // Modified by: Benjamin I. Williams / Kirix Corporation @@ -19,10 +19,7 @@ #include "wx/frame.h" #include "wx/panel.h" #include "wx/notebook.h" -#include "wx/aui/notebook.h" - -extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[]; -extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; +#include "wx/aui/auibook.h" //----------------------------------------------------------------------------- // classes @@ -36,7 +33,7 @@ class WXDLLEXPORT wxTabMDIChildFrame; // wxTabMDIParentFrame //----------------------------------------------------------------------------- -class WXDLLEXPORT wxTabMDIParentFrame : public wxFrame +class WXDLLIMPEXP_AUI wxTabMDIParentFrame : public wxFrame { public: wxTabMDIParentFrame(); @@ -49,7 +46,7 @@ public: const wxString& name = wxFrameNameStr); ~wxTabMDIParentFrame(); - + bool Create(wxWindow *parent, wxWindowID winid, const wxString& title, @@ -84,7 +81,7 @@ public: protected: wxTabMDIClientWindow *m_pClientWindow; wxTabMDIChildFrame *m_pActiveChild; - + #if wxUSE_MENUS wxMenu *m_pWindowMenu; wxMenuBar *m_pMyMenuBar; @@ -111,7 +108,7 @@ private: // wxTabMDIChildFrame //----------------------------------------------------------------------------- -class WXDLLEXPORT wxTabMDIChildFrame : public wxPanel +class WXDLLIMPEXP_AUI wxTabMDIChildFrame : public wxPanel { public: wxTabMDIChildFrame(); @@ -142,7 +139,7 @@ public: virtual void Activate(); virtual bool Destroy(); - + #if wxUSE_STATUSBAR // no status bars virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1, @@ -190,7 +187,7 @@ public: void OnMenuHighlight(wxMenuEvent& evt); void OnActivate(wxActivateEvent& evt); void OnCloseWindow(wxCloseEvent& evt); - + void SetMDIParentFrame(wxTabMDIParentFrame* parent); wxTabMDIParentFrame* GetMDIParentFrame() const; @@ -229,13 +226,13 @@ private: // wxTabMDIClientWindow //----------------------------------------------------------------------------- -class WXDLLEXPORT wxTabMDIClientWindow : public wxAuiMultiNotebook +class WXDLLIMPEXP_AUI wxTabMDIClientWindow : public wxAuiMultiNotebook { public: wxTabMDIClientWindow(); wxTabMDIClientWindow(wxTabMDIParentFrame *parent, long style = 0); ~wxTabMDIClientWindow(); - + virtual bool CreateClient(wxTabMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL); @@ -243,7 +240,7 @@ public: protected: - void PageChanged(int old_selection, int new_selection); + void PageChanged(int old_selection, int new_selection); void OnPageChanged(wxAuiNotebookEvent& event); void OnSize(wxSizeEvent& evt);