X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca65c0440a7163e4e37e48b1c4329709d722db47..1efb5db8961ac308d16ed3ae7930bd0b48c0520e:/include/wx/generic/mdig.h diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h index 8ca22f2343..eb253e08ef 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,8 +20,8 @@ #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) wxFrameNameStr[]; +extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; //----------------------------------------------------------------------------- @@ -79,7 +75,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 +154,12 @@ public: #endif // no size hints - virtual void SetSizeHints( int WXUNUSED(minW), + virtual void DoSetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), - int WXUNUSED(maxW) = wxDefaultSize.x, - int WXUNUSED(maxH) = wxDefaultSize.y, - int WXUNUSED(incW) = wxDefaultSize.x, - int WXUNUSED(incH) = wxDefaultSize.y) {} + int WXUNUSED(maxW) = wxDefaultCoord, + int WXUNUSED(maxH) = wxDefaultCoord, + int WXUNUSED(incW) = wxDefaultCoord, + int WXUNUSED(incH) = wxDefaultCoord) {} #if wxUSE_TOOLBAR // no toolbar bars