Did much work on colors. It doesn't work and I guess

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

diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index de2eb64a23b069dd727f073d6baa998c414d0390..c9274982acf52dcfcf1155a41ad35fd7bf07f599 100644 (file)
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -66,16 +66,12 @@ public:
   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
-  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 *OnCreateStatusBar( int number, long style, wxWindowID id,
     const wxString& name );
   virtual wxStatusBar *GetStatusBar() const;
   virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
     const wxString& name = "statusBar");
   virtual wxStatusBar *OnCreateStatusBar( int number, long style, wxWindowID id,
     const wxString& name );
   virtual wxStatusBar *GetStatusBar() const;

+  inline void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }

   virtual void SetStatusText( const wxString &text, int number = 0 );
   virtual void SetStatusWidths( int n, const int widths_field[] );
 
   virtual void SetStatusText( const wxString &text, int number = 0 );
   virtual void SetStatusWidths( int n, const int widths_field[] );
 


@@ -83,6 +79,7 @@ public:
                                     const wxString& name = wxToolBarNameStr);
   virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
   virtual wxToolBar *GetToolBar(void) const;
                                     const wxString& name = wxToolBarNameStr);
   virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
   virtual wxToolBar *GetToolBar(void) const;

+  inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }

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