changed choice to properly inherit from wxChoiceBase , added msg compatible calls...

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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index d21024cfb23f5070390973b75ae99619cc924a75..de126f6a5774dc50be3612337ff8e7835dc33853 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -27,6 +27,7 @@
 WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
 WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern wxWindow*) wxWndHook;
 
 class WXDLLEXPORT wxMenuBar;
 class WXDLLEXPORT wxStatusBar;
@@ -57,6 +58,9 @@ class WXDLLEXPORT wxFrameBase : public wxWindow
 public:
     // construction
     wxFrameBase();
+#ifdef __WXMAC_X__
+    virtual ~wxFrameBase() {}  // Added min for Mac X
+#endif
 
     wxFrame *New(wxWindow *parent,
                  wxWindowID id,
@@ -191,6 +195,10 @@ protected:
     // something changes
     virtual void PositionStatusBar() { }
 
+    // show the help string for this menu item in the given status bar: the
+    // status bar pointer can be NULL; return TRUE if help was shown
+    bool ShowMenuHelp(wxStatusBar *statbar, int id);
+
     wxStatusBar *m_frameStatusBar;
 #endif // wxUSE_STATUSBAR