calling insert("") would provoke an assert - now it's just ignored

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

diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 76e0a5c5b155cc8a58033677fe0c076de36cb7f6..de2eb64a23b069dd727f073d6baa998c414d0390 100644 (file)
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -61,30 +61,41 @@ public:
 
   virtual bool Show( bool show );
   virtual void Enable( bool enable );
 
   virtual bool Show( bool show );
   virtual void Enable( bool enable );

+  virtual void Centre( int direction = wxHORIZONTAL );

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

-  
+

     // set minimal/maxmimal size for the frame
     // set minimal/maxmimal size for the frame

-  virtual void SetSizeHints( int minW, int minH, int maxW, int maxH, int incW = -1 );
+  virtual void SetSizeHints(int minW, int minH,
+                            int maxW = -1, int maxH = -1,
+                            int incW = -1 );

 
   virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
     const wxString& name = "statusBar");
 
   virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
     const wxString& name = "statusBar");

-  virtual wxStatusBar *GetStatusBar();
+  virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
+    const wxString& name );
+  virtual wxStatusBar *GetStatusBar() const;

   virtual void SetStatusText( const wxString &text, int number = 0 );
   virtual void SetStatusText( const wxString &text, int number = 0 );

-  virtual void SetStatusWidths( int n, int *width );
+  virtual void SetStatusWidths( int n, const int widths_field[] );

 
 

-  virtual wxToolBar* CreateToolBar( long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, 
+  virtual wxToolBar* CreateToolBar( long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1,

                                     const wxString& name = wxToolBarNameStr);
                                     const wxString& name = wxToolBarNameStr);

-  virtual wxToolBar *GetToolBar();
-  
+  virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
+  virtual wxToolBar *GetToolBar(void) const;
+

   virtual void SetMenuBar( wxMenuBar *menuBar );
   virtual void SetMenuBar( wxMenuBar *menuBar );

-  virtual wxMenuBar *GetMenuBar();
+  virtual wxMenuBar *GetMenuBar() const;

 
   virtual void SetTitle( const wxString &title );
   virtual 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 );
   virtual void SetIcon( const wxIcon &icon );

+  virtual void Iconize( bool WXUNUSED(iconize)) { }
+  virtual bool IsIconized(void) const { return FALSE; }
+  bool Iconized(void) const { return IsIconized(); }
+  virtual void Maximize(bool WXUNUSED(maximize)) {}
+  virtual void Restore(void) {}

 
   void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
   void OnSize( wxSizeEvent &event );
 
   void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
   void OnSize( wxSizeEvent &event );


@@ -102,6 +113,7 @@ private:
   // update frame's menus (called from OnIdle)
   void DoMenuUpdates();
   void DoMenuUpdates(wxMenu* menu);
   // update frame's menus (called from OnIdle)
   void DoMenuUpdates();
   void DoMenuUpdates(wxMenu* menu);

+  virtual void ImplementSetPosition();

 
   GtkWidget    *m_mainWindow;
   wxMenuBar    *m_frameMenuBar;
 
   GtkWidget    *m_mainWindow;
   wxMenuBar    *m_frameMenuBar;