X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d11e8786ed13b72766eea18cb577cc00f9f08f41..2f27c88987b5bea88ea2520e342ef2a0767021bc:/include/wx/gtk1/mdi.h?ds=sidebyside

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 08ba0abef2..19a09ac5aa 100644
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -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,22 @@
 // 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 WXDLLIMPEXP_CORE const wxChar* wxFrameNameStr;
+extern WXDLLIMPEXP_CORE const wxChar* wxStatusLineNameStr;
 
 //-----------------------------------------------------------------------------
 // wxMDIParentFrame
 //-----------------------------------------------------------------------------
 
-class wxMDIParentFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame
 {
 public:
     wxMDIParentFrame() { Init(); }
@@ -74,7 +69,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 +97,7 @@ private:
 // wxMDIChildFrame
 //-----------------------------------------------------------------------------
 
-class wxMDIChildFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame
 {
 public:
     wxMDIChildFrame();
@@ -152,7 +147,7 @@ public:
                                int WXUNUSED(incH) = -1) {}
 
 #if wxUSE_TOOLBAR
-    // no toolbar bars
+    // no toolbar
     virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
                                        wxWindowID WXUNUSED(id),
                                        const wxString& WXUNUSED(name) )
@@ -161,8 +156,10 @@ public:
 #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 );
@@ -173,8 +170,6 @@ public:
     virtual bool IsMaximized() const { return true; }
     virtual void Iconize(bool WXUNUSED(iconize) = true) { }
     virtual bool IsIconized() const { return false; }
-    virtual void SetIcon(const wxIcon& WXUNUSED(icon)) { }
-    virtual void SetIcons(const wxIconBundle& WXUNUSED(icons)) { }
     virtual void Restore() {}
 
     virtual bool IsTopLevel() const { return false; }
@@ -205,7 +200,7 @@ private:
 // wxMDIClientWindow
 //-----------------------------------------------------------------------------
 
-class wxMDIClientWindow: public wxWindow
+class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow
 {
 public:
     wxMDIClientWindow();