X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/71e030352d74e4e6aed28cfcb0ea6edf3d17af6e..6a0fab3a3ae4d9b7372a25e81faadeb842b9ba6f:/src/generic/statusbr.cpp diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 8880c2ebac..3244ab7244 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -31,10 +31,16 @@ #include "wx/statusbr.h" -// with wxUSE_NATIVE_STATUSBAR it is not included from wx/statusbr.h -#include "wx/generic/statusbr.h" +// 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) + IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow) +#endif // wxUSE_NATIVE_STATUSBAR BEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow) EVT_PAINT(wxStatusBarGeneric::OnPaint) @@ -121,7 +127,27 @@ void wxStatusBarGeneric::SetStatusText(const wxString& text, int number) m_statusStrings[number] = text; - Refresh(); +#ifdef __WXMAC__ + int major,minor; + wxGetOsVersion( &major, &minor ); + + if (major >= 10) + { + Refresh(); + return; + } +#endif + + wxRect rect; + GetFieldRect(number, rect); + wxClientDC dc(this); + + dc.SetBackground( wxBrush(GetBackgroundColour(), wxSOLID) ); + dc.SetClippingRegion( rect.x+1, rect.y+1, rect.width-1, rect.height-1 ); + dc.Clear(); + dc.DestroyClippingRegion(); + dc.SetFont(GetFont()); + DrawFieldText( dc, number ); } wxString wxStatusBarGeneric::GetStatusText(int n) const @@ -145,7 +171,7 @@ void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[]) { // not an error, see the comment above m_statusWidths = (int *)NULL; - + Refresh(); return; } @@ -168,6 +194,7 @@ void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[]) { m_statusWidths[i] = widths_field[i]; } + Refresh(); } void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) ) @@ -183,7 +210,7 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) ) #ifdef __WXPM__ wxColour vColor; - vColor.InitFromName("GREY"); + vColor.InitFromName("LIGHT GREY"); ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel()); #endif @@ -353,21 +380,31 @@ void wxStatusBarGeneric::InitColours() { // Shadow colours #if defined(__WIN95__) - wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW)); + wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)); m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID); - wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT)); + wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT)); m_hilightPen = wxPen(hilightColour, 1, wxSOLID); #elif defined(__WXPM__) - m_mediumShadowPen = wxPen("LIGHT GREY", 1, wxSOLID); + m_mediumShadowPen = wxPen("DARK GREY", 1, wxSOLID); m_hilightPen = wxPen("WHITE", 1, wxSOLID); + + wxColour vColour; + + vColour.Set(wxString("LIGHT GREY")); + SetBackgroundColour(vColour); + vColour.Set(wxString("BLACK")); + SetForegroundColour(vColour); + m_defaultStatusBarFont = *wxSMALL_FONT; #else m_mediumShadowPen = wxPen("GREY", 1, wxSOLID); m_hilightPen = wxPen("WHITE", 1, wxSOLID); #endif - m_defaultStatusBarFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT); - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); +#ifndef __WXPM__ + m_defaultStatusBarFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); +#endif } // Responds to colour changes, and passes event on to children.