X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b022169511792a75b3ae7fed895ea88d30e64af..81f6ea4a29eb815dbed0adea369efdc8fece0269:/include/wx/frame.h

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 9b857d9f4b..1579413dc1 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;
@@ -179,7 +175,7 @@ public:
 
 #if WXWIN_COMPATIBILITY_2_2
     // call this to simulate a menu command
-    bool Command(int winid) { return ProcessCommand(winid); }
+    wxDEPRECATED( bool Command(int winid) );
 #endif // WXWIN_COMPATIBILITY_2_2
 
 protected:
@@ -247,7 +243,7 @@ protected:
 #if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__)
     #include "wx/univ/frame.h"
 #else // !__WXUNIVERSAL__
-    #if defined(__PALMOS__)
+    #if defined(__WXPALMOS__)
         #include "wx/palmos/frame.h"
     #elif defined(__WXMSW__)
         #include "wx/msw/frame.h"