X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa6f64c7d8c6c7553e55823f30fc5a1c2ab76f4f..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/generic/mdig.h diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h index 007ab2e4e4..39c2ee2ff2 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,17 +20,16 @@ #include "wx/panel.h" #include "wx/notebook.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; +extern WXDLLEXPORT_DATA(const wxChar) 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 @@ -52,7 +47,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, @@ -79,7 +74,7 @@ public: virtual wxGenericMDIClientWindow *OnCreateClient(); virtual void Cascade() { /* Has no effect */ } - virtual void Tile() { /* Has no effect */ } + virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) { } virtual void ArrangeIcons() { /* Has no effect */ } virtual void ActivateNext(); virtual void ActivatePrevious(); @@ -158,12 +153,12 @@ public: #endif // no size hints - virtual void SetSizeHints( int WXUNUSED(minW), + virtual void DoSetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), - int WXUNUSED(maxW) = -1, - int WXUNUSED(maxH) = -1, - int WXUNUSED(incW) = -1, - int WXUNUSED(incH) = -1) {} + int WXUNUSED(maxW) = wxDefaultCoord, + int WXUNUSED(maxH) = wxDefaultCoord, + int WXUNUSED(incW) = wxDefaultCoord, + int WXUNUSED(incH) = wxDefaultCoord) {} #if wxUSE_TOOLBAR // no toolbar bars @@ -175,19 +170,18 @@ public: #endif // no icon - void SetIcon( const wxIcon& WXUNUSED(icon) ) { } - void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { } + virtual void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { } // no maximize etc - virtual void Maximize( bool WXUNUSED(maximize) = TRUE) { /* Has no effect */ } + virtual void Maximize( bool WXUNUSED(maximize) = true) { /* Has no effect */ } virtual void Restore() { /* Has no effect */ } - virtual void Iconize(bool WXUNUSED(iconize) = TRUE) { /* Has no effect */ } - virtual bool IsMaximized() const { return TRUE; } - virtual bool IsIconized() const { return FALSE; } - virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return FALSE; } - virtual bool IsFullScreen() const { return FALSE; } + virtual void Iconize(bool WXUNUSED(iconize) = true) { /* Has no effect */ } + virtual bool IsMaximized() const { return true; } + virtual bool IsIconized() const { return false; } + virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return false; } + virtual bool IsFullScreen() const { return false; } - virtual bool IsTopLevel() const { return FALSE; } + virtual bool IsTopLevel() const { return false; } void OnMenuHighlight(wxMenuEvent& event); void OnActivate(wxActivateEvent& event); @@ -234,7 +228,7 @@ class WXDLLEXPORT 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); @@ -282,13 +276,13 @@ public: const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, const wxString& name = wxFrameNameStr) - :wxGenericMDIParentFrame(parent, winid, title, pos, size, style, name) - { - } + :wxGenericMDIParentFrame(parent, winid, title, pos, size, style, name) + { + } wxMDIChildFrame * GetActiveChild() const ; - - + + private: DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) }; @@ -309,10 +303,9 @@ public: const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr ) - :wxGenericMDIChildFrame(parent, winid, title, pos, size, style, name) - { - } - + :wxGenericMDIChildFrame(parent, winid, title, pos, size, style, name) + { + } private: DECLARE_DYNAMIC_CLASS(wxMDIChildFrame) };