X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4a55e2136300929798d0222b47f4f3e30f6275b..3e2d47e1a96977aa31c8af18f96e9363000f3ca5:/include/wx/frame.h

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 0735c82f8a..024c6f9bd2 100644
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "framebase.h"
 #endif
 
@@ -44,12 +44,7 @@ class WXDLLEXPORT wxToolBar;
 // CreateXXXBar() is called.
 // ----------------------------------------------------------------------------
 
-// FIXME - temporary hack in absence of wxTLW !!
-#ifndef wxTopLevelWindowNative
-class WXDLLEXPORT wxFrameBase : public wxTopLevelWindowBase
-#else
 class WXDLLEXPORT wxFrameBase : public wxTopLevelWindow
-#endif
 {
 public:
     // construction
@@ -71,6 +66,13 @@ public:
     // if the frame has a toolbar) in client coordinates
     virtual wxPoint GetClientAreaOrigin() const;
 
+    // sends a size event to the window using its current size -- this has an
+    // effect of refreshing the window layout
+    //
+    // currently it is only implemented under MSW but is declared here to make
+    // it possible to call it in portable code without using #ifdef's
+    virtual void SendSizeEvent() { }
+
     // menu bar functions
     // ------------------
 
@@ -79,8 +81,10 @@ public:
     virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; }
 #endif // wxUSE_MENUS
 
+#ifdef WXWIN_COMPATIBILITY_2_2
     // call this to simulate a menu command
     bool Command(int id) { return ProcessCommand(id); }
+#endif // WXWIN_COMPATIBILITY_2_2
 
     // process menu command: returns TRUE if processed
     bool ProcessCommand(int id);
@@ -211,6 +215,7 @@ protected:
 #endif // wxUSE_TOOLBAR
 
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxFrameBase)
 };
 
 // include the real class declaration