Added wxPoem sample; fixed some Dialog Editor problems; wxStaticBitmap and wxBitmapButton

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

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index e56d71cdf491632fb76b0d3e21818a54d562829f..95d9df89f4659bb77c8fa4c64c4cf719e702119e 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -80,7 +79,7 @@ class wxMDIParentFrame: public wxFrame
     void OnActivate( wxActivateEvent& event );
     void OnSysColourChanged( wxSysColourChangedEvent& event );
     
     void OnActivate( wxActivateEvent& event );
     void OnSysColourChanged( wxSysColourChangedEvent& event );
     

- //private: 
+ // implementation

  
     wxMDIChildFrame                *m_currentChild;
     
  
     wxMDIChildFrame                *m_currentChild;
     


@@ -100,7 +99,7 @@ class wxMDIParentFrame: public wxFrame
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 

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

 {
   DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
   
 {
   DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
   


@@ -116,25 +115,46 @@ 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();

 
 

-    // 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(void);

     
     

-    bool Destroy(void);
-    void OnCloseWindow( wxCloseEvent& event );
-    void OnSize( wxSizeEvent &event );
-    void OnActivate( wxActivateEvent &event );
+    // 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) ) {}
+
+    // no size hints
+  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; }
+  
+    // no icon
+  void SetIcon( const wxIcon &icon ) { m_icon = icon; }
+    
+    // no title 
+  void SetTitle( const wxString &title ) { m_title = title; }
+  wxString GetTitle() const { return m_title; }
+  
+    // no maximize etc
+  virtual void Maximize(void) {}
+  virtual void Restore(void) {}
+    
+  void OnActivate( wxActivateEvent &event );

     
   public:
   
     
   public:
   

-    wxString           m_title;

     wxMenuBar         *m_menuBar;
     
 //  private:
     wxMenuBar         *m_menuBar;
     
 //  private:


@@ -158,7 +178,6 @@ class wxMDIClientWindow: public wxWindow
     wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
     ~wxMDIClientWindow(void);
     virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
     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__