X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b292e2f512fa9b25e2d2928604ab884b00e6c6bf..b47c832e5529dc6c632536b4665a005f0a85aec8:/src/generic/statusbr.cpp diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 683752e0b1..98dc359b26 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -31,11 +31,7 @@ #ifdef __WXMSW__ #include - -#ifdef DrawText -#undef DrawText -#endif - +#include "wx/msw/winundef.h" #endif #if !USE_SHARED_LIBRARY @@ -87,8 +83,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); @@ -200,7 +197,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