X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b292e2f512fa9b25e2d2928604ab884b00e6c6bf..4fcd60c72f6b90f5063f7000ff5a80a9004055a3:/src/generic/statusbr.cpp?ds=sidebyside diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 683752e0b1..e1739aa5c3 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statusbr.cpp -// Purpose: wxStatusBar class implementation +// Name: generic/statusbr.cpp +// Purpose: wxStatusBarGeneric class implementation // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -20,6 +20,8 @@ #pragma hdrstop #endif +#if wxUSE_STATUSBAR + #ifndef WX_PRECOMP #include "wx/setup.h" #include "wx/frame.h" @@ -27,31 +29,27 @@ #include "wx/dcclient.h" #endif -#include "wx/generic/statusbr.h" - -#ifdef __WXMSW__ -#include +#include "wx/statusbr.h" -#ifdef DrawText -#undef DrawText -#endif +// with wxUSE_NATIVE_STATUSBAR it is not included from wx/statusbr.h +#include "wx/generic/statusbr.h" -#endif +IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow) -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow) +#if !defined(__WIN32__) || !wxUSE_NATIVE_STATUSBAR + IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxStatusBarGeneric) +#endif // Win32 && wxUSE_NATIVE_STATUSBAR -BEGIN_EVENT_TABLE(wxStatusBar, wxWindow) - EVT_PAINT(wxStatusBar::OnPaint) - EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged) +BEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow) + EVT_PAINT(wxStatusBarGeneric::OnPaint) + EVT_SYS_COLOUR_CHANGED(wxStatusBarGeneric::OnSysColourChanged) END_EVENT_TABLE() -#endif // Default status border dimensions #define wxTHICK_LINE_BORDER 2 #define wxTHICK_LINE_WIDTH 1 -wxStatusBar::wxStatusBar(void) +wxStatusBarGeneric::wxStatusBarGeneric() { m_statusWidths = (int *) NULL; m_statusStrings = (wxString *) NULL; @@ -60,7 +58,7 @@ wxStatusBar::wxStatusBar(void) m_borderY = wxTHICK_LINE_BORDER; } -wxStatusBar::~wxStatusBar(void) +wxStatusBarGeneric::~wxStatusBarGeneric() { # ifdef __WXMSW__ SetFont(wxNullFont); @@ -72,11 +70,10 @@ wxStatusBar::~wxStatusBar(void) delete[] m_statusStrings; } -bool wxStatusBar::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) +bool wxStatusBarGeneric::Create(wxWindow *parent, + wxWindowID id, + long style, + const wxString& name) { m_statusWidths = (int *) NULL; m_statusStrings = (wxString *) NULL; @@ -84,11 +81,14 @@ 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 | wxTAB_TRAVERSAL, name); + bool success = wxWindow::Create(parent, id, + wxDefaultPosition, wxDefaultSize, + 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); @@ -96,95 +96,107 @@ bool wxStatusBar::Create(wxWindow *parent, wxWindowID id, return success; } -void wxStatusBar::SetFieldsCount(int number, const int widths[]) +void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths) { - m_nFields = number; - - if ( m_statusWidths ) - delete[] m_statusWidths; + if ( number != m_nFields ) + { + m_nFields = number; - if ( m_statusStrings ) delete[] m_statusStrings; + m_statusStrings = new wxString[number]; - m_statusStrings = new wxString[number]; - - int i; - for (i = 0; i < number; i++) - m_statusStrings[i] = ""; +#if 0 // VZ: what is this for? + int i; + for (i = 0; i < number; i++) + m_statusStrings[i] = ""; +#endif + } - if ( widths ) - SetStatusWidths(number, widths); + SetStatusWidths(number, widths); } -void wxStatusBar::SetStatusText(const wxString& text, int number) +void wxStatusBarGeneric::SetStatusText(const wxString& text, int number) { - if ((number < 0) || (number >= m_nFields)) - return; - - m_statusStrings[number] = text; + wxCHECK_RET( (number >= 0) && (number < m_nFields), + _T("invalid status bar field index") ); - Refresh(); + m_statusStrings[number] = text; -#ifdef __WXMSW__ - // For some reason, this can cause major GDI problems - graphics - // all over the place. E.g. in print previewing. -// ::UpdateWindow((HWND) GetHWND()); -#endif + Refresh(); } -wxString wxStatusBar::GetStatusText(int n) const +wxString wxStatusBarGeneric::GetStatusText(int n) const { - if ((n < 0) || (n >= m_nFields)) - return wxString(""); - else + wxCHECK_MSG( (n >= 0) && (n < m_nFields), wxEmptyString, + _T("invalid status bar field index") ); + return m_statusStrings[n]; } -void wxStatusBar::SetStatusWidths(int n, const int widths_field[]) +void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[]) { - // only set status widths, when n == number of statuswindows - if (n == m_nFields) - { - // only set status widths, + // only set status widths, when n == number of statuswindows + wxCHECK_RET( n == m_nFields, _T("status bar field count mismatch") ); + + // delete the old widths in any case - this function may be used to reset + // the widths to the default (all equal) + delete [] m_statusWidths; + + if ( !widths_field ) + { + // not an error, see the comment above + m_statusWidths = (int *)NULL; + + 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; - int i; for (i = 0; i < m_nFields; i++) { - if (widths_field[i] <= 0) is_variable = TRUE; + if (widths_field[i] <= 0) + is_variable = TRUE; } - - // if there are old widths, delete them - if (m_statusWidths) - delete [] m_statusWidths; +#endif // 0 // set widths m_statusWidths = new int[n]; for (i = 0; i < m_nFields; i++) { - m_statusWidths[i] = widths_field[i]; + m_statusWidths[i] = widths_field[i]; } - } } -void wxStatusBar::OnPaint(wxPaintEvent& WXUNUSED(event) ) +void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) ) { wxPaintDC dc(this); + int i; if ( GetFont().Ok() ) dc.SetFont(GetFont()); dc.SetBackgroundMode(wxTRANSPARENT); +#ifdef __WXPM__ + wxColour vColor; + + vColor.InitFromName("GREY"); + ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel()); +#endif + for ( i = 0; i < m_nFields; i ++ ) DrawField(dc, i); -# ifdef __WXMSW__ - dc.SetFont(wxNullFont); -# endif // MSW +#ifdef __WXMSW__ + dc.SetFont(wxNullFont); +#endif // MSW } -void wxStatusBar::DrawFieldText(wxDC& dc, int i) +void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i) { int leftMargin = 2; @@ -199,8 +211,8 @@ 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 @@ -212,7 +224,7 @@ void wxStatusBar::DrawFieldText(wxDC& dc, int i) dc.DestroyClippingRegion(); } -void wxStatusBar::DrawField(wxDC& dc, int i) +void wxStatusBarGeneric::DrawField(wxDC& dc, int i) { wxRect rect; GetFieldRect(i, rect); @@ -225,6 +237,8 @@ void wxStatusBar::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); @@ -238,18 +252,41 @@ void wxStatusBar::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); } // Get the position and size of the field's internal bounding rectangle -bool wxStatusBar::GetFieldRect(int n, wxRect& rect) const +bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const { - if ((n < 0) || (n >= m_nFields)) - return FALSE; + wxCHECK_MSG( (n >= 0) && (n < m_nFields), FALSE, + _T("invalid status bar field index") ); int width, height; +#ifdef __WXPM__ + GetSize(&width, &height); +#else GetClientSize(&width, &height); +#endif int i; int sum_of_nonvar = 0; @@ -313,7 +350,7 @@ bool wxStatusBar::GetFieldRect(int n, wxRect& rect) const } // Initialize colours -void wxStatusBar::InitColours(void) +void wxStatusBarGeneric::InitColours() { // Shadow colours #if defined(__WIN95__) @@ -322,6 +359,9 @@ void wxStatusBar::InitColours(void) wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT)); m_hilightPen = wxPen(hilightColour, 1, wxSOLID); +#elif defined(__WXPM__) + m_mediumShadowPen = wxPen("LIGHT GREY", 1, wxSOLID); + m_hilightPen = wxPen("WHITE", 1, wxSOLID); #else m_mediumShadowPen = wxPen("GREY", 1, wxSOLID); m_hilightPen = wxPen("WHITE", 1, wxSOLID); @@ -332,7 +372,7 @@ void wxStatusBar::InitColours(void) } // Responds to colour changes, and passes event on to children. -void wxStatusBar::OnSysColourChanged(wxSysColourChangedEvent& event) +void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event) { InitColours(); Refresh(); @@ -341,3 +381,18 @@ void wxStatusBar::OnSysColourChanged(wxSysColourChangedEvent& event) wxWindow::OnSysColourChanged(event); } +void wxStatusBarGeneric::SetMinHeight(int height) +{ + // check that this min height is not less than minimal height for the + // current font + wxClientDC dc(this); + wxCoord y; + dc.GetTextExtent( _T("X"), NULL, &y ); + + if ( height > (11*y)/10 ) + { + SetSize(-1, -1, -1, height + 2*m_borderY); + } +} + +#endif // wxUSE_STATUSBAR