Correct check for MSVC version in wxUSE_GRAPHICS_CONTEXT definition.

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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 3599be5b6660a79d9b2332ccd5d69a3ef3b89e90..80c563728f26e0173a70142b56771b9623bde452 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -104,7 +104,7 @@ public:
 #if wxUSE_STATUSBAR
     // create the main status bar by calling OnCreateStatusBar()
     virtual wxStatusBar* CreateStatusBar(int number = 1,
-                                         long style = wxST_DEFAULT_STYLE,
+                                         long style = wxSTB_DEFAULT_STYLE,
                                          wxWindowID winid = 0,
                                          const wxString& name = wxStatusLineNameStr);
     // return a new status bar
@@ -169,17 +169,6 @@ public:
     // Implement internal behaviour (menu updating on some platforms)
     virtual void OnInternalIdle();
 
-    // if there is no real wxTopLevelWindow on this platform we have to define
-    // some wxTopLevelWindowBase pure virtual functions here to avoid breaking
-    // old ports (wxMotif) which don't define them in wxFrame
-#ifndef wxTopLevelWindowNative
-    virtual bool ShowFullScreen(bool WXUNUSED(show),
-                                long WXUNUSED(style) = wxFULLSCREEN_ALL)
-        { return false; }
-    virtual bool IsFullScreen() const
-        { return false; }
-#endif // no wxTopLevelWindowNative
-
 #if wxUSE_MENUS || wxUSE_TOOLBAR
     // show help text for the currently selected menu or toolbar item
     // (typically in the status bar) or hide it and restore the status bar text
@@ -221,6 +210,9 @@ protected:
 #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