X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d97c0902355bd73c080ebffa45ec809813df51d..4f2511d706e5274a34e1521e11c1b95fed735b42:/include/wx/generic/mdig.h?ds=sidebyside diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h index 187efb9802..bee3506d09 100644 --- a/include/wx/generic/mdig.h +++ b/include/wx/generic/mdig.h @@ -12,10 +12,6 @@ #ifndef _WX_MDIG_H_ #define _WX_MDIG_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "mdig.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -24,23 +20,25 @@ #include "wx/panel.h" #include "wx/notebook.h" -extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr; -extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr; +class WXDLLIMPEXP_FWD_CORE wxIcon; +class WXDLLIMPEXP_FWD_CORE wxIconBundle; + +extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[]; //----------------------------------------------------------------------------- // classes //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericMDIParentFrame; -class WXDLLEXPORT wxGenericMDIClientWindow; -class WXDLLEXPORT wxGenericMDIChildFrame; +class WXDLLIMPEXP_FWD_CORE wxGenericMDIParentFrame; +class WXDLLIMPEXP_FWD_CORE wxGenericMDIClientWindow; +class WXDLLIMPEXP_FWD_CORE wxGenericMDIChildFrame; //----------------------------------------------------------------------------- // wxGenericMDIParentFrame //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericMDIParentFrame: public wxFrame +class WXDLLIMPEXP_CORE wxGenericMDIParentFrame: public wxFrame { public: wxGenericMDIParentFrame(); @@ -52,7 +50,7 @@ public: long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, const wxString& name = wxFrameNameStr); - ~wxGenericMDIParentFrame(); + virtual ~wxGenericMDIParentFrame(); bool Create( wxWindow *parent, wxWindowID winid, const wxString& title, @@ -113,7 +111,7 @@ private: // wxGenericMDIChildFrame //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericMDIChildFrame: public wxPanel +class WXDLLIMPEXP_CORE wxGenericMDIChildFrame: public wxPanel { public: wxGenericMDIChildFrame(); @@ -157,14 +155,6 @@ public: 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), @@ -175,8 +165,8 @@ public: #endif // no icon - void SetIcon( const wxIcon& WXUNUSED(icon) ) { } - void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { } + void SetIcon(const wxIcon& WXUNUSED(icon)) { } + virtual void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { } // no maximize etc virtual void Maximize( bool WXUNUSED(maximize) = true) { /* Has no effect */ } @@ -213,6 +203,11 @@ protected: 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)) {} + // This function needs to be called when a size change is confirmed, // we needed this function to prevent any body from the outside // changing the panel... it messes the UI layout when we would allow it. @@ -229,12 +224,12 @@ private: // wxGenericMDIClientWindow //----------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericMDIClientWindow: public wxNotebook +class WXDLLIMPEXP_CORE wxGenericMDIClientWindow: public wxNotebook { public: wxGenericMDIClientWindow(); wxGenericMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 ); - ~wxGenericMDIClientWindow(); + virtual ~wxGenericMDIClientWindow(); virtual bool CreateClient( wxGenericMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL ); virtual int SetSelection(size_t nPage); @@ -242,7 +237,7 @@ public: protected: void PageChanged(int OldSelection, int newSelection); - void OnPageChanged(wxNotebookEvent& event); + void OnPageChanged(wxBookCtrlEvent& event); void OnSize(wxSizeEvent& event); private: @@ -271,7 +266,7 @@ class wxMDIChildFrame ; // wxMDIParentFrame //----------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame +class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxGenericMDIParentFrame { public: wxMDIParentFrame() {} @@ -297,7 +292,7 @@ private: // wxMDIChildFrame //----------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIChildFrame: public wxGenericMDIChildFrame +class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxGenericMDIChildFrame { public: wxMDIChildFrame() {} @@ -320,7 +315,7 @@ private: // wxMDIClientWindow //----------------------------------------------------------------------------- -class WXDLLEXPORT wxMDIClientWindow: public wxGenericMDIClientWindow +class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxGenericMDIClientWindow { public: wxMDIClientWindow() {}