Make list consistent with tree in terms of Vetoed changes closing the inline edit...

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 788761d769254c869c460df0a53c323b209789bf..3befcf231f4843e014234c108a7e9019cf0b0957 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -12,103 +11,104 @@
 #ifndef __GTKFRAMEH__
 #define __GTKFRAMEH__
 
 #ifndef __GTKFRAMEH__
 #define __GTKFRAMEH__
 

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #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"
-#include "wx/toolbar.h"
-

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxMDIChildFrame;
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 class wxMDIChildFrame;

-
-class wxFrame;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxFrameNameStr;
+class wxMDIClientWindow;
+class wxMenu;
+class wxMenuBar;
+class wxToolBar;
+class wxStatusBar;

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

-class wxFrame: public wxWindow
+class wxFrame : public wxFrameBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxFrame)

 public:
 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|wxFULL_REPAINT_ON_RESIZE,
+                                         wxWindowID id = 0,
+                                         const wxString& name = wxStatusLineNameStr);
+                                         
+    void SetStatusBar(wxStatusBar *statbar);
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+    virtual wxToolBar* CreateToolBar(long style = -1,
+                                     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;
+    int           m_menuBarHeight;
+    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);
+
+public:
+    // Menu size is dynamic now, call this whenever it might change.
+    void UpdateMenuBarSize();
+
+#endif // wxUSE_MENUS_NATIVE

 
 

-  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 Enable( bool enable );
-
-  virtual void GetClientSize( int *width, int *height ) const;
-  
-    // set minimal/maxmimal size for the frame
-  virtual void SetSizeHints( int minW, int minH, int maxW, int maxH, int incW = -1 );
-
-  virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
-    const wxString& name = "statusBar");
-  virtual wxStatusBar *GetStatusBar();
-  virtual void SetStatusText( const wxString &text, int number = 0 );
-  virtual void SetStatusWidths( int n, int *width );
-
-  virtual wxToolBar* CreateToolBar( long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, 
-                                    const wxString& name = wxToolBarNameStr);
-  virtual wxToolBar *GetToolBar();
-  
-  virtual void SetMenuBar( wxMenuBar *menuBar );
-  virtual wxMenuBar *GetMenuBar();
-
-  void SetTitle( const wxString &title );
-  wxString GetTitle() const { return m_title; }
-  
-  void SetIcon( const wxIcon &icon );
-
-  void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
-  void OnSize( wxSizeEvent &event );
-  void OnCloseWindow( wxCloseEvent& event );
-  void OnIdle(wxIdleEvent& event);
-
-  virtual void AddChild( wxWindow *child );
-  virtual void GtkOnSize( int x, int y, int width, int height );
-
-private:
-  friend  wxWindow;
-  friend  wxMDIChildFrame;
-
-  // update frame's menus (called from OnIdle)
-  void DoMenuUpdates();
-  void DoMenuUpdates(wxMenu* menu);
-
-  GtkWidget    *m_mainWindow;
-  wxMenuBar    *m_frameMenuBar;
-  wxStatusBar  *m_frameStatusBar;
-  wxToolBar    *m_frameToolBar;
-  int           m_toolBarHeight;
-  bool          m_doingOnSize;
-  bool          m_addPrivateChild;   // for toolbar (and maybe menubar)
-  wxString      m_title;
-  wxIcon        m_icon;
-
-  DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxFrame)

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