minor fixes

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

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 5ca18eee70c6644bbda6211412adc8e2aa021949..2f30d72b4f328aff03baa4e2c52528868ef9fc6c 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -35,8 +35,8 @@ class wxMDIChildFrame;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char* wxFrameNameStr;
-extern const char* wxStatusLineNameStr;
+extern const wxChar* wxFrameNameStr;
+extern const wxChar* wxStatusLineNameStr;
 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
@@ -48,7 +48,7 @@ class wxMDIParentFrame: public wxFrame
 
   friend class wxMDIChildFrame;
   
-  public:
+public:
 
     wxMDIParentFrame(void);
     wxMDIParentFrame( wxWindow *parent,
@@ -65,32 +65,28 @@ class wxMDIParentFrame: public wxFrame
 
 
     void GetClientSize(int *width, int *height) const;
-    wxMDIChildFrame *GetActiveChild(void) const;
+    wxMDIChildFrame *GetActiveChild() const;
     
-    wxMDIClientWindow *GetClientWindow(void) const; 
-    virtual wxMDIClientWindow *OnCreateClient(void);
+    wxMDIClientWindow *GetClientWindow() const; 
+    virtual wxMDIClientWindow *OnCreateClient();
   
-    virtual void Cascade(void) {};
-    virtual void Tile(void) {};
-    virtual void ArrangeIcons(void) {};
-    virtual void ActivateNext(void);
-    virtual void ActivatePrevious(void);
+    virtual void Cascade() {}
+    virtual void Tile() {}
+    virtual void ArrangeIcons() {}
+    virtual void ActivateNext();
+    virtual void ActivatePrevious();
 
     void OnActivate( wxActivateEvent& event );
     void OnSysColourChanged( wxSysColourChangedEvent& event );
     
- // implementation
- 
-    wxMDIChildFrame                *m_currentChild;
-    
-    void SetMDIMenuBar( wxMenuBar *menu_bar );
+  // implementation
+
+    wxMDIClientWindow  *m_clientWindow;
+    bool                m_justInserted;
+
     virtual void GtkOnSize( int x, int y, int width, int height );
+    virtual void OnInternalIdle();
     
- private:
- 
-    wxMDIClientWindow              *m_clientWindow;
-    bool                            m_parentFrameActive;
-
   DECLARE_EVENT_TABLE()    
 };
 
@@ -104,7 +100,7 @@ class wxMDIChildFrame: public wxFrame
   
   public:
 
-    wxMDIChildFrame(void);
+    wxMDIChildFrame();
     wxMDIChildFrame( wxMDIParentFrame *parent,
       wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
@@ -116,12 +112,12 @@ 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 );
 
-  virtual void Activate(void);
+  virtual void Activate();
     
     // no status bars
   virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number)=1, long WXUNUSED(style)=1, 
@@ -131,13 +127,16 @@ class wxMDIChildFrame: public wxFrame
   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; }
-  virtual wxToolBar *GetToolBar() { return (wxToolBar*)NULL; }
+  virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
   
     // no icon
   void SetIcon( const wxIcon &icon ) { m_icon = icon; }
@@ -147,18 +146,16 @@ class wxMDIChildFrame: public wxFrame
   wxString GetTitle() const { return m_title; }
   
     // no maximize etc
-  virtual void Maximize(void) {}
-  virtual void Restore(void) {}
+  virtual void Maximize( bool WXUNUSED(maximize) ) {}
+  virtual void Restore() {}
     
   void OnActivate( wxActivateEvent &event );
     
-  public:
+  // implementation
   
     wxMenuBar         *m_menuBar;
-    
-//  private:
-  
     GtkNotebookPage   *m_page;
+    bool               m_justInserted;
     
   DECLARE_EVENT_TABLE()    
 };
@@ -171,7 +168,7 @@ class wxMDIClientWindow: public wxWindow
 {
   DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
   
-  public:
+public:
   
     wxMDIClientWindow(void);
     wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );