* Some more CopyObject()

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

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 5ec157d4ad305fd3be75bbee5ee0e3ba2594191a..ff370ad38ceb504deac6e5c41b7cfa4815c71f4c 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -35,8 +35,8 @@ class wxMDIChildFrame;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char* wxFrameNameStr;
-extern const char* wxStatusLineNameStr;
+extern const wxChar* wxFrameNameStr;
+extern const wxChar* wxStatusLineNameStr;

 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame


@@ -122,16 +122,14 @@ class wxMDIChildFrame: public wxFrame
     // 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; }
     // 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 *GetStatusBar() { 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) ) {}

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

 
     // no size hints
   virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH),
 
     // no size hints
   virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH),

-                             int WXUNUSED(maxW), int WXUNUSED(maxH),
-                             int WXUNUSED(incW) )
-  {
-  }
+                               int WXUNUSED(maxW), int WXUNUSED(maxH),
+                               int WXUNUSED(incW), int WXUNUSED(incH) ) {}

   
     // no toolbar bars
   virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id), 
   
     // no toolbar bars
   virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id),