Checking for wxUSE_SOCKETS and __GSOCKET_STANDALONE__ should be right, now

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

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 95d9df89f4659bb77c8fa4c64c4cf719e702119e..f2a3f7367acbae73e7d3d9fc3564d0df68444675 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/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


@@ -48,9 +48,9 @@ class wxMDIParentFrame: public wxFrame
 
   friend class wxMDIChildFrame;
   
 
   friend class wxMDIChildFrame;
   

-  public:
+public:

 
 

-    wxMDIParentFrame(void);
+    wxMDIParentFrame();

     wxMDIParentFrame( wxWindow *parent,
       wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
     wxMDIParentFrame( wxWindow *parent,
       wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,


@@ -65,33 +65,28 @@ class wxMDIParentFrame: public wxFrame
 
 
     void GetClientSize(int *width, int *height) const;
 
 
     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 );
     
 
     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 GtkOnSize( int x, int y, int width, int height );

+    virtual void OnInternalIdle();

     
     

- private:
- 
-    wxMDIClientWindow              *m_clientWindow;
-    bool                            m_parentFrameActive;
-    wxMenuBar                      *m_mdiMenuBar;
-

   DECLARE_EVENT_TABLE()    
 };
 
   DECLARE_EVENT_TABLE()    
 };
 


@@ -105,40 +100,45 @@ class wxMDIChildFrame: public wxFrame
   
   public:
 
   
   public:
 

-    wxMDIChildFrame(void);
+    wxMDIChildFrame();

     wxMDIChildFrame( wxMDIParentFrame *parent,
       wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
       long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
     wxMDIChildFrame( wxMDIParentFrame *parent,
       wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
       long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );

-    ~wxMDIChildFrame(void);
+    ~wxMDIChildFrame();

     bool Create( wxMDIParentFrame *parent,
       wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
       long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
       
   virtual void SetMenuBar( wxMenuBar *menu_bar );
     bool Create( wxMDIParentFrame *parent,
       wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
       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 );
 

-  virtual void Activate(void);
+  virtual void Activate();

     
     

+#if wxUSE_STATUSBAR

     // 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 void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {}
-  virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {}
+  virtual wxStatusBar *GetStatusBar() const { return (wxStatusBar*)NULL; }
+  virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {}
+  virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
+#endif

 
     // no size hints
 
     // 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), int WXUNUSED(incH) ) {}

   
   

+#if wxUSE_TOOLBAR

     // 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; }
+#endif

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


@@ -148,18 +148,16 @@ class wxMDIChildFrame: public wxFrame
   wxString GetTitle() const { return m_title; }
   
     // no maximize etc
   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 );
     
     
   void OnActivate( wxActivateEvent &event );
     

-  public:
+  // implementation

   
     wxMenuBar         *m_menuBar;
   
     wxMenuBar         *m_menuBar;

-    
-//  private:
-  

     GtkNotebookPage   *m_page;
     GtkNotebookPage   *m_page;

+    bool               m_justInserted;

     
   DECLARE_EVENT_TABLE()    
 };
     
   DECLARE_EVENT_TABLE()    
 };


@@ -172,11 +170,11 @@ class wxMDIClientWindow: public wxWindow
 {
   DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
   
 {
   DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
   

-  public:
+public:

   
   

-    wxMDIClientWindow(void);
+    wxMDIClientWindow();

     wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
     wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );

-    ~wxMDIClientWindow(void);
+    ~wxMDIClientWindow();

     virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
 };
 
     virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
 };