X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cffbfebc684e000e4fd859b05b2f6fabae633c8a..a4ba2eeca12bce815242fb08d929e53232bbfb5e:/src/generic/statusbr.cpp?ds=sidebyside diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index ea7ab8837a..80fbe7de5a 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) @@ -51,9 +53,6 @@ END_EVENT_TABLE() wxStatusBarGeneric::wxStatusBarGeneric() { - m_statusWidths = (int *) NULL; - m_statusStrings = (wxString *) NULL; - m_nFields = 0; m_borderX = wxTHICK_LINE_BORDER; m_borderY = wxTHICK_LINE_BORDER; } @@ -63,21 +62,17 @@ wxStatusBarGeneric::~wxStatusBarGeneric() # ifdef __WXMSW__ SetFont(wxNullFont); # endif // MSW - - if ( m_statusWidths ) - delete[] m_statusWidths; - if ( m_statusStrings ) - delete[] m_statusStrings; } bool wxStatusBarGeneric::Create(wxWindow *parent, - wxWindowID id, - long style, - const wxString& name) + wxWindowID id, + long style, + const wxString& name) { - m_statusWidths = (int *) NULL; - m_statusStrings = (wxString *) NULL; - m_nFields = 0; + // If create is ever meant to be re-entrant over the life of + // an object we should: + // m_statusStrings.Empty(); + m_borderX = wxTHICK_LINE_BORDER; m_borderY = wxTHICK_LINE_BORDER; @@ -85,6 +80,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,24 +91,40 @@ 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; } void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths) { - if ( number != m_nFields ) - { - m_nFields = number; + wxASSERT_MSG( number >= 0, + _T("Yes, number should be a size_t and less than no fields is silly.") ); - delete[] m_statusStrings; - m_statusStrings = new wxString[number]; + // if( number > m_nFields ) -#if 0 // VZ: what is this for? - int i; - for (i = 0; i < number; i++) - m_statusStrings[i] = ""; -#endif - } + int i; + for(i = m_nFields; i < number; ++i) + m_statusStrings.Add( wxEmptyString ); + + // if( number < m_nFields ) + + for (i = m_nFields - 1; i >= number; --i) + m_statusStrings.Remove(i); + + m_nFields = number; + + wxASSERT_MSG( m_nFields == (int)m_statusStrings.GetCount(), + _T("This really should never happen, can we do away with m_nFields here?") ); SetStatusWidths(number, widths); } @@ -122,7 +136,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 @@ -140,35 +157,18 @@ void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[]) // delete the old widths in any case - this function may be used to reset // the widths to the default (all equal) - delete [] m_statusWidths; + // MBN: this is incompatible with at least wxMSW and wxMAC and not + // documented, but let's keep it for now + ReinitWidths(); if ( !widths_field ) { // not an error, see the comment above - m_statusWidths = (int *)NULL; - + Refresh(); return; } - int i; - - // VZ: this doesn't do anything as is_variable is unused later -#if 0 - // when one window (minimum) is variable (width <= 0) - bool is_variable = FALSE; - for (i = 0; i < m_nFields; i++) - { - if (widths_field[i] <= 0) - is_variable = TRUE; - } -#endif // 0 - - // set widths - m_statusWidths = new int[n]; - for (i = 0; i < m_nFields; i++) - { - m_statusWidths[i] = widths_field[i]; - } + wxStatusBarBase::SetStatusWidths(n, widths_field); } void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) ) @@ -184,7 +184,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 @@ -354,21 +354,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. @@ -395,4 +405,6 @@ void wxStatusBarGeneric::SetMinHeight(int height) } } -//#endif // Win32 && wxUSE_NATIVE_STATUSBAR +#endif // wxUSE_STATUSBAR + +// vi:sts=4:sw=4:et