minor clean up

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index aacd0b427482ab20f71d2d9c80b6656a2f4a7491..8d3764474078b79680132c77cf3fe9b033d83434 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -1,11 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        frame.h
+// Name:        wx/gtk/frame.h

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -13,78 +12,131 @@
 #define __GTKFRAMEH__
 
 #ifdef __GNUG__
 #define __GTKFRAMEH__
 
 #ifdef __GNUG__

-#pragma interface
+    #pragma interface "frame.h"

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/window.h"
-#include "wx/menu.h"
-#include "wx/statusbr.h"
-

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxRadioBox;
-
-class wxFrame;
+class wxMDIChildFrame;
+class wxMDIClientWindow;
+class wxMenu;
+class wxMenuBar;
+class wxToolBar;
+class wxStatusBar;

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// global data
+// wxFrameGTK

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-extern const char *wxFrameNameStr;
+class wxFrameGTK : public wxFrameBase
+{
+public:
+    // construction
+    wxFrameGTK() { Init(); }
+    wxFrameGTK(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();

 
 

-//-----------------------------------------------------------------------------
-// wxFrame
-//-----------------------------------------------------------------------------
+        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 ~wxFrameGTK();
+
+    // 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 bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+    virtual bool IsFullScreen() const { return m_fsIsShowing; };
+
+#if wxUSE_STATUSBAR
+    virtual void PositionStatusBar();
+
+    virtual wxStatusBar* CreateStatusBar(int number = 1,
+                                         long style = wxST_SIZEGRIP,
+                                         wxWindowID id = 0,
+                                         const wxString& name = wxStatusLineNameStr);
+#endif // wxUSE_STATUSBAR
+
+#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 bool Show(bool show = TRUE);
+
+    virtual void SetTitle( const wxString &title );
+    virtual wxString GetTitle() const { return m_title; }
+
+    // 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 void OnInternalIdle();
+
+    // do *not* call this to iconize the frame, this is a private function!
+    void SetIconizeState(bool iconic);

 
 

-class wxFrame: public wxWindow
-{
-  DECLARE_DYNAMIC_CLASS(wxFrame)
-
-  public:
-  
-    wxFrame(void);
-    wxFrame( wxWindow *parent, const wxWindowID id, const wxString &title, 
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
-    bool Create( wxWindow *parent, const wxWindowID id, const wxString &title,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
-    ~wxFrame(void);
-    bool Destroy(void);
-    void OnCloseWindow( wxCloseEvent& event );
-    virtual bool Show( const bool show );
-    virtual void Enable( const bool enable );
-    virtual void GetClientSize( int *width, int *height ) const;
-    void OnSize( wxSizeEvent &event );
-    void SetMenuBar( wxMenuBar *menuBar );
-    virtual bool CreateStatusBar( const int number = 1 );
-    virtual void SetStatusText( const wxString &text, const int number = 0 );
-    virtual void SetStatusWidths( const int n, const int *width );
-    wxStatusBar *GetStatusBar(void);
-    wxMenuBar *GetMenuBar(void);
-    void SetTitle( const wxString &title );
-    wxString GetTitle(void) const;
-    void OnActivate( wxActivateEvent &WXUNUSED(event) ) {};
-    
-    void GtkOnSize( int width, int height );
-    
-  private:
-  
-    friend        wxWindow;
-    
-    GtkWidget    *m_mainWindow;
-    wxMenuBar    *m_frameMenuBar;
-    wxStatusBar  *m_frameStatusBar;
-    bool          m_doingOnSize;

     wxString      m_title;
     wxString      m_title;

-    
-    
-  DECLARE_EVENT_TABLE()
-    
+    int           m_miniEdge,
+                  m_miniTitle;
+    GtkWidget    *m_mainWidget;
+    bool          m_menuBarDetached;
+    bool          m_toolBarDetached;
+    bool          m_insertInClientArea;  /* not from within OnCreateXXX */
+
+    bool          m_fsIsShowing;         /* full screen */
+    long          m_fsSaveStyle;
+    long          m_fsSaveFlag;
+    wxRect        m_fsSaveFrame;
+
+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;
+
+#if wxUSE_MENUS_NATIVE
+    virtual void DetachMenuBar();
+    virtual void AttachMenuBar(wxMenuBar *menubar);
+#endif // wxUSE_MENUS_NATIVE
+
+    // is the frame currently iconized?
+    bool m_isIconized;

 };
 
 #endif // __GTKFRAMEH__
 };
 
 #endif // __GTKFRAMEH__