X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28be2e8a170979d476a5ea4f585505b8a2f5af27..30862d99435ce44ea648e59aa5ae4ca8d3780465:/src/generic/statusbr.cpp?ds=sidebyside diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index dbd35b40f8..2256846c67 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -20,7 +20,7 @@ #pragma hdrstop #endif -//#if !defined(__WIN32__) || !wxUSE_NATIVE_STATUSBAR +#if wxUSE_STATUSBAR #ifndef WX_PRECOMP #include "wx/setup.h" @@ -31,14 +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) - -#if !defined(__WIN32__) || !wxUSE_NATIVE_STATUSBAR - IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxStatusBarGeneric) -#endif // Win32 && wxUSE_NATIVE_STATUSBAR + IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow) +#endif // wxUSE_NATIVE_STATUSBAR BEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow) EVT_PAINT(wxStatusBarGeneric::OnPaint) @@ -64,8 +66,6 @@ wxStatusBarGeneric::~wxStatusBarGeneric() SetFont(wxNullFont); # endif // MSW - if ( m_statusWidths ) - delete[] m_statusWidths; if ( m_statusStrings ) delete[] m_statusStrings; } @@ -85,6 +85,9 @@ bool wxStatusBarGeneric::Create(wxWindow *parent, wxDefaultPosition, wxDefaultSize, style | wxTAB_TRAVERSAL, name); + // The status bar should have a themed background + SetThemeEnabled( TRUE ); + // Don't wish this to be found as a child #ifndef __WXMAC__ parent->GetChildren().DeleteObject(this); @@ -93,6 +96,17 @@ bool wxStatusBarGeneric::Create(wxWindow *parent, SetFont(m_defaultStatusBarFont); + // Set the height according to the font and the border size + wxClientDC dc(this); + dc.SetFont(GetFont()); + + wxCoord y; + dc.GetTextExtent(_T("X"), NULL, &y ); + + int height = (int)( (11*y)/10 + 2*GetBorderY()); + + SetSize(-1, -1, -1, height); + return success; } @@ -104,12 +118,6 @@ void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths) delete[] m_statusStrings; m_statusStrings = new wxString[number]; - -#if 0 // VZ: what is this for? - int i; - for (i = 0; i < number; i++) - m_statusStrings[i] = ""; -#endif } SetStatusWidths(number, widths); @@ -122,7 +130,10 @@ void wxStatusBarGeneric::SetStatusText(const wxString& text, int number) m_statusStrings[number] = text; - Refresh(); + wxRect rect; + GetFieldRect(number, rect); + + Refresh( TRUE, &rect ); } wxString wxStatusBarGeneric::GetStatusText(int n) const @@ -146,7 +157,7 @@ void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[]) { // not an error, see the comment above m_statusWidths = (int *)NULL; - + Refresh(); return; } @@ -169,6 +180,7 @@ void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[]) { m_statusWidths[i] = widths_field[i]; } + Refresh(); } void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) ) @@ -182,7 +194,10 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) ) dc.SetBackgroundMode(wxTRANSPARENT); #ifdef __WXPM__ - ::WinFillRect(vDC.m_hPS, &vDC.m_rclPaint, CLR_GREEN); + wxColour vColor; + + vColor.InitFromName("LIGHT GREY"); + ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel()); #endif for ( i = 0; i < m_nFields; i ++ ) @@ -204,21 +219,11 @@ void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i) long x, y; -#if defined(__WXPM__) - long decsent; - - dc.GetTextExtent(text, &x, &y,&decsent); - int xpos = rect.x + leftMargin; - int ypos = (int) (((rect.height - y + 1) / 2 ) + rect.y + decsent ) ; - -#else dc.GetTextExtent(text, &x, &y); int xpos = rect.x + leftMargin; int ypos = (int) (((rect.height - y) / 2 ) + rect.y + 0.5) ; -#endif // __WXPM__ - #if defined( __WXGTK__ ) || defined(__WXMAC__) xpos++; ypos++; @@ -244,6 +249,8 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i) dc.SetPen(m_hilightPen); +#ifndef __WXPM__ + // Right and bottom white lines dc.DrawLine(rect.x + rect.width, rect.y, rect.x + rect.width, rect.y + rect.height); @@ -257,6 +264,25 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i) rect.x, rect.y); dc.DrawLine(rect.x, rect.y, rect.x + rect.width, rect.y); +#else + // Right + dc.DrawLine(rect.x + rect.width, rect.y, + rect.x + rect.width, rect.y + rect.height + 2); + dc.SetPen(m_mediumShadowPen); + dc.DrawLine(rect.x + rect.width + 1, rect.y, + rect.x + rect.width + 1, rect.y + rect.height + 2); + dc.DrawLine(rect.x + rect.width + 2, rect.y, + rect.x + rect.width + 2, rect.y + rect.height + 2); + // Top + dc.DrawLine(rect.x + rect.width + 2, rect.y, + rect.x - 2, rect.y); + dc.DrawLine(rect.x + rect.width + 1, rect.y - 1, + rect.x - 2, rect.y - 1); + dc.SetPen(m_hilightPen); + dc.DrawLine(rect.x + rect.width, rect.y - 2, + rect.x - 2, rect.y - 2); + +#endif DrawFieldText(dc, i); } @@ -340,18 +366,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("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. @@ -378,4 +417,4 @@ void wxStatusBarGeneric::SetMinHeight(int height) } } -//#endif // Win32 && wxUSE_NATIVE_STATUSBAR +#endif // wxUSE_STATUSBAR