wxTREE_INSERT_XXX constants were incorrectly defined (and so inserting the

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

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 47f7037e0c8053c637ac9df76d1ba84df486fc5b..2c64cb50ffef8c1b9988dd3a656654a9297ddf0b 100644 (file)
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -19,15 +19,17 @@
 #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;
+class wxMDIClientWindow;
+class wxMenu;
+class wxMenuBar;
+class wxToolBar;
+class wxStatusBar;
 
 class wxFrame;
 
@@ -36,6 +38,7 @@ class wxFrame;
 //-----------------------------------------------------------------------------
 
 extern const char *wxFrameNameStr;
+extern const char *wxToolBarNameStr;
 
 //-----------------------------------------------------------------------------
 // wxFrame
@@ -64,20 +67,23 @@ public:
     // set minimal/maxmimal size for the frame
   virtual void SetSizeHints( int minW, int minH, int maxW, int maxH, int incW = -1 );
 
-  virtual bool CreateStatusBar( int number = 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( int style = 0, 
-                                    int orientation = wxHORIZONTAL, int rowsOrColumns = 1 );
+  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; }
+  virtual void SetTitle( const wxString &title );
+  virtual wxString GetTitle() const { return m_title; }
+  
+  virtual void SetIcon( const wxIcon &icon );
 
   void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
   void OnSize( wxSizeEvent &event );
@@ -90,6 +96,7 @@ public:
 private:
   friend  wxWindow;
   friend  wxMDIChildFrame;
+  friend  wxMDIClientWindow;
 
   // update frame's menus (called from OnIdle)
   void DoMenuUpdates();
@@ -100,9 +107,9 @@ private:
   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()
 };