Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/cocoa/mdi.h b/include/wx/cocoa/mdi.h
index e2e3b6e77226a2b91d8385c60ea0546eb0d7289a..ae219e997622f47ec829b9c7558989f655fda0b7 100644 (file)
--- a/include/wx/cocoa/mdi.h
+++ b/include/wx/cocoa/mdi.h
@@ -2,10 +2,11 @@
 // Name:        wx/cocoa/mdi.h
 // Purpose:     wxMDIParentFrame, wxMDIChildFrame, wxMDIClientWindow
 // Author:      David Elliott
 // Name:        wx/cocoa/mdi.h
 // Purpose:     wxMDIParentFrame, wxMDIChildFrame, wxMDIClientWindow
 // Author:      David Elliott

-// Modified by:
+// Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes

 // Created:     2003/09/08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/09/08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

+//              (c) 2008 Vadim Zeitlin

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -16,17 +17,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
 // ========================================================================
 
 // ========================================================================
 // wxMDIParentFrame
 // ========================================================================

-class WXDLLEXPORT wxMDIParentFrame: public wxFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase

 {
 {

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

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


@@ -76,17 +77,16 @@ protected:
 // Implementation
 // ------------------------------------------------------------------------
 public:
 // Implementation
 // ------------------------------------------------------------------------
 public:

-    wxMDIChildFrame *GetActiveChild() const;

     void SetActiveChild(wxMDIChildFrame *child);
 
     void SetActiveChild(wxMDIChildFrame *child);
 

-    wxMDIClientWindow *GetClientWindow() const;
-    virtual wxMDIClientWindow *OnCreateClient();
+    // implement base class pure virtuals
+    // ----------------------------------
+
+    static bool IsTDI() { return false; }
+
+    virtual void ActivateNext() { /* TODO */ }
+    virtual void ActivatePrevious() { /* TODO */ }

 
 

-    virtual void Cascade() {}
-    virtual void Tile() {}
-    virtual void ArrangeIcons() {}
-    virtual void ActivateNext();
-    virtual void ActivatePrevious();

 protected:
     wxMDIClientWindow *m_clientWindow;
     wxMDIChildFrame *m_currentChild;
 protected:
     wxMDIClientWindow *m_clientWindow;
     wxMDIChildFrame *m_currentChild;


@@ -96,9 +96,9 @@ protected:
 // ========================================================================
 // wxMDIChildFrame
 // ========================================================================
 // ========================================================================
 // wxMDIChildFrame
 // ========================================================================

-class WXDLLEXPORT wxMDIChildFrame: public wxFrame
+class WXDLLIMPEXP_CORE 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)
 // ------------------------------------------------------------------------


@@ -150,14 +150,15 @@ protected:
 // ========================================================================
 // wxMDIClientWindow
 // ========================================================================
 // ========================================================================
 // wxMDIClientWindow
 // ========================================================================

-class wxMDIClientWindow: public wxWindow
+class wxMDIClientWindow : public wxMDIClientWindowBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)

 public:
 public:

-    wxMDIClientWindow();
-    wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 );
-    ~wxMDIClientWindow();
-    virtual bool CreateClient( wxMDIParentFrame *parent, long style = 0 );
+    wxMDIClientWindow() { }
+
+    virtual bool CreateClient(wxMDIParentFrame *parent,
+                              long style = wxHSCROLL | wxVSCROLL);
+
+    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)

 };
 
 #endif // __WX_COCOA_MDI_H__
 };
 
 #endif // __WX_COCOA_MDI_H__