Work on streams of all sorts. More to come.

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

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index b53e87c26f971103c89a74c95440df92eb5d169e..c97928de91928d8628f53c4004bf728ea76e0637 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
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -36,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


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

-  public:
+public:

 
     wxMDIParentFrame(void);
     wxMDIParentFrame( wxWindow *parent,
 
     wxMDIParentFrame(void);
     wxMDIParentFrame( wxWindow *parent,


@@ -66,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 );
     

- //private: 
- 
-    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()    
 };
 


@@ -100,13 +94,13 @@ class wxMDIParentFrame: public wxFrame
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 

-class wxMDIChildFrame: public wxPanel
+class wxMDIChildFrame: public wxFrame

 {
   DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
   
   public:
 
 {
   DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
   
   public:
 

-    wxMDIChildFrame(void);
+    wxMDIChildFrame();

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


@@ -116,29 +110,54 @@ class wxMDIChildFrame: public wxPanel
       wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
       long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );
       wxWindowID id, const wxString& title,
       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
       long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr );

-    void SetMenuBar( wxMenuBar *menu_bar );
+      
+  virtual void SetMenuBar( wxMenuBar *menu_bar );
+  virtual wxMenuBar *GetMenuBar() const;

 
 

-    // no status bars in wxGTK
-    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 GetClientSize( int *width, int *height ) const;
+  virtual void AddChild( wxWindow *child );

 
 

-    virtual void Maximize(void) {};
-    virtual void Restore(void) {};
-    virtual void Activate(void);
+  virtual void Activate();

     
     

-    bool Destroy(void);
-    void OnCloseWindow( wxCloseEvent& event );
-    void OnSize( wxSizeEvent &event );
+#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; }
+  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
+  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; }
+  virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
+#endif
+  
+    // no icon
+  void SetIcon( const wxIcon &icon ) { m_icon = icon; }

     
     

-  public:
+    // no title 
+  void SetTitle( const wxString &title ) { m_title = title; }
+  wxString GetTitle() const { return m_title; }

   
   

-    wxString           m_title;
-    wxMenuBar         *m_menuBar;
+    // no maximize etc
+  virtual void Maximize( bool WXUNUSED(maximize) ) {}
+  virtual void Restore() {}

     
     

-//  private:
+  void OnActivate( wxActivateEvent &event );
+    
+  // implementation

   
   

+    wxMenuBar         *m_menuBar;

     GtkNotebookPage   *m_page;
     GtkNotebookPage   *m_page;

+    bool               m_justInserted;

     
   DECLARE_EVENT_TABLE()    
 };
     
   DECLARE_EVENT_TABLE()    
 };


@@ -151,13 +170,12 @@ class wxMDIClientWindow: public wxWindow
 {
   DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
   
 {
   DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
   

-  public:
+public:

   
     wxMDIClientWindow(void);
     wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
     ~wxMDIClientWindow(void);
     virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
   
     wxMDIClientWindow(void);
     wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
     ~wxMDIClientWindow(void);
     virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );

-    void AddChild( wxWindow *child );

 };
 
 #endif // __MDIH__
 };
 
 #endif // __MDIH__