support SDK < 10.6, fixes #14902

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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 8b0d2184a869b1139f877d0344d8f8397f790e90..d4624663b43cf590be82cf592ade9f0e13415f99 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -34,10 +34,11 @@ class WXDLLIMPEXP_FWD_CORE wxToolBar;
 // ----------------------------------------------------------------------------
 
 // wxFrame-specific (i.e. not for wxDialog) styles
 // ----------------------------------------------------------------------------
 
 // wxFrame-specific (i.e. not for wxDialog) styles

+//
+// Also see the bit summary table in wx/toplevel.h.

 #define wxFRAME_NO_TASKBAR      0x0002  // No taskbar button (MSW only)
 #define wxFRAME_TOOL_WINDOW     0x0004  // No taskbar button, no system menu
 #define wxFRAME_FLOAT_ON_PARENT 0x0008  // Always above its parent
 #define wxFRAME_NO_TASKBAR      0x0002  // No taskbar button (MSW only)
 #define wxFRAME_TOOL_WINDOW     0x0004  // No taskbar button, no system menu
 #define wxFRAME_FLOAT_ON_PARENT 0x0008  // Always above its parent

-#define wxFRAME_SHAPED          0x0010  // Create a window that is able to be shaped

 
 // ----------------------------------------------------------------------------
 // wxFrame is a top-level window with optional menubar, statusbar and toolbar
 
 // ----------------------------------------------------------------------------
 // wxFrame is a top-level window with optional menubar, statusbar and toolbar


@@ -204,12 +205,19 @@ protected:
     // frame
     virtual void AttachMenuBar(wxMenuBar *menubar);
 
     // frame
     virtual void AttachMenuBar(wxMenuBar *menubar);
 

+    // Return true if we should update the menu item state from idle event
+    // handler or false if we should delay it until the menu is opened.
+    static bool ShouldUpdateMenuFromIdle();
+

     wxMenuBar *m_frameMenuBar;
 #endif // wxUSE_MENUS
 
 #if wxUSE_STATUSBAR && (wxUSE_MENUS || wxUSE_TOOLBAR)
     // the saved status bar text overwritten by DoGiveHelp()
     wxString m_oldStatusText;
     wxMenuBar *m_frameMenuBar;
 #endif // wxUSE_MENUS
 
 #if wxUSE_STATUSBAR && (wxUSE_MENUS || wxUSE_TOOLBAR)
     // the saved status bar text overwritten by DoGiveHelp()
     wxString m_oldStatusText;

+
+    // the last help string we have shown in the status bar
+    wxString m_lastHelpShown;

 #endif
 
 #if wxUSE_STATUSBAR
 #endif
 
 #if wxUSE_STATUSBAR


@@ -247,9 +255,7 @@ protected:
 #if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__)
     #include "wx/univ/frame.h"
 #else // !__WXUNIVERSAL__
 #if defined(__WXUNIVERSAL__) // && !defined(__WXMICROWIN__)
     #include "wx/univ/frame.h"
 #else // !__WXUNIVERSAL__

-    #if defined(__WXPALMOS__)
-        #include "wx/palmos/frame.h"
-    #elif defined(__WXMSW__)
+    #if defined(__WXMSW__)

         #include "wx/msw/frame.h"
     #elif defined(__WXGTK20__)
         #include "wx/gtk/frame.h"
         #include "wx/msw/frame.h"
     #elif defined(__WXGTK20__)
         #include "wx/gtk/frame.h"