changed removed wxToUpper to standard toupper

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

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 95d9df89f4659bb77c8fa4c64c4cf719e702119e..d49600fa0a2e15dd8e3cb0f23253425d39107557 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -90,7 +90,6 @@ class wxMDIParentFrame: public wxFrame
  
     wxMDIClientWindow              *m_clientWindow;
     bool                            m_parentFrameActive;
  
     wxMDIClientWindow              *m_clientWindow;
     bool                            m_parentFrameActive;

-    wxMenuBar                      *m_mdiMenuBar;

 
   DECLARE_EVENT_TABLE()    
 };
 
   DECLARE_EVENT_TABLE()    
 };


@@ -117,7 +116,7 @@ class wxMDIChildFrame: public wxFrame
       long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
       
   virtual void SetMenuBar( wxMenuBar *menu_bar );
       long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
       
   virtual void SetMenuBar( wxMenuBar *menu_bar );

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

 
   virtual void GetClientSize( int *width, int *height ) const;
   virtual void AddChild( wxWindow *child );
 
   virtual void GetClientSize( int *width, int *height ) const;
   virtual void AddChild( wxWindow *child );


@@ -132,13 +131,16 @@ class wxMDIChildFrame: public wxFrame
   virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {}
 
     // no size hints
   virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {}
 
     // no size hints

-  virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH), int WXUNUSED(maxW), 
-    int WXUNUSED(maxH), int WXUNUSED(incW) ) {}
+  virtual void SetSizeHints( int WXUNUSED(minW), int WXUNUSED(minH),
+                             int WXUNUSED(maxW), int WXUNUSED(maxH),
+                             int WXUNUSED(incW) )
+  {
+  }

   
     // no toolbar bars
   virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id), 
     const wxString& WXUNUSED(name) ) { return (wxToolBar*)NULL; }
   
     // no toolbar bars
   virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id), 
     const wxString& WXUNUSED(name) ) { return (wxToolBar*)NULL; }

-  virtual wxToolBar *GetToolBar() { return (wxToolBar*)NULL; }
+  virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }

   
     // no icon
   void SetIcon( const wxIcon &icon ) { m_icon = icon; }
   
     // no icon
   void SetIcon( const wxIcon &icon ) { m_icon = icon; }