X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..105fbe1ffa8968cb85fd2cac7192957e522d17ba:/include/wx/gtk1/mdi.h

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 69104769f2..3ccf1b4d7f 100644
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/mdi.h
+// Name:        wx/gtk1/mdi.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __MDIH__
 #define __MDIH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/list.h"
@@ -27,22 +22,21 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxMDIParentFrame;
-class wxMDIClientWindow;
-class wxMDIChildFrame;
+class WXDLLIMPEXP_CORE wxMDIParentFrame;
+class WXDLLIMPEXP_CORE wxMDIClientWindow;
+class WXDLLIMPEXP_CORE wxMDIChildFrame;
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
-extern const wxChar* wxFrameNameStr;
-extern const wxChar* wxStatusLineNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
 //-----------------------------------------------------------------------------
 
-class wxMDIParentFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame
 {
 public:
     wxMDIParentFrame() { Init(); }
@@ -59,7 +53,7 @@ public:
         (void)Create(parent, id, title, pos, size, style, name);
     }
 
-    ~wxMDIParentFrame();
+    virtual ~wxMDIParentFrame();
     bool Create( wxWindow *parent,
                  wxWindowID id,
                  const wxString& title,
@@ -74,7 +68,7 @@ public:
     virtual wxMDIClientWindow *OnCreateClient();
 
     virtual void Cascade() {}
-    virtual void Tile() {}
+    virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) {}
     virtual void ArrangeIcons() {}
     virtual void ActivateNext();
     virtual void ActivatePrevious();
@@ -102,7 +96,7 @@ private:
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 
-class wxMDIChildFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame
 {
 public:
     wxMDIChildFrame();
@@ -144,35 +138,39 @@ public:
 #endif
 
     // no size hints
-    virtual void SetSizeHints( int WXUNUSED(minW),
-                               int WXUNUSED(minH),
-                               int WXUNUSED(maxW) = -1,
-                               int WXUNUSED(maxH) = -1,
-                               int WXUNUSED(incW) = -1,
-                               int WXUNUSED(incH) = -1) {}
+    virtual void DoSetSizeHints( int WXUNUSED(minW),
+                                 int WXUNUSED(minH),
+                                 int WXUNUSED(maxW) = wxDefaultCoord,
+                                 int WXUNUSED(maxH) = wxDefaultCoord,
+                                 int WXUNUSED(incW) = wxDefaultCoord,
+                                 int WXUNUSED(incH) = wxDefaultCoord) {}
 
 #if wxUSE_TOOLBAR
-    // no toolbar bars
+    // 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; }
-#endif
+#endif // wxUSE_TOOLBAR
 
     // no icon
-    void SetIcon( const wxIcon &icon ) { m_icons = wxIconBundle( icon ); }
-    void SetIcons( const wxIconBundle &icons ) { m_icons = icons; }
+    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; }
+    virtual void SetTitle( const wxString &title );
 
     // 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 bool IsTopLevel() const { return FALSE; }
+    virtual bool IsTopLevel() const { return false; }
 
     void OnActivate( wxActivateEvent& event );
     void OnMenuHighlight( wxMenuEvent& event );
@@ -200,12 +198,12 @@ private:
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 
-class wxMDIClientWindow: public wxWindow
+class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow
 {
 public:
     wxMDIClientWindow();
     wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
-    ~wxMDIClientWindow();
+    virtual ~wxMDIClientWindow();
     virtual bool CreateClient( wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
 
 private:
@@ -213,4 +211,3 @@ private:
 };
 
 #endif // __MDIH__
-