fix for wxStatusBar linking problems under wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -31,8 +31,12 @@
|
|||||||
|
|
||||||
#include "wx/statusbr.h"
|
#include "wx/statusbr.h"
|
||||||
|
|
||||||
// if !wxUSE_NATIVE_STATUSBAR, this is already done in common/statbar.cpp
|
// we only have to do it here when we use wxStatusBarGeneric in addition to the
|
||||||
#if defined(wxUSE_NATIVE_STATUSBAR) && wxUSE_NATIVE_STATUSBAR
|
// 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"
|
#include "wx/generic/statusbr.h"
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow)
|
IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow)
|
||||||
|
@@ -21,14 +21,9 @@
|
|||||||
#include "wx/dc.h"
|
#include "wx/dc.h"
|
||||||
#include "wx/dcclient.h"
|
#include "wx/dcclient.h"
|
||||||
|
|
||||||
#if !USE_SHARED_LIBRARY
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxStatusBarMac, wxStatusBarGeneric);
|
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
|
BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
|
||||||
EVT_PAINT(wxStatusBarMac::OnPaint)
|
EVT_PAINT(wxStatusBarMac::OnPaint)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
#endif //USE_SHARED_LIBRARY
|
|
||||||
|
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// implementation
|
// implementation
|
||||||
|
@@ -21,14 +21,9 @@
|
|||||||
#include "wx/dc.h"
|
#include "wx/dc.h"
|
||||||
#include "wx/dcclient.h"
|
#include "wx/dcclient.h"
|
||||||
|
|
||||||
#if !USE_SHARED_LIBRARY
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxStatusBarMac, wxStatusBarGeneric);
|
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
|
BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)
|
||||||
EVT_PAINT(wxStatusBarMac::OnPaint)
|
EVT_PAINT(wxStatusBarMac::OnPaint)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
#endif //USE_SHARED_LIBRARY
|
|
||||||
|
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// implementation
|
// implementation
|
||||||
|
Reference in New Issue
Block a user