Win64 compilation fixes: define SIZEOF_SIZE_T, added wxUIntPtr

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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index be765cc7e796c40e0d6a865aa5d3467b31df040b..e202679bb9b1a6800a9b265db0724479c06934f1 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "framebase.h"
 #endif
 
     #pragma interface "framebase.h"
 #endif
 


@@ -81,11 +81,6 @@ public:
     virtual wxMenuBar *GetMenuBar() const { return m_frameMenuBar; }
 #endif // wxUSE_MENUS
 
     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 winid) { return ProcessCommand(winid); }
-#endif // WXWIN_COMPATIBILITY_2_2
-

     // process menu command: returns TRUE if processed
     bool ProcessCommand(int winid);
 
     // process menu command: returns TRUE if processed
     bool ProcessCommand(int winid);
 


@@ -142,12 +137,16 @@ public:
     // -------------------------------
 
     // event handlers
     // -------------------------------
 
     // event handlers

+#if wxUSE_MENUS
+#if wxUSE_STATUSBAR

     void OnMenuOpen(wxMenuEvent& event);
     void OnMenuOpen(wxMenuEvent& event);

+    void OnMenuClose(wxMenuEvent& event);

     void OnMenuHighlight(wxMenuEvent& event);
     void OnMenuHighlight(wxMenuEvent& event);

+#endif // wxUSE_STATUSBAR

 
 

-#if wxUSE_MENUS
-    // send wxUpdateUIEvents for all menu items (called from OnIdle())
-    void DoMenuUpdates();
+    // send wxUpdateUIEvents for all menu items in the menubar,
+    // or just for menu if non-NULL
+    void DoMenuUpdates(wxMenu* menu = NULL);

 #endif // wxUSE_MENUS
 
     // do the UI update processing for this window
 #endif // wxUSE_MENUS
 
     // do the UI update processing for this window


@@ -171,6 +170,11 @@ public:
     // if you are hiding the help, TRUE otherwise
     virtual void DoGiveHelp(const wxString& text, bool show);
 
     // if you are hiding the help, TRUE otherwise
     virtual void DoGiveHelp(const wxString& text, bool show);
 

+#if WXWIN_COMPATIBILITY_2_2
+    // call this to simulate a menu command
+    bool Command(int winid) { return ProcessCommand(winid); }
+#endif // WXWIN_COMPATIBILITY_2_2
+

 protected:
     // the frame main menu/status/tool bars
     // ------------------------------------
 protected:
     // the frame main menu/status/tool bars
     // ------------------------------------


@@ -195,6 +199,11 @@ protected:
     virtual void AttachMenuBar(wxMenuBar *menubar);
 
     wxMenuBar *m_frameMenuBar;
     virtual void AttachMenuBar(wxMenuBar *menubar);
 
     wxMenuBar *m_frameMenuBar;

+
+#if wxUSE_STATUSBAR
+    // the saved status bar text overwritten by DoGiveHelp()
+    wxString m_oldStatusText;
+#endif // wxUSE_STATUSBAR

 #endif // wxUSE_MENUS
 
 #if wxUSE_STATUSBAR
 #endif // wxUSE_MENUS
 
 #if wxUSE_STATUSBAR


@@ -220,7 +229,10 @@ protected:
     wxToolBar *m_frameToolBar;
 #endif // wxUSE_TOOLBAR
 
     wxToolBar *m_frameToolBar;
 #endif // wxUSE_TOOLBAR
 

+#if wxUSE_MENUS && wxUSE_STATUSBAR

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+#endif // wxUSE_MENUS && wxUSE_STATUSBAR
+

     DECLARE_NO_COPY_CLASS(wxFrameBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxFrameBase)
 };