X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/210a651b4f4ef5ff4e220a100a10bb4f29e08cfd..6285be722384e07c2587e769dce7cabb8adbd31b:/include/wx/frame.h

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 4d68e89032..32a666b364 100644
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -58,8 +58,8 @@ class WXDLLEXPORT wxFrameBase : public wxWindow
 public:
     // construction
     wxFrameBase();
-#ifdef __WXMAC_X__
-    virtual ~wxFrameBase() {}  // Added min for Mac X
+#ifdef __DARWIN__
+    virtual ~wxFrameBase() { }
 #endif
 
     wxFrame *New(wxWindow *parent,
@@ -105,7 +105,7 @@ public:
     // ------------------
 
 #if wxUSE_MENUS
-    virtual void SetMenuBar(wxMenuBar *menubar) = 0;
+    virtual void SetMenuBar(wxMenuBar *menubar);
     virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; }
 #endif // wxUSE_MENUS
 
@@ -200,6 +200,14 @@ protected:
     // override to update menu bar position when the frame size changes
     virtual void PositionMenuBar() { }
 
+    // override to do something special when the menu bar is being removed
+    // from the frame
+    virtual void DetachMenuBar();
+
+    // override to do something special when the menu bar is attached to the
+    // frame
+    virtual void AttachMenuBar(wxMenuBar *menubar);
+
     wxMenuBar *m_frameMenuBar;
 #endif // wxUSE_MENUS
 
@@ -240,113 +248,48 @@ protected:
 // include the real class declaration
 #if defined(__WXMSW__)
     #include "wx/msw/frame.h"
-    #ifndef __WXUNIVERSAL__
-
-    class WXDLLEXPORT wxFrame : public wxFrameMSW
-    {
-    public:
-        // construction
-        wxFrame() { Init(); }
-        wxFrame(wxWindow *parent,
-                   wxWindowID id,
-                   const wxString& title,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = wxDEFAULT_FRAME_STYLE,
-                   const wxString& name = wxFrameNameStr)
-        {
-            Init();
-            Create(parent, id, title, pos, size, style, name);
-        }
-        DECLARE_DYNAMIC_CLASS(wxFrame)
-    };
-
-    #endif
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/frame.h"
+    #define wxFrameNative wxFrameMSW
 #elif defined(__WXGTK__)
     #include "wx/gtk/frame.h"
-    #ifndef __WXUNIVERSAL__
-
-    class WXDLLEXPORT wxFrame : public wxFrameGTK
-    {
-    public:
-        // construction
-        wxFrame() { Init(); }
-        wxFrame(wxWindow *parent,
-                   wxWindowID id,
-                   const wxString& title,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = wxDEFAULT_FRAME_STYLE,
-                   const wxString& name = wxFrameNameStr)
-        {
-            Init();
-            Create(parent, id, title, pos, size, style, name);
-        }
-        DECLARE_DYNAMIC_CLASS(wxFrame)
-    };
-
-    #endif
-#elif defined(__WXMGL__)
-    #include "wx/mgl/frame.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/frame.h"
+    #define wxFrameNative wxFrameGTK
+#elif defined(__WXMOTIF__)
+    #include "wx/motif/frame.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/frame.h"
-    #ifndef __WXUNIVERSAL__
-
-    class WXDLLEXPORT wxFrame : public wxFrameMac
-    {
-    public:
-        // construction
-        wxFrame() { Init(); }
-        wxFrame(wxWindow *parent,
-                   wxWindowID id,
-                   const wxString& title,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = wxDEFAULT_FRAME_STYLE,
-                   const wxString& name = wxFrameNameStr)
-        {
-            Init();
-            Create(parent, id, title, pos, size, style, name);
-        }
-        DECLARE_DYNAMIC_CLASS(wxFrame)
-    };
-
-    #endif
+    #define wxFrameNative wxFrameMac
+#elif defined(__WXMGL__)
+    #include "wx/mgl/frame.h"
+    #define wxFrameNative wxFrameMGL
 #elif defined(__WXPM__)
     #include "wx/os2/frame.h"
-    #ifndef __WXUNIVERSAL__
-
-    class WXDLLEXPORT wxFrame : public wxFrameOS2
-    {
-    public:
-        // construction
-        wxFrame() { Init(); }
-        wxFrame(wxWindow *parent,
-                   wxWindowID id,
-                   const wxString& title,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = wxDEFAULT_FRAME_STYLE,
-                   const wxString& name = wxFrameNameStr)
-        {
-            Init();
-            Create(parent, id, title, pos, size, style, name);
-        }
-        DECLARE_DYNAMIC_CLASS(wxFrame)
-    };
-    #endif
-
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/frame.h"
+    #define wxFrameNative wxFrameOS2
 #endif
 
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/frame.h"
-#endif
+#else // !__WXUNIVERSAL__
+    #ifdef wxFrameNative
+        class WXDLLEXPORT wxFrame : public wxFrameNative
+        {
+        public:
+            // construction
+            wxFrame() { Init(); }
+            wxFrame(wxWindow *parent,
+                       wxWindowID id,
+                       const wxString& title,
+                       const wxPoint& pos = wxDefaultPosition,
+                       const wxSize& size = wxDefaultSize,
+                       long style = wxDEFAULT_FRAME_STYLE,
+                       const wxString& name = wxFrameNameStr)
+            {
+                Init();
+                Create(parent, id, title, pos, size, style, name);
+            }
+
+            DECLARE_DYNAMIC_CLASS(wxFrame)
+        };
+    #endif // wxFrameNative
+#endif // __WXUNIVERSAL__/!__WXUNIVERSAL__
 
 #endif
     // _WX_FRAME_H_BASE_