X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4fffffc953f68af6c968419da446a9b2e536693..2ef989c972df0bd023ec3b7252fb91afca55f8ab:/include/wx/generic/mdig.h diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h index 6b7ea2b6da..11f75518b6 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" -extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr; -extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr; +extern WXDLLEXPORT_DATA(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 @@ -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(); @@ -157,14 +152,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 +162,7 @@ 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 */ } @@ -213,6 +199,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. @@ -234,7 +225,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);