some common code moved from wxWindow/wxFrame into files in common subdir

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

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index ff9181d771eb5285e905e495f6dad5acaa80d9b7..94fe7216b0319eee9135d3d9e6348b9d1218db46 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
@@ -52,41 +53,51 @@ class wxMDIParentFrame: public wxFrame
 
     wxMDIParentFrame(void);
     wxMDIParentFrame( wxWindow *parent,
-      const wxWindowID id, const wxString& title,
+      wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-      const long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
+      long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
       const wxString& name = wxFrameNameStr );
   ~wxMDIParentFrame(void);
    bool Create( wxWindow *parent,
-      const wxWindowID id, const wxString& title,
+      wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-      const long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
+      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;
+    void GetClientSize(int *width, int *height) const;
+    wxMDIChildFrame *GetActiveChild(void) const;
+    
+    virtual void SetToolBar( wxToolBar *toolbar );
+    virtual wxWindow *GetToolBar(void) const;
   
-  wxMDIClientWindow *GetClientWindow(void) const; 
-  virtual wxMDIClientWindow *OnCreateClient(void);
+    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;
     
- protected:
-    wxMDIClientWindow *             m_clientWindow;
-    wxMDIChildFrame *               m_currentChild;
+    void SetMDIMenuBar( wxMenuBar *menu_bar );
+    virtual void GtkOnSize( int x, int y, int width, int height );
+    
+ private:
+ 
+    wxMDIClientWindow              *m_clientWindow;
     bool                            m_parentFrameActive;
+    wxMenuBar                      *m_mdiMenuBar;
+    wxToolBar                      *m_toolBar;
 
-//  DECLARE_EVENT_TABLE()    
+  DECLARE_EVENT_TABLE()    
 };
 
 //-----------------------------------------------------------------------------
@@ -101,28 +112,38 @@ class wxMDIChildFrame: public wxPanel
 
     wxMDIChildFrame(void);
     wxMDIChildFrame( wxMDIParentFrame *parent,
-      const wxWindowID id, const wxString& title,
+      wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-      const long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
+      long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
     ~wxMDIChildFrame(void);
     bool Create( wxMDIParentFrame *parent,
-      const wxWindowID id, const wxString& title,
+      wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-      const long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
+      long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
     void SetMenuBar( wxMenuBar *menu_bar );
 
     // no status bars in wxGTK
-    virtual bool CreateStatusBar( const int WXUNUSED(number) = 1 ) { return FALSE; };
-    virtual void SetStatusText( const wxString &WXUNUSED(text), const int WXUNUSED(number) ) {};
-    virtual void SetStatusWidths( const int WXUNUSED(n), const int *WXUNUSED(width) ) {};
-    
+    virtual bool CreateStatusBar( int WXUNUSED(number) = 1 ) { return FALSE; };
+    virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {};
+    virtual void SetStatusWidths( int WXUNUSED(n), int *WXUNUSED(width) ) {};
+
     virtual void Maximize(void) {};
     virtual void Restore(void) {};
     virtual void Activate(void);
     
+    bool Destroy(void);
+    void OnCloseWindow( wxCloseEvent& event );
+    
   public:
   
-    wxString    m_title;
+    wxString           m_title;
+    wxMenuBar         *m_menuBar;
+    
+//  private:
+  
+    GtkNotebookPage   *m_page;
+    
+  DECLARE_EVENT_TABLE()    
 };
 
 //-----------------------------------------------------------------------------
@@ -136,9 +157,9 @@ class wxMDIClientWindow: public wxWindow
   public:
   
     wxMDIClientWindow(void);
-    wxMDIClientWindow( wxMDIParentFrame *parent, const long style = 0 );
+    wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
     ~wxMDIClientWindow(void);
-    virtual bool CreateClient( wxMDIParentFrame *parent, const long style = wxVSCROLL | wxHSCROLL );
+    virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
     void AddChild( wxWindow *child );
 };