wxHTML classes description is now in alphabetical order

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

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index ff370ad38ceb504deac6e5c41b7cfa4815c71f4c..0de3e863bcd46e2be7d39ec2ff16984f3ebb0479 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -50,7 +50,7 @@ class wxMDIParentFrame: public wxFrame
   
 public:
 
-    wxMDIParentFrame(void);
+    wxMDIParentFrame();
     wxMDIParentFrame( wxWindow *parent,
       wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
@@ -105,7 +105,7 @@ class wxMDIChildFrame: public wxFrame
       wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
       long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
-    ~wxMDIChildFrame(void);
+    ~wxMDIChildFrame();
     bool Create( wxMDIParentFrame *parent,
       wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
@@ -115,26 +115,34 @@ class wxMDIChildFrame: public wxFrame
   virtual wxMenuBar *GetMenuBar() const;
 
   virtual void GetClientSize( int *width, int *height ) const;
-  virtual void AddChild( wxWindow *child );
+  virtual void AddChild( wxWindowBase *child );
 
   virtual void Activate();
     
+#if wxUSE_STATUSBAR
     // no status bars
-  virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number)=1, long WXUNUSED(style)=1, 
-    wxWindowID WXUNUSED(id)=1, const wxString& WXUNUSED(name)=WXSTRINGCAST NULL ) {return (wxStatusBar*)NULL; }
+  virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number) = 1,
+                                        long WXUNUSED(style) = 1, 
+                                        wxWindowID WXUNUSED(id) = 1,
+                                        const wxString& WXUNUSED(name) = wxEmptyString)
+    { return (wxStatusBar*)NULL; }
+
   virtual wxStatusBar *GetStatusBar() const { return (wxStatusBar*)NULL; }
-  virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {}
+  virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {}
   virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
+#endif
 
     // no size hints
   virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH),
                                int WXUNUSED(maxW), int WXUNUSED(maxH),
                                int WXUNUSED(incW), int WXUNUSED(incH) ) {}
   
+#if wxUSE_TOOLBAR
     // no toolbar bars
   virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id), 
     const wxString& WXUNUSED(name) ) { return (wxToolBar*)NULL; }
   virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
+#endif
   
     // no icon
   void SetIcon( const wxIcon &icon ) { m_icon = icon; }
@@ -168,9 +176,9 @@ class wxMDIClientWindow: public wxWindow
   
 public:
   
-    wxMDIClientWindow(void);
+    wxMDIClientWindow();
     wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
-    ~wxMDIClientWindow(void);
+    ~wxMDIClientWindow();
     virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
 };