X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30f1b5f3ef80156808e5a96b2abd63c62a1f5894..eaeb6a3c3754be1381d87af44e36c2a947a1493c:/include/wx/gtk/frame.h?ds=inline

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index de86ad8e1a..210aa7b612 100644
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        frame.h
+// Name:        wx/gtk/frame.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -12,14 +12,9 @@
 #define __GTKFRAMEH__
 
 #ifdef __GNUG__
-#pragma interface
+    #pragma interface "frame.h"
 #endif
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/window.h"
-#include "wx/icon.h"
-
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
@@ -33,98 +28,101 @@ class wxStatusBar;
 
 class wxFrame;
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxFrameNameStr;
-extern const char *wxToolBarNameStr;
-
 //-----------------------------------------------------------------------------
 // wxFrame
 //-----------------------------------------------------------------------------
 
-class wxFrame: public wxWindow
+class wxFrame : public wxFrameBase
 {
-DECLARE_DYNAMIC_CLASS(wxFrame)
-
 public:
-    wxFrame();
-    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 );
-    bool Create( wxWindow *parent, wxWindowID id, const wxString &title,
-            const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
-    ~wxFrame();
-    bool Destroy();
-
-    virtual bool Show( bool show );
-    virtual void Centre( int direction = wxHORIZONTAL );
-
-    virtual void GetClientSize( int *width, int *height ) const;
-
-    virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
-            const wxString& name = "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[] );
-
-    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; }
+    // 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)
+    {
+        Init();
+
+        Create(parent, id, title, pos, size, style, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxDEFAULT_FRAME_STYLE,
+                const wxString& name = wxFrameNameStr);
+
+    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 );
-    virtual wxMenuBar *GetMenuBar() const;
 
-    virtual void SetTitle( const wxString &title );
-    virtual wxString GetTitle() const { return m_title; }
+#if wxUSE_STATUSBAR
+    virtual wxStatusBar* CreateStatusBar(int number = 1,
+                                         long style = wxST_SIZEGRIP,
+                                         wxWindowID id = 0,
+                                         const wxString& name = wxStatusLineNameStr);
+#endif // wxUSE_STATUSBAR
 
-    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() {}
+#if wxUSE_TOOLBAR
+    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
+                                     wxWindowID id = -1,
+                                     const wxString& name = wxToolBarNameStr);
+    void SetToolBar(wxToolBar *toolbar);
+#endif // wxUSE_TOOLBAR
 
-    virtual void Command( int id );
-    
-    void OnCloseWindow( wxCloseEvent& event );
-    void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
-    void OnSize( wxSizeEvent &event );
+    virtual bool Show(bool show);
 
-    void OnMenuHighlight( wxMenuEvent& event );
+    virtual void SetTitle( const wxString &title );
+    virtual wxString GetTitle() const { return m_title; }
 
-    // implementation
+    // implementation from now on
+    // --------------------------
 
+    // move the window to the specified location and resize it: this is called
+    // from both DoSetSize() and DoSetClientSize() 
+    virtual void DoMoveWindow(int x, int y, int width, int height);
+    
+    // GTK callbacks
     virtual void GtkOnSize( int x, int y, int width, int height );
-    virtual wxPoint GetClientAreaOrigin() const;
-    void DoMenuUpdates();
-    void DoMenuUpdates(wxMenu* menu);
     virtual void OnInternalIdle();
 
-    wxMenuBar    *m_frameMenuBar;
-    wxMenuBar    *m_mdiMenuBar;
-    wxStatusBar  *m_frameStatusBar;
-    wxToolBar    *m_frameToolBar;
     wxString      m_title;
-    wxIcon        m_icon;
-    int           m_miniEdge,m_miniTitle;
+    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();
+
+    // 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;
 
 private:
-    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxFrame)
 };
 
 #endif // __GTKFRAMEH__