X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/893f25f232efc0b73dc5d540945605277f3e342f..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/generic/statusbr.cpp?ds=sidebyside diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 80fbe7de5a..0b6b9e8580 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 @@ -29,6 +29,11 @@ #include "wx/dcclient.h" #endif +#ifdef __WXGTK20__ +#include "wx/gtk/private.h" +#include "wx/gtk/win_gtk.h" +#endif + #include "wx/statusbr.h" // we only have to do it here when we use wxStatusBarGeneric in addition to the @@ -44,6 +49,8 @@ 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() @@ -51,7 +58,7 @@ END_EVENT_TABLE() #define wxTHICK_LINE_BORDER 2 #define wxTHICK_LINE_WIDTH 1 -wxStatusBarGeneric::wxStatusBarGeneric() +void wxStatusBarGeneric::Init() { m_borderX = wxTHICK_LINE_BORDER; m_borderY = wxTHICK_LINE_BORDER; @@ -59,9 +66,10 @@ wxStatusBarGeneric::wxStatusBarGeneric() wxStatusBarGeneric::~wxStatusBarGeneric() { -# ifdef __WXMSW__ - SetFont(wxNullFont); -# endif // MSW + // VZ: what is this for? please comment... +#ifdef __WXMSW__ + SetFont(wxNullFont); +#endif // MSW } bool wxStatusBarGeneric::Create(wxWindow *parent, @@ -69,16 +77,10 @@ bool wxStatusBarGeneric::Create(wxWindow *parent, long style, const wxString& name) { - // 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; - - bool success = wxWindow::Create(parent, id, - wxDefaultPosition, wxDefaultSize, - style | wxTAB_TRAVERSAL, name); + if ( !wxWindow::Create(parent, id, + wxDefaultPosition, wxDefaultSize, + style | wxTAB_TRAVERSAL, name) ) + return FALSE; // The status bar should have a themed background SetThemeEnabled( TRUE ); @@ -102,24 +104,21 @@ bool wxStatusBarGeneric::Create(wxWindow *parent, SetSize(-1, -1, -1, height); - return success; + SetFieldsCount(1); + + return TRUE; } void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths) { - wxASSERT_MSG( number >= 0, - _T("Yes, number should be a size_t and less than no fields is silly.") ); - - // if( number > m_nFields ) + wxASSERT_MSG( number >= 0, _T("negative number of fields in wxStatusBar?") ); 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_statusStrings.RemoveAt(i); m_nFields = number; @@ -138,7 +137,7 @@ void wxStatusBarGeneric::SetStatusText(const wxString& text, int number) wxRect rect; GetFieldRect(number, rect); - + Refresh( TRUE, &rect ); } @@ -161,6 +160,9 @@ void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[]) // 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 @@ -173,27 +175,41 @@ void wxStatusBarGeneric::SetStatusWidths(int n, const int 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__ - wxColour vColor; + wxColour vColor; - vColor.InitFromName("LIGHT GREY"); + vColor = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR); ::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 + for (int i = 0; i < m_nFields; i ++) + DrawField(dc, i); } void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i) @@ -226,8 +242,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 - @@ -253,22 +269,17 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i) dc.DrawLine(rect.x, rect.y, rect.x + rect.width, rect.y); #else - // Right + + 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 + 2); + rect.x + rect.width, rect.y + rect.height); + 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); + 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 @@ -278,73 +289,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++) + // 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) ) { - fieldWidth = (int)(width/m_nFields); - fieldPosition = i*fieldWidth; - if ( i == n ) - break; + 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; } - } - else // no_same_width - { - int *tempwidth = new int[m_nFields]; - int temppos = 0; - for (i = 0; i < m_nFields; i++) - { - if (m_statusWidths[i] > 0) tempwidth[i] = m_statusWidths[i]; - else tempwidth[i] = (width - sum_of_nonvar) / num_of_var; - } - 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; } @@ -353,14 +330,14 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const void wxStatusBarGeneric::InitColours() { // Shadow colours -#if defined(__WIN95__) +#if defined(__WIN95__) || defined(__WXMAC__) wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)); m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID); wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT)); m_hilightPen = wxPen(hilightColour, 1, wxSOLID); #elif defined(__WXPM__) - m_mediumShadowPen = wxPen("DARK GREY", 1, wxSOLID); + m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID); m_hilightPen = wxPen("WHITE", 1, wxSOLID); wxColour vColour; @@ -397,7 +374,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 ) { @@ -405,6 +382,74 @@ void wxStatusBarGeneric::SetMinHeight(int height) } } +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 -// vi:sts=4:sw=4:et