Fixed typo in my last commit (it did break socket detection code :-( ).

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index bb8dd7b0d51e488709620a1dba54897a09d58913..662886cf68e79d1fbc1e4f254abea0884be68908 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -26,8 +26,6 @@ class wxMenuBar;
 class wxToolBar;
 class wxStatusBar;
 
 class wxToolBar;
 class wxStatusBar;
 

-class wxFrame;
-

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


@@ -38,12 +36,12 @@ public:
     // construction
     wxFrame() { Init(); }
     wxFrame(wxWindow *parent,
     // construction
     wxFrame() { Init(); }
     wxFrame(wxWindow *parent,

-            wxWindowID id,
-            const wxString& title,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE,
-            const wxString& name = wxFrameNameStr)
+               wxWindowID id,
+               const wxString& title,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               long style = wxDEFAULT_FRAME_STYLE,
+               const wxString& name = wxFrameNameStr)

     {
         Init();
 
     {
         Init();
 


@@ -60,18 +58,9 @@ public:
 
     virtual ~wxFrame();
 
 
     virtual ~wxFrame();
 

-    // implement base class pure virtuals
-    virtual void Maximize(bool maximize = TRUE);
-    virtual bool IsMaximized() const;
-    virtual void Iconize(bool iconize = TRUE);
-    virtual bool IsIconized() const;
-    virtual void SetIcon(const wxIcon& icon);
-    virtual void MakeModal(bool modal = TRUE);
-    virtual void Restore();
-
-    virtual void SetMenuBar( wxMenuBar *menuBar );
-

 #if wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR

+    virtual void PositionStatusBar();
+

     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxST_SIZEGRIP,
                                          wxWindowID id = 0,
     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxST_SIZEGRIP,
                                          wxWindowID id = 0,


@@ -84,11 +73,8 @@ public:
                                      const wxString& name = wxToolBarNameStr);
     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR
                                      const wxString& name = wxToolBarNameStr);
     void SetToolBar(wxToolBar *toolbar);
 #endif // wxUSE_TOOLBAR

-
-    virtual bool Show(bool show);
-
-    virtual void SetTitle( const wxString &title );
-    virtual wxString GetTitle() const { return m_title; }
+    
+    wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }

 
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------


@@ -97,27 +83,22 @@ public:
     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void OnInternalIdle();
 
     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void OnInternalIdle();
 

-    wxString      m_title;
-    int           m_miniEdge,
-                  m_miniTitle;
-    GtkWidget    *m_mainWidget;

     bool          m_menuBarDetached;
     bool          m_toolBarDetached;
     bool          m_menuBarDetached;
     bool          m_toolBarDetached;

-    bool          m_insertInClientArea;  /* not from within OnCreateXXX */

 
 protected:
     // common part of all ctors
     void Init();
 
     // override wxWindow methods to take into account tool/menu/statusbars
 
 protected:
     // common part of all ctors
     void Init();
 
     // override wxWindow methods to take into account tool/menu/statusbars

-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-

     virtual void DoSetClientSize(int width, int height);
     virtual void DoGetClientSize( int *width, int *height ) const;
 
     virtual void DoSetClientSize(int width, int height);
     virtual void DoGetClientSize( int *width, int *height ) const;
 

-private:
+#if wxUSE_MENUS_NATIVE
+    virtual void DetachMenuBar();
+    virtual void AttachMenuBar(wxMenuBar *menubar);
+#endif // wxUSE_MENUS_NATIVE
+

     DECLARE_DYNAMIC_CLASS(wxFrame)
 };
 
     DECLARE_DYNAMIC_CLASS(wxFrame)
 };