X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25889d3c43f537fea00a2b7d6df7bd7e63e113f8..a02dc3e3ff6a99000b29eeac3be32bcf6dd776da:/src/generic/statusbr.cpp diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 00940d7e0e..73919d52ac 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -34,14 +34,12 @@ #include "wx/msw/winundef.h" #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow) BEGIN_EVENT_TABLE(wxStatusBar, wxWindow) EVT_PAINT(wxStatusBar::OnPaint) EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged) END_EVENT_TABLE() -#endif // Default status border dimensions #define wxTHICK_LINE_BORDER 2 @@ -83,8 +81,9 @@ bool wxStatusBar::Create(wxWindow *parent, wxWindowID id, bool success = wxWindow::Create(parent, id, pos, size, style | wxTAB_TRAVERSAL, name); // Don't wish this to be found as a child +#ifndef __WXMAC__ parent->GetChildren().DeleteObject(this); - +#endif InitColours(); SetFont(m_defaultStatusBarFont); @@ -196,7 +195,7 @@ void wxStatusBar::DrawFieldText(wxDC& dc, int i) int xpos = rect.x + leftMargin; int ypos = (int) (((rect.height - y) / 2 ) + rect.y + 0.5) ; -#ifdef __WXGTK__ +#if defined( __WXGTK__ ) || defined(__WXMAC__) xpos++; ypos++; #endif