X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e702ff0f08a54622a6b0f1e2ec39537b082c3a8e..974e8d946f30af2bd79b9029d1d2fb9e0d5b2dd4:/include/wx/gtk/frame.h

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 490d00170f..506ee744c2 100644
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -37,8 +37,8 @@ class wxFrame;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxFrameNameStr;
-extern const char *wxToolBarNameStr;
+extern const wxChar *wxFrameNameStr;
+extern const wxChar *wxToolBarNameStr;
 
 //-----------------------------------------------------------------------------
 // wxFrame
@@ -49,7 +49,7 @@ class wxFrame: public wxWindow
 DECLARE_DYNAMIC_CLASS(wxFrame)
 
 public:
-    wxFrame();
+    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 );
@@ -60,24 +60,26 @@ public:
     bool Destroy();
 
     virtual bool Show( bool show );
-    virtual void Centre( int direction = wxHORIZONTAL );
-
-    virtual void GetClientSize( int *width, int *height ) const;
+    virtual void Centre( int direction = wxBOTH );
 
+#if wxUSE_STATUSBAR
     virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
-            const wxString& name = "statusBar");
+            const wxString& name = wxT("statusBar"));
     virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
             const wxString& name );
     virtual wxStatusBar *GetStatusBar() const;
     inline void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }
     virtual void SetStatusText( const wxString &text, int number = 0 );
     virtual void SetStatusWidths( int n, const int widths_field[] );
+#endif // wxUSE_STATUSBAR
 
+#if wxUSE_TOOLBAR
     virtual wxToolBar* CreateToolBar( long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1,
             const wxString& name = wxToolBarNameStr);
     virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
     virtual wxToolBar *GetToolBar() const;
-    inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
+    void SetToolBar(wxToolBar *toolbar);
+#endif // wxUSE_TOOLBAR
 
     virtual void SetMenuBar( wxMenuBar *menuBar );
     virtual wxMenuBar *GetMenuBar() const;
@@ -85,43 +87,57 @@ public:
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }
 
+        // make the window modal (all other windows unresponsive)
+    virtual void MakeModal(bool modal = TRUE);
+
     virtual void SetIcon( const wxIcon &icon );
-    virtual void Iconize( bool WXUNUSED(iconize)) { }
-    virtual bool IsIconized() const { return FALSE; }
     bool Iconized() const { return IsIconized(); }
-    virtual void Maximize(bool WXUNUSED(maximize)) {}
-    virtual void Restore() {}
+    virtual void Maximize( bool maximize );
+    virtual void Restore();
+    virtual void Iconize( bool iconize );
+    virtual bool IsIconized() const;
 
     virtual void Command( int id );
     
     void OnCloseWindow( wxCloseEvent& event );
     void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
     void OnSize( wxSizeEvent &event );
+    void OnIdle( wxIdleEvent &event );
 
     void OnMenuHighlight( wxMenuEvent& event );
 
     // implementation
 
     virtual void GtkOnSize( int x, int y, int width, int height );
-    virtual wxPoint GetClientAreaOrigin() const;
     void DoMenuUpdates();
     void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
     virtual void OnInternalIdle();
 
     wxMenuBar    *m_frameMenuBar;
-    wxMenuBar    *m_mdiMenuBar;
+#if wxUSE_STATUSBAR
     wxStatusBar  *m_frameStatusBar;
+#endif
+#if wxUSE_TOOLBAR
     wxToolBar    *m_frameToolBar;
+#endif
     wxString      m_title;
     wxIcon        m_icon;
     int           m_miniEdge,m_miniTitle;
+    GtkWidget    *m_mainWidget;
+    bool          m_menuBarDetached;
+    bool          m_toolBarDetached;
+    bool          m_insertInClientArea;  /* not from within OnCreateXXX */
 
 protected:
+    // common part of all ctors
+    void Init();
+    
     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;
 
 private:
     DECLARE_EVENT_TABLE()