Added missing | symbol

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

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 081cd5a407a86899235684062f166328a95fef0d..cde7a8983d0c83247485a4316d6ab80f124a7f95 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/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;
     
@@ -91,7 +90,6 @@ class wxMDIParentFrame: public wxFrame
  
     wxMDIClientWindow              *m_clientWindow;
     bool                            m_parentFrameActive;
-    wxMenuBar                      *m_mdiMenuBar;
 
   DECLARE_EVENT_TABLE()    
 };
@@ -118,7 +116,7 @@ class wxMDIChildFrame: public wxFrame
       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 );
@@ -139,7 +137,7 @@ class wxMDIChildFrame: public wxFrame
     // 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; }
@@ -179,7 +177,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__