fixes to previous fixes for Sun's CC 5.0

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

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 497f302e6039c510eddc4f48a56c5b9dc9ee886f..95d9df89f4659bb77c8fa4c64c4cf719e702119e 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -2,9 +2,8 @@
 // Name:        mdi.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -80,7 +79,7 @@ class wxMDIParentFrame: public wxFrame
     void OnActivate( wxActivateEvent& event );
     void OnSysColourChanged( wxSysColourChangedEvent& event );
     
- //private: 
+ // implementation
  
     wxMDIChildFrame                *m_currentChild;
     
@@ -126,8 +125,8 @@ class wxMDIChildFrame: public wxFrame
   virtual void Activate(void);
     
     // no status bars
-  virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number), long WXUNUSED(style), 
-    wxWindowID WXUNUSED(id), const wxString& WXUNUSED(name) ) {return (wxStatusBar*)NULL; }
+  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 *GetStatusBar() { return (wxStatusBar*)NULL; }
   virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {}
   virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {}
@@ -152,7 +151,7 @@ class wxMDIChildFrame: public wxFrame
   virtual void Maximize(void) {}
   virtual void Restore(void) {}
     
-    void OnActivate( wxActivateEvent &event );
+  void OnActivate( wxActivateEvent &event );
     
   public:
   
@@ -179,7 +178,6 @@ class wxMDIClientWindow: public wxWindow
     wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
     ~wxMDIClientWindow(void);
     virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
-    void AddChild( wxWindow *child );
 };
 
 #endif // __MDIH__