X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..6012f61212b67d510e4a6393272e867a4ceb58c1:/include/wx/gtk/mdi.h diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h index fc3a5fc76a..38f7b63d6c 100644 --- a/include/wx/gtk/mdi.h +++ b/include/wx/gtk/mdi.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/mdi.h +// Name: wx/gtk/mdi.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,14 +7,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __MDIH__ #define __MDIH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/list.h" @@ -35,8 +30,8 @@ class WXDLLIMPEXP_CORE wxMDIChildFrame; // global data //----------------------------------------------------------------------------- -extern WXDLLIMPEXP_CORE const wxChar* wxFrameNameStr; -extern WXDLLIMPEXP_CORE const wxChar* wxStatusLineNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[]; +extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; //----------------------------------------------------------------------------- // wxMDIParentFrame @@ -145,11 +140,11 @@ public: // no size hints 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(minH), + int WXUNUSED(maxW) = wxDefaultCoord, + int WXUNUSED(maxH) = wxDefaultCoord, + int WXUNUSED(incW) = wxDefaultCoord, + int WXUNUSED(incH) = wxDefaultCoord) {} #if wxUSE_TOOLBAR // no toolbar @@ -167,8 +162,7 @@ public: { wxTopLevelWindowBase::SetIcons(icons); } // no title - void SetTitle( const wxString &title ); - wxString GetTitle() const { return m_title; } + virtual void SetTitle( const wxString &title ); // no maximize etc virtual void Maximize( bool WXUNUSED(maximize) = true ) { } @@ -218,4 +212,3 @@ private: }; #endif // __MDIH__ -