applied heavily modified patch 1116702: support for specifying disabled toolbar image...

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

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index e8f87df94d28eee41ecb72e144c8e88e0987872e..991610644efecbdd524f3d9cac879381935c80cc 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -1,17 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mdi.h
+// Name:        gtk/mdi.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __MDIH__
 #define __MDIH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __MDIH__
 #define __MDIH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -45,47 +45,57 @@ extern const wxChar* wxStatusLineNameStr;
 class wxMDIParentFrame: public wxFrame
 {
 public:
 class wxMDIParentFrame: public wxFrame
 {
 public:

-    wxMDIParentFrame();
-    wxMDIParentFrame( wxWindow *parent,
-        wxWindowID id, const wxString& title,
-        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-        long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-        const wxString& name = wxFrameNameStr );
-    ~wxMDIParentFrame(void);
+    wxMDIParentFrame() { Init(); }
+    wxMDIParentFrame(wxWindow *parent,
+                     wxWindowID id,
+                     const wxString& title,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
+                     long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
+                     const wxString& name = wxFrameNameStr)
+    {
+        Init();
+
+        (void)Create(parent, id, title, pos, size, style, name);
+    }
+
+    ~wxMDIParentFrame();

     bool Create( wxWindow *parent,
     bool Create( wxWindow *parent,

-       wxWindowID id, const wxString& title,
-       const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-       long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-       const wxString& name = wxFrameNameStr );
+                 wxWindowID id,
+                 const wxString& title,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
+                 const wxString& name = wxFrameNameStr );

 
 

-    void GetClientSize(int *width, int *height) const;

     wxMDIChildFrame *GetActiveChild() const;
     wxMDIChildFrame *GetActiveChild() const;

-    
-    wxMDIClientWindow *GetClientWindow() const; 
+
+    wxMDIClientWindow *GetClientWindow() const;

     virtual wxMDIClientWindow *OnCreateClient();
     virtual wxMDIClientWindow *OnCreateClient();

-  
+

     virtual void Cascade() {}
     virtual void Cascade() {}

-    virtual void Tile() {}
+    virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) {}

     virtual void ArrangeIcons() {}
     virtual void ActivateNext();
     virtual void ActivatePrevious();
 
     virtual void ArrangeIcons() {}
     virtual void ActivateNext();
     virtual void ActivatePrevious();
 

-    void OnActivate( wxActivateEvent& event );
-    void OnSysColourChanged( wxSysColourChangedEvent& event );
-    
-  // implementation
+    // implementation

 
     wxMDIClientWindow  *m_clientWindow;
     bool                m_justInserted;
 
     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void OnInternalIdle();
 
     wxMDIClientWindow  *m_clientWindow;
     bool                m_justInserted;
 
     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void OnInternalIdle();

-    
+
+protected:
+    void Init();
+
+    virtual void DoGetClientSize(int *width, int *height) const;
+

 private:
     friend class wxMDIChildFrame;
 private:
     friend class wxMDIChildFrame;

-  
+

     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)

-    DECLARE_EVENT_TABLE()    

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -97,27 +107,33 @@ class wxMDIChildFrame: public wxFrame
 public:
     wxMDIChildFrame();
     wxMDIChildFrame( wxMDIParentFrame *parent,
 public:
     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();
+                     wxWindowID id,
+                     const wxString& title,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
+                     long style = wxDEFAULT_FRAME_STYLE,
+                     const wxString& name = wxFrameNameStr );
+
+    virtual ~wxMDIChildFrame();

     bool Create( wxMDIParentFrame *parent,
     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 );
-      
+                 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() const;
 
     virtual void SetMenuBar( wxMenuBar *menu_bar );
     virtual wxMenuBar *GetMenuBar() const;
 

-    virtual void GetClientSize( int *width, int *height ) const;

     virtual void AddChild( wxWindowBase *child );
 
     virtual void Activate();
     virtual void AddChild( wxWindowBase *child );
 
     virtual void Activate();

-    
+

 #if wxUSE_STATUSBAR
     // no status bars
     virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number) = 1,
 #if wxUSE_STATUSBAR
     // no status bars
     virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number) = 1,

-                                        long WXUNUSED(style) = 1, 
+                                        long WXUNUSED(style) = 1,

                                         wxWindowID WXUNUSED(id) = 1,
                                         const wxString& WXUNUSED(name) = wxEmptyString)
       { return (wxStatusBar*)NULL; }
                                         wxWindowID WXUNUSED(id) = 1,
                                         const wxString& WXUNUSED(name) = wxEmptyString)
       { return (wxStatusBar*)NULL; }


@@ -128,40 +144,60 @@ public:
 #endif
 
     // no size hints
 #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) ) {}
-  
+    virtual void DoSetSizeHints( int WXUNUSED(minW),
+                               int WXUNUSED(minH),
+                               int WXUNUSED(maxW) = -1,
+                               int WXUNUSED(maxH) = -1,
+                               int WXUNUSED(incW) = -1,
+                               int WXUNUSED(incH) = -1) {}
+

 #if wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR

-    // no toolbar bars
-    virtual wxToolBar* CreateToolBar( long WXUNUSED(style), wxWindowID WXUNUSED(id), 
-        const wxString& WXUNUSED(name) ) { return (wxToolBar*)NULL; }
+    // no toolbar
+    virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
+                                       wxWindowID WXUNUSED(id),
+                                       const wxString& WXUNUSED(name) )
+        { return (wxToolBar*)NULL; }

     virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
     virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }

-#endif
-  
+#endif // wxUSE_TOOLBAR
+

     // no icon
     // no icon

-    void SetIcon( const wxIcon &icon ) { m_icon = icon; }
-    
-    // no title 
-    void SetTitle( const wxString &title ) { m_title = title; }
+    virtual void SetIcon(const wxIcon& icon)
+        { wxTopLevelWindowBase::SetIcon(icon); }
+    virtual void SetIcons(const wxIconBundle& icons )
+        { wxTopLevelWindowBase::SetIcons(icons); }
+
+    // no title
+    void SetTitle( const wxString &title );

     wxString GetTitle() const { return m_title; }
     wxString GetTitle() const { return m_title; }

-  
+

     // no maximize etc
     // no maximize etc

-    virtual void Maximize( bool WXUNUSED(maximize) ) {}
+    virtual void Maximize( bool WXUNUSED(maximize) = true ) { }
+    virtual bool IsMaximized() const { return true; }
+    virtual void Iconize(bool WXUNUSED(iconize) = true) { }
+    virtual bool IsIconized() const { return false; }

     virtual void Restore() {}
     virtual void Restore() {}

-    
-    virtual bool IsTopLevel() const { return FALSE; }
-    
-    void OnActivate( wxActivateEvent &event );
-    
-  // implementation
-  
+
+    virtual bool IsTopLevel() const { return false; }
+
+    void OnActivate( wxActivateEvent& event );
+    void OnMenuHighlight( wxMenuEvent& event );
+
+    // implementation
+

     wxMenuBar         *m_menuBar;
     GtkNotebookPage   *m_page;
     bool               m_justInserted;
     wxMenuBar         *m_menuBar;
     GtkNotebookPage   *m_page;
     bool               m_justInserted;

-    
+
+protected:
+    // override wxFrame methods to not do anything
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+    virtual void DoSetClientSize(int width, int height);
+    virtual void DoGetClientSize( int *width, int *height ) const;
+

 private:
 private:

-    DECLARE_EVENT_TABLE()    
+    DECLARE_EVENT_TABLE()

     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 };