From 8da116cf66b8f923d321df5d987cc3c93ed0b2b2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Wed, 15 Aug 2007 13:05:35 +0000
Subject: [PATCH] wxCocoa compilation fixes for visibility (missing DLL export
 macros)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/cocoa/NSWindow.h | 2 +-
 include/wx/cocoa/colour.h   | 1 -
 include/wx/cocoa/dataobj.h  | 2 +-
 include/wx/cocoa/dataobj2.h | 4 ++--
 include/wx/cocoa/dcclient.h | 6 +++---
 include/wx/cocoa/mdi.h      | 2 +-
 include/wx/cocoa/radiobut.h | 2 +-
 include/wx/cocoa/toolbar.h  | 2 +-
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index 9bbecf9fec..fd61cd250d 100644
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -23,7 +23,7 @@ class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowCocoa;
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
 DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
 
-class wxCocoaNSWindow
+class WXDLLIMPEXP_CORE wxCocoaNSWindow
 {
 /* NSWindow is a rather special case and requires some extra attention */
     WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSWindow)
diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h
index d553f762bc..dbdc52ae62 100644
--- a/include/wx/cocoa/colour.h
+++ b/include/wx/cocoa/colour.h
@@ -50,7 +50,6 @@ public:
     virtual ~wxColour();
 
     // accessors
-    bool Ok() const { return IsOk(); }
     bool IsOk() const { return m_cocoaNSColor; }
     WX_NSColor GetNSColor() { return m_cocoaNSColor; }
 
diff --git a/include/wx/cocoa/dataobj.h b/include/wx/cocoa/dataobj.h
index 666d24a8a3..760acd0b20 100644
--- a/include/wx/cocoa/dataobj.h
+++ b/include/wx/cocoa/dataobj.h
@@ -12,7 +12,7 @@
 #ifndef __WX_COCOA_DATAOBJ_H__
 #define __WX_COCOA_DATAOBJ_H__
 
-class wxDataObject : public wxDataObjectBase
+class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
 {
 public:
     wxDataObject();
diff --git a/include/wx/cocoa/dataobj2.h b/include/wx/cocoa/dataobj2.h
index aca32452fc..1c5299fe8d 100644
--- a/include/wx/cocoa/dataobj2.h
+++ b/include/wx/cocoa/dataobj2.h
@@ -15,7 +15,7 @@
 //=========================================================================
 // wxBitmapDataObject is a specialization of wxDataObject for bitmaps
 //=========================================================================
-class wxBitmapDataObject : public wxBitmapDataObjectBase
+class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase
 {
 public:
     // ctors
@@ -59,7 +59,7 @@ private:
 // wxFileDataObject is a specialization of wxDataObject for file names
 //=========================================================================
 
-class wxFileDataObject : public wxFileDataObjectBase
+class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase
 {
 public:
     // implement base class pure virtuals
diff --git a/include/wx/cocoa/dcclient.h b/include/wx/cocoa/dcclient.h
index 8808210993..9987cc3e5d 100644
--- a/include/wx/cocoa/dcclient.h
+++ b/include/wx/cocoa/dcclient.h
@@ -18,7 +18,7 @@
 // NSView of the content view seems to return the entire window rectangle
 // (including decorations).  Of course, that is not at all part of the
 // Cocoa or OpenStep APIs, but it might be a neat hack.
-class wxWindowDC: public wxDC
+class WXDLLIMPEXP_CORE wxWindowDC: public wxDC
 {
     DECLARE_DYNAMIC_CLASS(wxWindowDC)
 public:
@@ -38,7 +38,7 @@ protected:
     virtual bool CocoaGetBounds(void *rectData);
 };
 
-class wxClientDC: public wxWindowDC
+class WXDLLIMPEXP_CORE wxClientDC: public wxWindowDC
 {
     DECLARE_DYNAMIC_CLASS(wxClientDC)
 public:
@@ -52,7 +52,7 @@ protected:
     virtual bool CocoaUnlockFocus();
 };
 
-class wxPaintDC: public wxWindowDC
+class WXDLLIMPEXP_CORE wxPaintDC: public wxWindowDC
 {
     DECLARE_DYNAMIC_CLASS(wxPaintDC)
 public:
diff --git a/include/wx/cocoa/mdi.h b/include/wx/cocoa/mdi.h
index 4328334ca0..c3b12ba595 100644
--- a/include/wx/cocoa/mdi.h
+++ b/include/wx/cocoa/mdi.h
@@ -19,7 +19,7 @@ DECLARE_WXCOCOA_OBJC_CLASS(wxMDIParentFrameObserver);
 class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
 class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
 
-WX_DECLARE_LIST(wxMDIChildFrame, wxCocoaMDIChildFrameList);
+WX_DECLARE_EXPORTED_LIST(wxMDIChildFrame, wxCocoaMDIChildFrameList);
 
 // ========================================================================
 // wxMDIParentFrame
diff --git a/include/wx/cocoa/radiobut.h b/include/wx/cocoa/radiobut.h
index 29892fab05..72e6c08fcc 100644
--- a/include/wx/cocoa/radiobut.h
+++ b/include/wx/cocoa/radiobut.h
@@ -16,7 +16,7 @@
 
 class WXDLLIMPEXP_FWD_CORE wxRadioButton;
 
-WX_DECLARE_LIST(wxRadioButton, wxRadioButtonList);
+WX_DECLARE_EXPORTED_LIST(wxRadioButton, wxRadioButtonList);
 
 // ========================================================================
 // wxRadioButton
diff --git a/include/wx/cocoa/toolbar.h b/include/wx/cocoa/toolbar.h
index e045df6523..29b4b632bf 100644
--- a/include/wx/cocoa/toolbar.h
+++ b/include/wx/cocoa/toolbar.h
@@ -25,7 +25,7 @@ typedef struct _NSPoint NSPoint;
 
 class wxToolBarTool;
 
-class wxToolBar : public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase
 {
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 // ------------------------------------------------------------------------
-- 
2.45.2