1) APPCONF_ constants renamed to wxCONFIG_

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

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 22fe70b2c47b0edafc20d8cb2c8b1ad65e34b793..e56d71cdf491632fb76b0d3e21818a54d562829f 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -22,6 +22,7 @@
 #include "wx/control.h"
 #include "wx/panel.h"
 #include "wx/frame.h"
+#include "wx/toolbar.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -63,30 +64,36 @@ class wxMDIParentFrame: public wxFrame
       long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
       const wxString& name = wxFrameNameStr );
 
-  void OnSize( wxSizeEvent& event );
-  void OnActivate( wxActivateEvent& event );
 
-  void SetMenuBar( wxMenuBar *menu_bar );
-  void GetClientSize(int *width, int *height) const;
-  wxMDIChildFrame *GetActiveChild(void) const;
-  
-  wxMDIClientWindow *GetClientWindow(void) const; 
-  virtual wxMDIClientWindow *OnCreateClient(void);
+    void GetClientSize(int *width, int *height) const;
+    wxMDIChildFrame *GetActiveChild(void) const;
+    
+    wxMDIClientWindow *GetClientWindow(void) const; 
+    virtual wxMDIClientWindow *OnCreateClient(void);
   
-  virtual void Cascade(void) {};
-  virtual void Tile(void) {};
-  virtual void ArrangeIcons(void) {};
-  virtual void ActivateNext(void);
-  virtual void ActivatePrevious(void);
-
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
+    virtual void Cascade(void) {};
+    virtual void Tile(void) {};
+    virtual void ArrangeIcons(void) {};
+    virtual void ActivateNext(void);
+    virtual void ActivatePrevious(void);
+
+    void OnActivate( wxActivateEvent& event );
+    void OnSysColourChanged( wxSysColourChangedEvent& event );
+    
+ //private: 
+ 
+    wxMDIChildFrame                *m_currentChild;
+    
+    void SetMDIMenuBar( wxMenuBar *menu_bar );
+    virtual void GtkOnSize( int x, int y, int width, int height );
     
- protected:
-    wxMDIClientWindow *             m_clientWindow;
-    wxMDIChildFrame *               m_currentChild;
+ private:
+ 
+    wxMDIClientWindow              *m_clientWindow;
     bool                            m_parentFrameActive;
+    wxMenuBar                      *m_mdiMenuBar;
 
-//  DECLARE_EVENT_TABLE()    
+  DECLARE_EVENT_TABLE()    
 };
 
 //-----------------------------------------------------------------------------
@@ -120,9 +127,21 @@ class wxMDIChildFrame: public wxPanel
     virtual void Restore(void) {};
     virtual void Activate(void);
     
+    bool Destroy(void);
+    void OnCloseWindow( wxCloseEvent& event );
+    void OnSize( wxSizeEvent &event );
+    void OnActivate( wxActivateEvent &event );
+    
   public:
   
-    wxString    m_title;
+    wxString           m_title;
+    wxMenuBar         *m_menuBar;
+    
+//  private:
+  
+    GtkNotebookPage   *m_page;
+    
+  DECLARE_EVENT_TABLE()    
 };
 
 //-----------------------------------------------------------------------------