fixed the last of the off-by-one errors (some are refixed, again...)

[wxWidgets.git] / include / wx / frame.h

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 039d1f258e435771e054c24fdb3696bd0f70d144..32a666b3643f3775254ef2ea4cae104756d88d67 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -58,8 +58,8 @@ class WXDLLEXPORT wxFrameBase : public wxWindow
 public:
     // construction
     wxFrameBase();
 public:
     // construction
     wxFrameBase();

-#ifdef __WXMAC_X__
-    virtual ~wxFrameBase() {}  // Added min for Mac X
+#ifdef __DARWIN__
+    virtual ~wxFrameBase() { }

 #endif
 
     wxFrame *New(wxWindow *parent,
 #endif
 
     wxFrame *New(wxWindow *parent,


@@ -105,7 +105,7 @@ public:
     // ------------------
 
 #if wxUSE_MENUS
     // ------------------
 
 #if wxUSE_MENUS

-    virtual void SetMenuBar(wxMenuBar *menubar) = 0;
+    virtual void SetMenuBar(wxMenuBar *menubar);

     virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; }
 #endif // wxUSE_MENUS
 
     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 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
 
     wxMenuBar *m_frameMenuBar;
 #endif // wxUSE_MENUS
 


@@ -239,34 +247,49 @@ protected:
 
 // include the real class declaration
 #if defined(__WXMSW__)
 
 // include the real class declaration
 #if defined(__WXMSW__)

-    #ifndef __WXUNIVERSAL__
-        #define wxFrameMSW wxFrame
-        #define sm_classwxFrameMSW sm_classwxFrame
-    #endif

     #include "wx/msw/frame.h"
     #include "wx/msw/frame.h"

-#elif defined(__WXMOTIF__)
-    #include "wx/motif/frame.h"
+    #define wxFrameNative wxFrameMSW

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-    #ifndef __WXUNIVERSAL__
-        #define wxFrameGTK wxFrame
-        #define sm_classwxFrameGTK sm_classwxFrame
-    #endif

     #include "wx/gtk/frame.h"
     #include "wx/gtk/frame.h"

-#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"
 #elif defined(__WXMAC__)
     #include "wx/mac/frame.h"

+    #define wxFrameNative wxFrameMac
+#elif defined(__WXMGL__)
+    #include "wx/mgl/frame.h"
+    #define wxFrameNative wxFrameMGL

 #elif defined(__WXPM__)
     #include "wx/os2/frame.h"
 #elif defined(__WXPM__)
     #include "wx/os2/frame.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/frame.h"
+    #define wxFrameNative wxFrameOS2

 #endif
 
 #ifdef __WXUNIVERSAL__
     #include "wx/univ/frame.h"
 #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_
 
 #endif
     // _WX_FRAME_H_BASE_