X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25889d3c43f537fea00a2b7d6df7bd7e63e113f8..5a0259e657136dad29d9f249ebc31f8e8b315ed0:/src/generic/statusbr.cpp?ds=inline diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 00940d7e0e..b2a98212b2 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -1,339 +1,572 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statusbr.cpp -// Purpose: wxStatusBar class implementation +// Name: src/generic/statusbr.cpp +// Purpose: wxStatusBarGeneric class implementation // Author: Julian Smart -// Modified by: +// Modified by: Francesco Montorsi // 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__ -#pragma implementation "statusbr.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_STATUSBAR + +#include "wx/statusbr.h" + #ifndef WX_PRECOMP -#include "wx/setup.h" -#include "wx/frame.h" -#include "wx/settings.h" -#include "wx/dcclient.h" + #include "wx/settings.h" + #include "wx/dcclient.h" + #include "wx/toplevel.h" + #include "wx/control.h" #endif -#include "wx/generic/statusbr.h" - -#ifdef __WXMSW__ -#include -#include "wx/msw/winundef.h" +#ifdef __WXGTK20__ + #include + #include "wx/gtk/private.h" + #include "wx/gtk/private/gtk2-compat.h" #endif -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, 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" -BEGIN_EVENT_TABLE(wxStatusBar, wxWindow) - EVT_PAINT(wxStatusBar::OnPaint) - EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged) -END_EVENT_TABLE() -#endif + IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow) +#endif // wxUSE_NATIVE_STATUSBAR // Default status border dimensions -#define wxTHICK_LINE_BORDER 2 -#define wxTHICK_LINE_WIDTH 1 +#define wxTHICK_LINE_BORDER 2 + +// Margin between the field text and the field rect +#define wxFIELD_TEXT_MARGIN 2 + +// ---------------------------------------------------------------------------- +// GTK+ signal handler +// ---------------------------------------------------------------------------- + +#if defined( __WXGTK20__ ) +#if GTK_CHECK_VERSION(2,12,0) +extern "C" { +static +gboolean statusbar_query_tooltip(GtkWidget* WXUNUSED(widget), + gint x, + gint y, + gboolean WXUNUSED(keyboard_mode), + GtkTooltip *tooltip, + wxStatusBar* statbar) +{ + int n = statbar->GetFieldFromPoint(wxPoint(x,y)); + if (n == wxNOT_FOUND) + return FALSE; + + // should we show the tooltip for the n-th pane of the statusbar? + if (!statbar->GetField(n).IsEllipsized()) + return FALSE; // no, it's not useful + + const wxString& str = statbar->GetStatusText(n); + if (str.empty()) + return FALSE; + + gtk_tooltip_set_text(tooltip, wxGTK_CONV_SYS(str)); + return TRUE; +} +} +#endif +#endif + +// ---------------------------------------------------------------------------- +// wxStatusBarGeneric +// ---------------------------------------------------------------------------- + +BEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow) + EVT_PAINT(wxStatusBarGeneric::OnPaint) + EVT_SIZE(wxStatusBarGeneric::OnSize) +#ifdef __WXGTK20__ + EVT_LEFT_DOWN(wxStatusBarGeneric::OnLeftDown) + EVT_RIGHT_DOWN(wxStatusBarGeneric::OnRightDown) +#endif + EVT_SYS_COLOUR_CHANGED(wxStatusBarGeneric::OnSysColourChanged) +END_EVENT_TABLE() -wxStatusBar::wxStatusBar(void) +void wxStatusBarGeneric::Init() { - m_statusWidths = (int *) NULL; - m_statusStrings = (wxString *) NULL; - m_nFields = 0; - m_borderX = wxTHICK_LINE_BORDER; - m_borderY = wxTHICK_LINE_BORDER; + m_borderX = wxTHICK_LINE_BORDER; + m_borderY = wxTHICK_LINE_BORDER; } -wxStatusBar::~wxStatusBar(void) +wxStatusBarGeneric::~wxStatusBarGeneric() { -# ifdef __WXMSW__ - SetFont(wxNullFont); -# endif // MSW - - if ( m_statusWidths ) - delete[] m_statusWidths; - if ( m_statusStrings ) - 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; - m_nFields = 0; - m_borderX = wxTHICK_LINE_BORDER; - m_borderY = wxTHICK_LINE_BORDER; + style |= wxTAB_TRAVERSAL | wxFULL_REPAINT_ON_RESIZE; + if ( !wxWindow::Create(parent, id, + wxDefaultPosition, wxDefaultSize, + style, name) ) + return false; - bool success = wxWindow::Create(parent, id, pos, size, style | wxTAB_TRAVERSAL, name); + // The status bar should have a themed background + SetThemeEnabled( true ); - // Don't wish this to be found as a child - parent->GetChildren().DeleteObject(this); + InitColours(); + +#ifdef __WXPM__ + SetFont(*wxSMALL_FONT); +#endif - InitColours(); + int height = (int)((11*GetCharHeight())/10 + 2*GetBorderY()); + SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height); - SetFont(m_defaultStatusBarFont); + SetFieldsCount(1); - return success; +#if defined( __WXGTK20__ ) +#if GTK_CHECK_VERSION(2,12,0) + if (HasFlag(wxSTB_SHOW_TIPS) +#ifndef __WXGTK3__ + && gtk_check_version(2,12,0) == NULL +#endif + ) + { + g_object_set(m_widget, "has-tooltip", TRUE, NULL); + g_signal_connect(m_widget, "query-tooltip", + G_CALLBACK(statusbar_query_tooltip), this); + } +#endif +#endif + + return true; } -void wxStatusBar::SetFieldsCount(int number, const int widths[]) +wxSize wxStatusBarGeneric::DoGetBestSize() const { - m_nFields = number; + int width, height; - if ( m_statusWidths ) - delete[] m_statusWidths; + // best width is the width of the parent + if (GetParent()) + GetParent()->GetClientSize(&width, NULL); + else + width = 80; // a dummy value - if ( m_statusStrings ) - delete[] m_statusStrings; + // best height is as calculated above in Create() + height = (int)((11*GetCharHeight())/10 + 2*GetBorderY()); - m_statusStrings = new wxString[number]; + return wxSize(width, height); +} - int i; - for (i = 0; i < number; i++) - m_statusStrings[i] = ""; +void wxStatusBarGeneric::DoUpdateStatusText(int number) +{ + wxRect rect; + GetFieldRect(number, rect); + + Refresh(true, &rect); - if ( widths ) - SetStatusWidths(number, widths); + // it's common to show some text in the status bar before starting a + // relatively lengthy operation, ensure that the text is shown to the + // user immediately and not after the lengthy operation end + Update(); } -void wxStatusBar::SetStatusText(const wxString& text, int number) +void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[]) { - if ((number < 0) || (number >= m_nFields)) - return; + // only set status widths when n == number of statuswindows + wxCHECK_RET( (size_t)n == m_panes.GetCount(), wxT("status bar field count mismatch") ); - m_statusStrings[number] = text; + wxStatusBarBase::SetStatusWidths(n, widths_field); - Refresh(); + // update cache + DoUpdateFieldWidths(); +} -#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 +void wxStatusBarGeneric::DoUpdateFieldWidths() +{ + m_lastClientSize = GetClientSize(); + + // recompute the cache of the field widths if the status bar width has changed + m_widthsAbs = CalculateAbsWidths(m_lastClientSize.x); } -wxString wxStatusBar::GetStatusText(int n) const +bool wxStatusBarGeneric::ShowsSizeGrip() const { - if ((n < 0) || (n >= m_nFields)) - return wxString(""); - else - return m_statusStrings[n]; + if ( !HasFlag(wxSTB_SIZEGRIP) ) + return false; + + wxTopLevelWindow * const + tlw = wxDynamicCast(wxGetTopLevelParent(GetParent()), wxTopLevelWindow); + return tlw && !tlw->IsMaximized() && tlw->HasFlag(wxRESIZE_BORDER); } -void wxStatusBar::SetStatusWidths(int n, const int widths_field[]) +void wxStatusBarGeneric::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int textHeight) { - // only set status widths, when n == number of statuswindows - if (n == m_nFields) - { - // only set status widths, - // when one window (minimum) is variable (width <= 0) - bool is_variable = FALSE; - int i; - for (i = 0; i < m_nFields; i++) + wxString text(GetStatusText(i)); + if (text.empty()) + return; // optimization + + int xpos = rect.x + wxFIELD_TEXT_MARGIN, + maxWidth = rect.width - 2*wxFIELD_TEXT_MARGIN, + ypos = (int) (((rect.height - textHeight) / 2) + rect.y + 0.5); + + if (ShowsSizeGrip()) { - if (widths_field[i] <= 0) is_variable = TRUE; + // don't write text over the size grip: + // NOTE: overloading DoGetClientSize() and GetClientAreaOrigin() wouldn't + // work because the adjustment needs to be done only when drawing + // the field text and not also when drawing the background, the + // size grip itself, etc + if ((GetLayoutDirection() == wxLayout_RightToLeft && i == 0) || + (GetLayoutDirection() != wxLayout_RightToLeft && + i == (int)m_panes.GetCount()-1)) + { + const wxRect& gripRc = GetSizeGripRect(); + + // NOTE: we don't need any special treatment wrt to the layout direction + // since DrawText() will automatically adjust the origin of the + // text accordingly to the layout in use + + maxWidth -= gripRc.width; + } } - // if there are old widths, delete them - if (m_statusWidths) - delete [] m_statusWidths; + // eventually ellipsize the text so that it fits the field width - // set widths - m_statusWidths = new int[n]; - for (i = 0; i < m_nFields; i++) + wxEllipsizeMode ellmode = (wxEllipsizeMode)-1; + if (HasFlag(wxSTB_ELLIPSIZE_START)) ellmode = wxELLIPSIZE_START; + else if (HasFlag(wxSTB_ELLIPSIZE_MIDDLE)) ellmode = wxELLIPSIZE_MIDDLE; + else if (HasFlag(wxSTB_ELLIPSIZE_END)) ellmode = wxELLIPSIZE_END; + + if (ellmode == (wxEllipsizeMode)-1) + { + // if we have the wxSTB_SHOW_TIPS we must set the ellipsized flag even if + // we don't ellipsize the text but just truncate it + if (HasFlag(wxSTB_SHOW_TIPS)) + SetEllipsizedFlag(i, dc.GetTextExtent(text).GetWidth() > maxWidth); + + dc.SetClippingRegion(rect); + } + else { - m_statusWidths[i] = widths_field[i]; + text = wxControl::Ellipsize(text, dc, + ellmode, + maxWidth, + wxELLIPSIZE_FLAGS_EXPAND_TABS); + // Ellipsize() will do something only if necessary + + // update the ellipsization status for this pane; this is used later to + // decide whether a tooltip should be shown or not for this pane + // (if we have wxSTB_SHOW_TIPS) + SetEllipsizedFlag(i, text != GetStatusText(i)); } - } + +#if defined( __WXGTK__ ) || defined(__WXMAC__) + xpos++; + ypos++; +#endif + + // draw the text + dc.DrawText(text, xpos, ypos); + + if (ellmode == (wxEllipsizeMode)-1) + dc.DestroyClippingRegion(); } -void wxStatusBar::OnPaint(wxPaintEvent& WXUNUSED(event) ) +void wxStatusBarGeneric::DrawField(wxDC& dc, int i, int textHeight) { - wxPaintDC dc(this); + wxRect rect; + GetFieldRect(i, rect); - int i; - if ( GetFont().Ok() ) - dc.SetFont(GetFont()); - dc.SetBackgroundMode(wxTRANSPARENT); + if (rect.GetWidth() <= 0) + return; // happens when the status bar is shrunk in a very small area! - for ( i = 0; i < m_nFields; i ++ ) - DrawField(dc, i); + int style = m_panes[i].GetStyle(); + if (style != wxSB_FLAT) + { + // Draw border + // For wxSB_NORMAL: paint a grey background, plus 3-d border (one black rectangle) + // Inside this, left and top sides (dark grey). Bottom and right (white). + // Reverse it for wxSB_RAISED -# ifdef __WXMSW__ - dc.SetFont(wxNullFont); -# endif // MSW -} + dc.SetPen((style == wxSB_RAISED) ? m_mediumShadowPen : m_hilightPen); -void wxStatusBar::DrawFieldText(wxDC& dc, int i) -{ - int leftMargin = 2; +#ifndef __WXPM__ - wxRect rect; - GetFieldRect(i, rect); + // Right and bottom lines + dc.DrawLine(rect.x + rect.width, rect.y, + rect.x + rect.width, rect.y + rect.height); + dc.DrawLine(rect.x + rect.width, rect.y + rect.height, + rect.x, rect.y + rect.height); - wxString text(GetStatusText(i)); + dc.SetPen((style == wxSB_RAISED) ? m_hilightPen : m_mediumShadowPen); - long x, y; + // Left and top lines + dc.DrawLine(rect.x, rect.y + rect.height, + rect.x, rect.y); + dc.DrawLine(rect.x, rect.y, + rect.x + rect.width, rect.y); +#else - dc.GetTextExtent(text, &x, &y); + 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); - int xpos = rect.x + leftMargin; - int ypos = (int) (((rect.height - y) / 2 ) + rect.y + 0.5) ; - -#ifdef __WXGTK__ - xpos++; - ypos++; + dc.SetPen((style == wxSB_RAISED) ? m_hilightPen : 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, rect, i, textHeight); +} + +bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const +{ + wxCHECK_MSG( (n >= 0) && ((size_t)n < m_panes.GetCount()), false, + wxT("invalid status bar field index") ); + + // We can be called from the user-defined EVT_SIZE handler in which case + // the widths haven't been updated yet and we need to do it now. This is + // not very efficient as we keep testing the size but there is no other way + // to make the code needing the up-to-date fields sizes in its EVT_SIZE to + // work. + if ( GetClientSize().x != m_lastClientSize.x ) + { + const_cast(this)->DoUpdateFieldWidths(); + } - dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height); + if (m_widthsAbs.IsEmpty()) + return false; - dc.DrawText(text, xpos, ypos); + rect.x = 0; + for ( int i = 0; i < n; i++ ) + rect.x += m_widthsAbs[i]; + rect.x += m_borderX; - dc.DestroyClippingRegion(); + rect.y = m_borderY; + rect.width = m_widthsAbs[n] - 2*m_borderX; + rect.height = m_lastClientSize.y - 2*m_borderY; + + return true; } -void wxStatusBar::DrawField(wxDC& dc, int i) +int wxStatusBarGeneric::GetFieldFromPoint(const wxPoint& pt) const { - wxRect rect; - GetFieldRect(i, rect); + if (m_widthsAbs.IsEmpty()) + return wxNOT_FOUND; + + // NOTE: we explicitly don't take in count the borders since they are only + // useful when rendering the status text, not for hit-test computations + + if (pt.y <= 0 || pt.y >= m_lastClientSize.y) + return wxNOT_FOUND; - // Draw border - // Have grey background, plus 3-d border - - // One black rectangle. - // Inside this, left and top sides - dark grey. Bottom and right - - // white. + int x = 0; + for ( size_t i = 0; i < m_panes.GetCount(); i++ ) + { + if (pt.x > x && pt.x < x+m_widthsAbs[i]) + return i; - dc.SetPen(m_hilightPen); + x += m_widthsAbs[i]; + } - // Right and bottom white lines - dc.DrawLine(rect.x + rect.width, rect.y, - rect.x + rect.width, rect.y + rect.height); - dc.DrawLine(rect.x + rect.width, rect.y + rect.height, - rect.x, rect.y + rect.height); + return wxNOT_FOUND; +} - dc.SetPen(m_mediumShadowPen); +void wxStatusBarGeneric::InitColours() +{ +#if defined(__WXPM__) + m_mediumShadowPen = wxPen(wxColour(127, 127, 127)); + m_hilightPen = *wxWHITE_PEN; + + SetBackgroundColour(*wxLIGHT_GREY); + SetForegroundColour(*wxBLACK); +#else // !__WXPM__ + m_mediumShadowPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)); + m_hilightPen = wxPen(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT)); +#endif // __WXPM__/!__WXPM__ +} - // Left and top grey lines - dc.DrawLine(rect.x, rect.y + rect.height, - rect.x, rect.y); - dc.DrawLine(rect.x, rect.y, - rect.x + rect.width, rect.y); +void wxStatusBarGeneric::SetMinHeight(int height) +{ + // check that this min height is not less than minimal height for the + // current font (min height is as calculated above in Create() except for border) + int minHeight = (int)((11*GetCharHeight())/10); - DrawFieldText(dc, i); + if ( height > minHeight ) + SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height + 2*m_borderY); } - // Get the position and size of the field's internal bounding rectangle -bool wxStatusBar::GetFieldRect(int n, wxRect& rect) const +wxRect wxStatusBarGeneric::GetSizeGripRect() const { - if ((n < 0) || (n >= m_nFields)) - return FALSE; + int width, height; + wxWindow::DoGetClientSize(&width, &height); - int width, height; - GetClientSize(&width, &height); + if (GetLayoutDirection() == wxLayout_RightToLeft) + return wxRect(2, 2, height-2, height-4); + else + return wxRect(width-height-2, 2, height-2, height-4); +} - int i; - int sum_of_nonvar = 0; - int num_of_var = 0; - bool do_same_width = FALSE; +// ---------------------------------------------------------------------------- +// wxStatusBarGeneric - event handlers +// ---------------------------------------------------------------------------- - int fieldWidth = 0; - int fieldPosition = 0; +void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) ) +{ + wxPaintDC dc(this); - 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++) +#ifdef __WXGTK20__ + // Draw grip first + if ( ShowsSizeGrip() ) { - 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++) - { - if (m_statusWidths[i] > 0) tempwidth[i] = m_statusWidths[i]; - else tempwidth[i] = (width - sum_of_nonvar) / num_of_var; + const wxRect& rc = GetSizeGripRect(); +#ifdef __WXGTK3__ + GtkWidget* toplevel = gtk_widget_get_toplevel(m_widget); + if (toplevel && !gtk_window_get_has_resize_grip(GTK_WINDOW(toplevel))) + { + GtkStyleContext* sc = gtk_widget_get_style_context(toplevel); + gtk_style_context_save(sc); + gtk_style_context_add_class(sc, GTK_STYLE_CLASS_GRIP); + GtkJunctionSides sides = GTK_JUNCTION_CORNER_BOTTOMRIGHT; + if (GetLayoutDirection() == wxLayout_RightToLeft) + sides = GTK_JUNCTION_CORNER_BOTTOMLEFT; + gtk_style_context_set_junction_sides(sc, sides); + gtk_render_handle(sc, + static_cast(dc.GetImpl()->GetCairoContext()), + rc.x, rc.y, rc.width, rc.height); + gtk_style_context_restore(sc); + } +#else + GdkWindowEdge edge = + GetLayoutDirection() == wxLayout_RightToLeft ? GDK_WINDOW_EDGE_SOUTH_WEST : + GDK_WINDOW_EDGE_SOUTH_EAST; + gtk_paint_resize_grip(gtk_widget_get_style(m_widget), + GTKGetDrawingWindow(), + gtk_widget_get_state(m_widget), + NULL, + m_widget, + "statusbar", + edge, + rc.x, rc.y, rc.width, rc.height ); +#endif } - for (i = 0; i < m_nFields; i++) - { - fieldWidth = tempwidth[i]; - fieldPosition = temppos; +#endif // __WXGTK20__ - temppos += tempwidth[i]; + if (GetFont().IsOk()) + dc.SetFont(GetFont()); - if ( i == n ) - break; - } - delete [] tempwidth; - } + // compute char height only once for all panes: + int textHeight = dc.GetCharHeight(); - rect.x = fieldPosition + wxTHICK_LINE_BORDER; - rect.y = wxTHICK_LINE_BORDER; + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); + for (size_t i = 0; i < m_panes.GetCount(); i ++) + DrawField(dc, i, textHeight); +} - rect.width = fieldWidth - 2 * wxTHICK_LINE_BORDER ; - rect.height = height - 2 * wxTHICK_LINE_BORDER ; +void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event) +{ + InitColours(); - return TRUE; + // Propagate the event to the non-top-level children + wxWindow::OnSysColourChanged(event); } -// Initialize colours -void wxStatusBar::InitColours(void) +#ifdef __WXGTK20__ +void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event) { - // Shadow colours -#if defined(__WIN95__) - wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW)); - m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID); + int width, height; + GetClientSize(&width, &height); - wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT)); - m_hilightPen = wxPen(hilightColour, 1, wxSOLID); -#else - m_mediumShadowPen = wxPen("GREY", 1, wxSOLID); - m_hilightPen = wxPen("WHITE", 1, wxSOLID); + GtkWidget* ancestor = gtk_widget_get_toplevel(m_widget); +#ifdef __WXGTK3__ + if (ancestor && gtk_window_get_has_resize_grip(GTK_WINDOW(ancestor))) + ancestor = NULL; #endif - m_defaultStatusBarFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT); - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); + if (ancestor && ShowsSizeGrip() && event.GetX() > width - height) + { + GdkWindow *source = GTKGetDrawingWindow(); + + int org_x = 0; + int org_y = 0; + gdk_window_get_origin( source, &org_x, &org_y ); + + if (GetLayoutDirection() == wxLayout_RightToLeft) + { + gtk_window_begin_resize_drag (GTK_WINDOW (ancestor), + GDK_WINDOW_EDGE_SOUTH_WEST, + 1, + org_x - event.GetX() + GetSize().x , + org_y + event.GetY(), + 0); + } + else + { + 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 ); + } } -// Responds to colour changes, and passes event on to children. -void wxStatusBar::OnSysColourChanged(wxSysColourChangedEvent& event) +void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event) { - InitColours(); - Refresh(); + int width, height; + GetClientSize(&width, &height); - // Propagate the event to the non-top-level children - wxWindow::OnSysColourChanged(event); + GtkWidget* ancestor = gtk_widget_get_toplevel(m_widget); +#ifdef __WXGTK3__ + if (ancestor && gtk_window_get_has_resize_grip(GTK_WINDOW(ancestor))) + ancestor = NULL; +#endif + + if (ancestor && ShowsSizeGrip() && event.GetX() > width - height) + { + GdkWindow *source = GTKGetDrawingWindow(); + + 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 ); + } +} +#endif // __WXGTK20__ + +void wxStatusBarGeneric::OnSize(wxSizeEvent& event) +{ + DoUpdateFieldWidths(); + + event.Skip(); } +#endif // wxUSE_STATUSBAR