Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.

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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 066701948285dcf492a1ae4372b1f6b4f844b949..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();
-#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