fix for wxStatusBar linking problems under wxMac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 63f52319db41641c14f7394e8b51b58605f94702..16e9246509e18e4f73f3730cc87803b709bf1715 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -31,8 +31,12 @@
 
 #include "wx/statusbr.h"
 
-// if !wxUSE_NATIVE_STATUSBAR, this is already done in common/statbar.cpp
-#if defined(wxUSE_NATIVE_STATUSBAR) && wxUSE_NATIVE_STATUSBAR
+// we only have to do it here when we use wxStatusBarGeneric in addition to the
+// standard wxStatusBar class, if wxStatusBarGeneric is the same as
+// wxStatusBar, then the corresponding IMPLEMENT_DYNAMIC_CLASS is already in
+// common/statbar.cpp
+#if defined(__WXMAC__) || \
+    (defined(wxUSE_NATIVE_STATUSBAR) && wxUSE_NATIVE_STATUSBAR)
     #include "wx/generic/statusbr.h"
 
     IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow)

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index ee0c59a422f03c6f85fc0c3bc7ec4891d8e98c9b..5179971e24c69297a01640fec35fad36c4aaf68e 100644 (file)
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -21,14 +21,9 @@
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 
-#if     !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBarMac, wxStatusBarGeneric);
-
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
        EVT_PAINT(wxStatusBarMac::OnPaint)
 END_EVENT_TABLE()
-#endif  //USE_SHARED_LIBRARY
-
 
 // ============================================================================
 // implementation

diff --git a/src/mac/statbrma.cpp b/src/mac/statbrma.cpp
index ee0c59a422f03c6f85fc0c3bc7ec4891d8e98c9b..5179971e24c69297a01640fec35fad36c4aaf68e 100644 (file)
--- a/src/mac/statbrma.cpp
+++ b/src/mac/statbrma.cpp
@@ -21,14 +21,9 @@
 #include "wx/dc.h"
 #include "wx/dcclient.h"
 
-#if     !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBarMac, wxStatusBarGeneric);
-
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
        EVT_PAINT(wxStatusBarMac::OnPaint)
 END_EVENT_TABLE()
-#endif  //USE_SHARED_LIBRARY
-
 
 // ============================================================================
 // implementation