tell user to define _USE_OLD_RW_STL for BC5.6 instead of refusing to compile with...

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

diff --git a/include/wx/cocoa/mdi.h b/include/wx/cocoa/mdi.h
index ff6e628937245d6b15dd1a307b2f282a3d9e4560..c3b12ba59539ac116e74a37391260870e18044fb 100644 (file)
--- a/include/wx/cocoa/mdi.h
+++ b/include/wx/cocoa/mdi.h
@@ -6,7 +6,7 @@
 // Created:     2003/09/08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/09/08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_MDI_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_MDI_H__


@@ -16,17 +16,17 @@
 
 DECLARE_WXCOCOA_OBJC_CLASS(wxMDIParentFrameObserver);
 
 
 DECLARE_WXCOCOA_OBJC_CLASS(wxMDIParentFrameObserver);
 

-class WXDLLEXPORT wxMDIChildFrame;
-class WXDLLEXPORT wxMDIClientWindow;
+class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
+class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;

 
 

-WX_DECLARE_LIST(wxMDIChildFrame, wxCocoaMDIChildFrameList);
+WX_DECLARE_EXPORTED_LIST(wxMDIChildFrame, wxCocoaMDIChildFrameList);

 
 // ========================================================================
 // wxMDIParentFrame
 // ========================================================================
 class WXDLLEXPORT wxMDIParentFrame: public wxFrame
 {
 
 // ========================================================================
 // wxMDIParentFrame
 // ========================================================================
 class WXDLLEXPORT wxMDIParentFrame: public wxFrame
 {

-    friend class WXDLLEXPORT wxMDIChildFrame;
+    friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 // ------------------------------------------------------------------------
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 // ------------------------------------------------------------------------


@@ -83,7 +83,7 @@ public:
     virtual wxMDIClientWindow *OnCreateClient();
 
     virtual void Cascade() {}
     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();
     virtual void ArrangeIcons() {}
     virtual void ActivateNext();
     virtual void ActivatePrevious();


@@ -98,7 +98,7 @@ protected:
 // ========================================================================
 class WXDLLEXPORT wxMDIChildFrame: public wxFrame
 {
 // ========================================================================
 class WXDLLEXPORT wxMDIChildFrame: public wxFrame
 {

-    friend class WXDLLEXPORT wxMDIParentFrame;
+    friend class WXDLLIMPEXP_FWD_CORE wxMDIParentFrame;

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 // ------------------------------------------------------------------------
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 // ------------------------------------------------------------------------


@@ -156,7 +156,7 @@ class wxMDIClientWindow: public wxWindow
 public:
     wxMDIClientWindow();
     wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
 public:
     wxMDIClientWindow();
     wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );

-    ~wxMDIClientWindow();
+    virtual ~wxMDIClientWindow();

     virtual bool CreateClient( wxMDIParentFrame *parent, long style = 0 );
 };
 
     virtual bool CreateClient( wxMDIParentFrame *parent, long style = 0 );
 };