* Fixes and new features in wxObject*Stream

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

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index e98c4acd1768822467cf5f5f2e91d112d89e0d46..2c64cb50ffef8c1b9988dd3a656654a9297ddf0b 100644 (file)
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -19,14 +19,17 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/window.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/window.h"

-#include "wx/menu.h"
-#include "wx/statusbr.h"

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

+class wxMDIClientWindow;
+class wxMenu;
+class wxMenuBar;
+class wxToolBar;
+class wxStatusBar;

 
 class wxFrame;
 
 
 class wxFrame;
 


@@ -35,6 +38,7 @@ class wxFrame;
 //-----------------------------------------------------------------------------
 
 extern const char *wxFrameNameStr;
 //-----------------------------------------------------------------------------
 
 extern const char *wxFrameNameStr;

+extern const char *wxToolBarNameStr;

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


@@ -42,8 +46,9 @@ extern const char *wxFrameNameStr;
 
 class wxFrame: public wxWindow
 {
 
 class wxFrame: public wxWindow
 {

+  DECLARE_DYNAMIC_CLASS(wxFrame)

 public:
 public:

-  // construction
+

   wxFrame();
   wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
     const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
   wxFrame();
   wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
     const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,


@@ -54,43 +59,44 @@ public:
   ~wxFrame();
   bool Destroy();
 
   ~wxFrame();
   bool Destroy();
 

-  // operations
-    //

   virtual bool Show( bool show );
   virtual void Enable( bool enable );
 
   virtual bool Show( bool show );
   virtual void Enable( bool enable );
 

-    // frame size

   virtual void GetClientSize( int *width, int *height ) const;
   virtual void GetClientSize( int *width, int *height ) const;

-    // set minimal size for the frame (@@@ other params not implemented)
-  void SetSizeHints(int minW, int minH,
-                    int maxW = -1, int maxH = -1,
-                    int incW = -1);
-
-    // status bar
-  virtual bool CreateStatusBar( int number = 1 );
-  wxStatusBar *GetStatusBar();
+  
+    // 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 void SetStatusText( const wxString &text, int number = 0 );
   virtual void SetStatusWidths( int n, int *width );
 

-    // menu bar
-  void SetMenuBar( wxMenuBar *menuBar );
-  wxMenuBar *GetMenuBar();
+  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();

 
 

-    // frame title
-  void SetTitle( const wxString &title );
-  wxString GetTitle() const { return m_title; }
+  virtual void SetTitle( const wxString &title );
+  virtual wxString GetTitle() const { return m_title; }
+  
+  virtual void SetIcon( const wxIcon &icon );

 
 

-  // implementation
-  void OnActivate( wxActivateEvent &event ) { } // called from docview.cpp
+  void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp

   void OnSize( wxSizeEvent &event );
   void OnCloseWindow( wxCloseEvent& event );
   void OnIdle(wxIdleEvent& event);
 
   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;
   virtual void GtkOnSize( int x, int y, int width, int height );
 
 private:
   friend  wxWindow;
   friend  wxMDIChildFrame;

+  friend  wxMDIClientWindow;

 
   // update frame's menus (called from OnIdle)
   void DoMenuUpdates();
 
   // update frame's menus (called from OnIdle)
   void DoMenuUpdates();


@@ -99,10 +105,12 @@ private:
   GtkWidget    *m_mainWindow;
   wxMenuBar    *m_frameMenuBar;
   wxStatusBar  *m_frameStatusBar;
   GtkWidget    *m_mainWindow;
   wxMenuBar    *m_frameMenuBar;
   wxStatusBar  *m_frameStatusBar;

-  bool          m_doingOnSize;
+  wxToolBar    *m_frameToolBar;
+  int           m_toolBarHeight;
+  bool          m_addPrivateChild;   // for toolbar (and maybe menubar)

   wxString      m_title;
   wxString      m_title;

+  wxIcon        m_icon;

 
 

-  DECLARE_DYNAMIC_CLASS(wxFrame)

   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };