X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4055ed8281971e3d35bf04177193c27043d42ed1..e5d92e2bef8fed2f3fabaf9662902eb7189f5f92:/include/wx/frame.h?ds=sidebyside diff --git a/include/wx/frame.h b/include/wx/frame.h index ed865ea94f..8d5ce34cc9 100644 --- a/include/wx/frame.h +++ b/include/wx/frame.h @@ -16,16 +16,12 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "framebase.h" -#endif - #include "wx/toplevel.h" // the base class // the default names for various classs -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr; class WXDLLEXPORT wxFrame; class WXDLLEXPORT wxMenuBar; @@ -177,11 +173,6 @@ public: // if you are hiding the help, true otherwise virtual void DoGiveHelp(const wxString& text, bool show); -#if WXWIN_COMPATIBILITY_2_2 - // call this to simulate a menu command - bool Command(int winid) { return ProcessCommand(winid); } -#endif // WXWIN_COMPATIBILITY_2_2 - protected: // the frame main menu/status/tool bars // ------------------------------------