Fixed OS/2 compilation problems.

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

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index aacd0b427482ab20f71d2d9c80b6656a2f4a7491..662886cf68e79d1fbc1e4f254abea0884be68908 100644 (file)
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -1,11 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        frame.h
+// Name:        wx/gtk/frame.h
 // 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,94 @@
 #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/menu.h"
-#include "wx/statusbr.h"
-
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
-class wxRadioBox;
-
-class wxFrame;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxFrameNameStr;
+class wxMDIChildFrame;
+class wxMDIClientWindow;
+class wxMenu;
+class wxMenuBar;
+class wxToolBar;
+class wxStatusBar;
 
 //-----------------------------------------------------------------------------
 // wxFrame
 //-----------------------------------------------------------------------------
 
-class wxFrame: public wxWindow
+class wxFrame : public wxFrameBase
 {
-  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;
-    
-    
-  DECLARE_EVENT_TABLE()
+public:
+    // 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();
+
+#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
     
+    wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); }
+
+    // implementation from now on
+    // --------------------------
+
+    // GTK callbacks
+    virtual void GtkOnSize( int x, int y, int width, int height );
+    virtual void OnInternalIdle();
+
+    bool          m_menuBarDetached;
+    bool          m_toolBarDetached;
+
+protected:
+    // common part of all ctors
+    void Init();
+
+    // override wxWindow methods to take into account tool/menu/statusbars
+    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
+
+    DECLARE_DYNAMIC_CLASS(wxFrame)
 };
 
 #endif // __GTKFRAMEH__