X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f44fdfb032152a62cc0e3a4c0f09330cfab76710..f938940e0935f835ccf38c242ad1469aeb800048:/src/generic/statusbr.cpp?ds=sidebyside diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index d661b1be08..c12bce49e7 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -5,11 +5,11 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "statusbr.h" #endif @@ -20,7 +20,7 @@ #pragma hdrstop #endif -//#if !defined(__WIN32__) || !wxUSE_NATIVE_STATUSBAR +#if wxUSE_STATUSBAR #ifndef WX_PRECOMP #include "wx/setup.h" @@ -29,19 +29,28 @@ #include "wx/dcclient.h" #endif -#include "wx/statusbr.h" +#ifdef __WXGTK20__ +#include "wx/gtk/private.h" +#include "wx/gtk/win_gtk.h" +#endif -// with wxUSE_NATIVE_STATUSBAR it is not included from wx/statusbr.h -#include "wx/generic/statusbr.h" +#include "wx/statusbr.h" -IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow) +// 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" -#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) + EVT_LEFT_DOWN(wxStatusBarGeneric::OnLeftDown) + EVT_RIGHT_DOWN(wxStatusBarGeneric::OnRightDown) EVT_SYS_COLOUR_CHANGED(wxStatusBarGeneric::OnSysColourChanged) END_EVENT_TABLE() @@ -49,41 +58,32 @@ END_EVENT_TABLE() #define wxTHICK_LINE_BORDER 2 #define wxTHICK_LINE_WIDTH 1 -wxStatusBarGeneric::wxStatusBarGeneric() +void wxStatusBarGeneric::Init() { - m_statusWidths = (int *) NULL; - m_statusStrings = (wxString *) NULL; - m_nFields = 0; m_borderX = wxTHICK_LINE_BORDER; m_borderY = wxTHICK_LINE_BORDER; } wxStatusBarGeneric::~wxStatusBarGeneric() { -# ifdef __WXMSW__ - SetFont(wxNullFont); -# endif // MSW - - if ( m_statusWidths ) - delete[] m_statusWidths; - if ( m_statusStrings ) - delete[] m_statusStrings; + // VZ: what is this for? please comment... +#ifdef __WXMSW__ + SetFont(wxNullFont); +#endif // MSW } 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; - m_borderX = wxTHICK_LINE_BORDER; - m_borderY = wxTHICK_LINE_BORDER; + if ( !wxWindow::Create(parent, id, + wxDefaultPosition, wxDefaultSize, + style | wxTAB_TRAVERSAL, name) ) + return FALSE; - bool success = wxWindow::Create(parent, id, - 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__ @@ -93,24 +93,55 @@ bool wxStatusBarGeneric::Create(wxWindow *parent, SetFont(m_defaultStatusBarFont); - return success; + // 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); + + SetFieldsCount(1); + + return TRUE; } + +wxSize wxStatusBarGeneric::DoGetBestSize() const +{ + int width, height; + + // best width is the width of the parent + GetParent()->GetClientSize(&width, NULL); + + // best height is as calculated above in Create + wxClientDC dc((wxWindow*)this); + dc.SetFont(GetFont()); + wxCoord y; + dc.GetTextExtent(_T("X"), NULL, &y ); + height = (int)( (11*y)/10 + 2*GetBorderY()); + + return wxSize(width, height); +} + void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths) { - if ( number != m_nFields ) - { - m_nFields = number; + wxASSERT_MSG( number >= 0, _T("negative number of fields in wxStatusBar?") ); - delete[] m_statusStrings; - m_statusStrings = new wxString[number]; + int i; + for(i = m_nFields; i < number; ++i) + m_statusStrings.Add( wxEmptyString ); -#if 0 // VZ: what is this for? - int i; - for (i = 0; i < number; i++) - m_statusStrings[i] = ""; -#endif - } + for (i = m_nFields - 1; i >= number; --i) + m_statusStrings.RemoveAt(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); } @@ -120,9 +151,16 @@ void wxStatusBarGeneric::SetStatusText(const wxString& text, int number) wxCHECK_RET( (number >= 0) && (number < m_nFields), _T("invalid status bar field index") ); - m_statusStrings[number] = text; + wxString oldText = m_statusStrings[number]; + if (oldText != text) + { + m_statusStrings[number] = text; - Refresh(); + wxRect rect; + GetFieldRect(number, rect); + + Refresh( TRUE, &rect ); + } } wxString wxStatusBarGeneric::GetStatusText(int n) const @@ -140,57 +178,60 @@ 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(); + + // forget the old cached pixel widths + m_widthsAbs.Empty(); 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) ) { - wxPaintDC dc(this); + wxPaintDC dc(this); +#ifdef __WXGTK20__ + // Draw grip first + if (HasFlag( wxST_SIZEGRIP )) + { + int width, height; + GetClientSize(&width, &height); + + gtk_paint_resize_grip( m_widget->style, + GTK_PIZZA(m_wxwindow)->bin_window, + (GtkStateType) GTK_WIDGET_STATE (m_widget), + NULL, + m_widget, + "statusbar", + GDK_WINDOW_EDGE_SOUTH_EAST, + width-height-2, 1, height-2, height-3 ); + + } +#endif + + if (GetFont().Ok()) + dc.SetFont(GetFont()); - int i; - if ( GetFont().Ok() ) - dc.SetFont(GetFont()); dc.SetBackgroundMode(wxTRANSPARENT); #ifdef __WXPM__ - ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, CLR_GREEN); -#endif + wxColour vColor; - for ( i = 0; i < m_nFields; i ++ ) - DrawField(dc, i); + vColor = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR); + ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel()); +#endif -#ifdef __WXMSW__ - dc.SetFont(wxNullFont); -#endif // MSW + for (int i = 0; i < m_nFields; i ++) + DrawField(dc, i); } void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i) @@ -204,21 +245,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++; @@ -233,8 +264,8 @@ void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i) void wxStatusBarGeneric::DrawField(wxDC& dc, int i) { - wxRect rect; - GetFieldRect(i, rect); + wxRect rect; + GetFieldRect(i, rect); // Draw border // Have grey background, plus 3-d border - @@ -244,6 +275,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 +290,20 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i) rect.x, rect.y); dc.DrawLine(rect.x, rect.y, rect.x + rect.width, rect.y); +#else + + dc.DrawLine(rect.x + rect.width, rect.height + 2, + rect.x, rect.height + 2); + dc.DrawLine(rect.x + rect.width, rect.y, + rect.x + rect.width, rect.y + rect.height); + + dc.SetPen(m_mediumShadowPen); + dc.DrawLine(rect.x, rect.y, + rect.x + rect.width, rect.y); + dc.DrawLine(rect.x, rect.y + rect.height, + rect.x, rect.y); + +#endif DrawFieldText(dc, i); } @@ -264,73 +311,39 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i) // Get the position and size of the field's internal bounding rectangle bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const { - wxCHECK_MSG( (n >= 0) && (n < m_nFields), FALSE, - _T("invalid status bar field index") ); + wxCHECK_MSG( (n >= 0) && (n < m_nFields), FALSE, + _T("invalid status bar field index") ); - int width, height; + // FIXME: workarounds for OS/2 bugs have nothing to do here (VZ) + int width, height; #ifdef __WXPM__ - GetSize(&width, &height); + GetSize(&width, &height); #else - GetClientSize(&width, &height); + GetClientSize(&width, &height); #endif - int i; - int sum_of_nonvar = 0; - int num_of_var = 0; - bool do_same_width = FALSE; - - int fieldWidth = 0; - int fieldPosition = 0; - - if (m_statusWidths) - { - // if sum(not variable Windows) > c_width - (20 points per variable_window) - // then do_same_width = TRUE; - for (i = 0; i < m_nFields; i++) - { - if (m_statusWidths[i] > 0) sum_of_nonvar += m_statusWidths[i]; - else num_of_var++; - } - if (sum_of_nonvar > (width - 20*num_of_var)) do_same_width = TRUE; - } - else do_same_width = TRUE; - if (do_same_width) - { - for (i = 0; i < m_nFields; i++) - { - fieldWidth = (int)(width/m_nFields); - fieldPosition = i*fieldWidth; - if ( i == n ) - break; - } - } - else // no_same_width - { - int *tempwidth = new int[m_nFields]; - int temppos = 0; - for (i = 0; i < m_nFields; i++) + // we cache m_widthsAbs between calls and recompute it if client + // width has changed (or when it is initially empty) + if ( m_widthsAbs.IsEmpty() || (m_lastClientWidth != width) ) { - if (m_statusWidths[i] > 0) tempwidth[i] = m_statusWidths[i]; - else tempwidth[i] = (width - sum_of_nonvar) / num_of_var; + wxConstCast(this, wxStatusBarGeneric)-> + m_widthsAbs = CalculateAbsWidths(width); + // remember last width for which we have recomputed the widths in pixels + wxConstCast(this, wxStatusBarGeneric)-> + m_lastClientWidth = width; } - for (i = 0; i < m_nFields; i++) - { - fieldWidth = tempwidth[i]; - fieldPosition = temppos; - - temppos += tempwidth[i]; - if ( i == n ) - break; + rect.x = 0; + for ( int i = 0; i < n; i++ ) + { + rect.x += m_widthsAbs[i]; } - delete [] tempwidth; - } - rect.x = fieldPosition + wxTHICK_LINE_BORDER; - rect.y = wxTHICK_LINE_BORDER; + rect.x += m_borderX; + rect.y = m_borderY; - rect.width = fieldWidth - 2 * wxTHICK_LINE_BORDER ; - rect.height = height - 2 * wxTHICK_LINE_BORDER ; + rect.width = m_widthsAbs[n] - 2*m_borderX; + rect.height = height - 2*m_borderY; return TRUE; } @@ -339,19 +352,32 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const void wxStatusBarGeneric::InitColours() { // Shadow colours -#if defined(__WIN95__) - wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW)); +#if defined(__WIN95__) || defined(__WXMAC__) + 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(wxColour(127, 127, 127), 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. @@ -370,7 +396,7 @@ void wxStatusBarGeneric::SetMinHeight(int height) // current font wxClientDC dc(this); wxCoord y; - dc.GetTextExtent( _T("X"), NULL, &y ); + dc.GetTextExtent( wxT("X"), NULL, &y ); if ( height > (11*y)/10 ) { @@ -378,4 +404,74 @@ void wxStatusBarGeneric::SetMinHeight(int height) } } -//#endif // Win32 && wxUSE_NATIVE_STATUSBAR +void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event) +{ +#ifdef __WXGTK20__ + int width, height; + GetClientSize(&width, &height); + + if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height)) + { + GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget ); + + if (!GTK_IS_WINDOW (ancestor)) + return; + + GdkWindow *source = GTK_PIZZA(m_wxwindow)->bin_window; + + int org_x = 0; + int org_y = 0; + gdk_window_get_origin( source, &org_x, &org_y ); + + gtk_window_begin_resize_drag (GTK_WINDOW (ancestor), + GDK_WINDOW_EDGE_SOUTH_EAST, + 1, + org_x + event.GetX(), + org_y + event.GetY(), + 0); + } + else + { + event.Skip( TRUE ); + } +#else + event.Skip( TRUE ); +#endif +} + +void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event) +{ +#ifdef __WXGTK20__ + int width, height; + GetClientSize(&width, &height); + + if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height)) + { + GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget ); + + if (!GTK_IS_WINDOW (ancestor)) + return; + + GdkWindow *source = GTK_PIZZA(m_wxwindow)->bin_window; + + int org_x = 0; + int org_y = 0; + gdk_window_get_origin( source, &org_x, &org_y ); + + gtk_window_begin_move_drag (GTK_WINDOW (ancestor), + 2, + org_x + event.GetX(), + org_y + event.GetY(), + 0); + } + else + { + event.Skip( TRUE ); + } +#else + event.Skip( TRUE ); +#endif +} + +#endif // wxUSE_STATUSBAR +