X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16e93305f2bae16652b6750dffe3bcf05c20d839..884470b12ee25b20796bfef11a9bfa5fb1e1511c:/src/generic/statusbr.cpp diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 424008eafa..683752e0b1 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -84,10 +84,10 @@ bool wxStatusBar::Create(wxWindow *parent, wxWindowID id, m_borderX = wxTHICK_LINE_BORDER; m_borderY = wxTHICK_LINE_BORDER; - bool success = wxWindow::Create(parent, id, pos, size, style, name); + bool success = wxWindow::Create(parent, id, pos, size, style | wxTAB_TRAVERSAL, name); // Don't wish this to be found as a child - parent->GetChildren()->DeleteObject(this); + parent->GetChildren().DeleteObject(this); InitColours(); @@ -172,8 +172,8 @@ void wxStatusBar::OnPaint(wxPaintEvent& WXUNUSED(event) ) wxPaintDC dc(this); int i; - if ( GetFont() ) - dc.SetFont(*GetFont()); + if ( GetFont().Ok() ) + dc.SetFont(GetFont()); dc.SetBackgroundMode(wxTRANSPARENT); for ( i = 0; i < m_nFields; i ++ ) @@ -199,6 +199,11 @@ 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__ + xpos++; + ypos++; +#endif dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height);