make wxTmemchr() return (and take) char* instead of void* in ANSI build too

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 70d53296cda90eca70e12718a8086b3f92e10b0e..726cce187bd9480c5e0e8bc830fd4d60a781f774 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -58,7 +58,7 @@ public:
                                          long style = wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE,
                                          wxWindowID id = 0,
                                          const wxString& name = wxStatusLineNameStr);
-                                         
+
     void SetStatusBar(wxStatusBar *statbar);
 #endif // wxUSE_STATUSBAR
 
@@ -68,7 +68,7 @@ public:
                                      const wxString& name = wxToolBarNameStr);
     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
-    
+
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }
 
@@ -95,14 +95,15 @@ protected:
     virtual void DoGetClientSize( int *width, int *height ) const;
 
 #if wxUSE_MENUS_NATIVE
-
     virtual void DetachMenuBar();
     virtual void AttachMenuBar(wxMenuBar *menubar);
+    // Whether frame has a menubar showing
+    //   (needed to deal with perverted MDI menubar handling)
+    virtual bool HasVisibleMenubar() const;
 
 public:
     // Menu size is dynamic now, call this whenever it might change.
     void UpdateMenuBarSize();
-
 #endif // wxUSE_MENUS_NATIVE
 
 private: