forward port from 2.8

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index f65413146ce68939fd4c37f5b67a5cbeb5ffa596..98addeee0453425a1d437d8f4da75a53338db667 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -10,17 +10,6 @@
 #ifndef _WX_GTK_FRAME_H_
 #define _WX_GTK_FRAME_H_
 
 #ifndef _WX_GTK_FRAME_H_
 #define _WX_GTK_FRAME_H_
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMDIChildFrame;
-class WXDLLIMPEXP_CORE wxMDIClientWindow;
-class WXDLLIMPEXP_CORE wxMenu;
-class WXDLLIMPEXP_CORE wxMenuBar;
-class WXDLLIMPEXP_CORE wxToolBar;
-class WXDLLIMPEXP_CORE wxStatusBar;
-

 //-----------------------------------------------------------------------------
 // wxFrame
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxFrame
 //-----------------------------------------------------------------------------


@@ -54,21 +43,13 @@ public:
     virtual ~wxFrame();
 
 #if wxUSE_STATUSBAR
     virtual ~wxFrame();
 
 #if wxUSE_STATUSBAR

-    virtual wxStatusBar* CreateStatusBar(int number = 1,
-                                         long style = wxST_SIZEGRIP|wxFULL_REPAINT_ON_RESIZE,
-                                         wxWindowID id = 0,
-                                         const wxString& name = wxStatusLineNameStr);
-                                         

     void SetStatusBar(wxStatusBar *statbar);
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR
     void SetStatusBar(wxStatusBar *statbar);
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_TOOLBAR

-    virtual wxToolBar* CreateToolBar(long style = -1,
-                                     wxWindowID id = -1,
-                                     const wxString& name = wxToolBarNameStr);

     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR

-    
+

     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }
 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }
 


@@ -76,33 +57,18 @@ public:
     // --------------------------
 
     // GTK callbacks
     // --------------------------
 
     // GTK callbacks

-    virtual void GtkOnSize();

     virtual void OnInternalIdle();
 
     virtual void OnInternalIdle();
 

-    bool          m_menuBarDetached;
-    int           m_menuBarHeight;
-    bool          m_toolBarDetached;
-

 protected:
     // common part of all ctors
     void Init();
 
 protected:
     // common part of all ctors
     void Init();
 

-#if wxUSE_STATUSBAR
-    virtual void PositionStatusBar();
-#endif // wxUSE_STATUSBAR
-

     // override wxWindow methods to take into account tool/menu/statusbars
     virtual void DoGetClientSize( int *width, int *height ) const;
 
 #if wxUSE_MENUS_NATIVE
     // override wxWindow methods to take into account tool/menu/statusbars
     virtual void DoGetClientSize( int *width, int *height ) const;
 
 #if wxUSE_MENUS_NATIVE

-

     virtual void DetachMenuBar();
     virtual void AttachMenuBar(wxMenuBar *menubar);
     virtual void DetachMenuBar();
     virtual void AttachMenuBar(wxMenuBar *menubar);

-
-public:
-    // Menu size is dynamic now, call this whenever it might change.
-    void UpdateMenuBarSize();
-

 #endif // wxUSE_MENUS_NATIVE
 
 private:
 #endif // wxUSE_MENUS_NATIVE
 
 private: