X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/87ff599d25a7401f620a2a413ac044f0e4803652..b7d3a622aa58729f92941c2b6710c5481b16f19e:/src/generic/statusbr.cpp diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index 55eb58cc4f..3fdc2d8bc8 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -1,41 +1,37 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: generic/statusbr.cpp +// 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 // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#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 #ifdef __WXGTK20__ -#include "wx/gtk/private.h" -#include "wx/gtk/win_gtk.h" + #include + #include "wx/gtk/private.h" #endif -#include "wx/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 @@ -47,29 +43,66 @@ IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow) #endif // wxUSE_NATIVE_STATUSBAR +// Default status border dimensions +#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) EVT_LEFT_DOWN(wxStatusBarGeneric::OnLeftDown) EVT_RIGHT_DOWN(wxStatusBarGeneric::OnRightDown) EVT_SYS_COLOUR_CHANGED(wxStatusBarGeneric::OnSysColourChanged) END_EVENT_TABLE() -// Default status border dimensions -#define wxTHICK_LINE_BORDER 2 -#define wxTHICK_LINE_WIDTH 1 - void wxStatusBarGeneric::Init() { - m_borderX = wxTHICK_LINE_BORDER; - m_borderY = wxTHICK_LINE_BORDER; + m_borderX = wxTHICK_LINE_BORDER; + m_borderY = wxTHICK_LINE_BORDER; } wxStatusBarGeneric::~wxStatusBarGeneric() { - // VZ: what is this for? please comment... -#ifdef __WXMSW__ - SetFont(wxNullFont); -#endif // MSW } bool wxStatusBarGeneric::Create(wxWindow *parent, @@ -77,313 +110,338 @@ bool wxStatusBarGeneric::Create(wxWindow *parent, long style, const wxString& name) { - if ( !wxWindow::Create(parent, id, - wxDefaultPosition, wxDefaultSize, - style | wxTAB_TRAVERSAL, name) ) - return FALSE; - - // The status bar should have a themed background - SetThemeEnabled( TRUE ); + style |= wxTAB_TRAVERSAL | wxFULL_REPAINT_ON_RESIZE; + if ( !wxWindow::Create(parent, id, + wxDefaultPosition, wxDefaultSize, + style, name) ) + return false; - // Don't wish this to be found as a child -#ifndef __WXMAC__ - parent->GetChildren().DeleteObject(this); -#endif - InitColours(); + // The status bar should have a themed background + SetThemeEnabled( true ); - SetFont(m_defaultStatusBarFont); - - // Set the height according to the font and the border size - wxClientDC dc(this); - dc.SetFont(GetFont()); + InitColours(); - wxCoord y; - dc.GetTextExtent(_T("X"), NULL, &y ); +#ifdef __WXPM__ + SetFont(*wxSMALL_FONT); +#endif - int height = (int)( (11*y)/10 + 2*GetBorderY()); + int height = (int)((11*GetCharHeight())/10 + 2*GetBorderY()); + SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height); - SetSize(-1, -1, -1, height); + SetFieldsCount(1); - SetFieldsCount(1); +#if defined( __WXGTK20__ ) +#if GTK_CHECK_VERSION(2,12,0) + if (HasFlag(wxSTB_SHOW_TIPS) && !gtk_check_version(2,12,0)) + { + 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; + return true; } -void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths) +wxSize wxStatusBarGeneric::DoGetBestSize() const { - wxASSERT_MSG( number >= 0, _T("negative number of fields in wxStatusBar?") ); + int width, height; - int i; - for(i = m_nFields; i < number; ++i) - m_statusStrings.Add( wxEmptyString ); + // best width is the width of the parent + if (GetParent()) + GetParent()->GetClientSize(&width, NULL); + else + width = 80; // a dummy value - for (i = m_nFields - 1; i >= number; --i) - m_statusStrings.RemoveAt(i); + // best height is as calculated above in Create() + height = (int)((11*GetCharHeight())/10 + 2*GetBorderY()); - m_nFields = number; + return wxSize(width, height); +} - wxASSERT_MSG( m_nFields == (int)m_statusStrings.GetCount(), - _T("This really should never happen, can we do away with m_nFields here?") ); +void wxStatusBarGeneric::DoUpdateStatusText(int number) +{ + wxRect rect; + GetFieldRect(number, rect); - SetStatusWidths(number, widths); + Refresh(true, &rect); + + // 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 wxStatusBarGeneric::SetStatusText(const wxString& text, int number) +void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[]) { - wxCHECK_RET( (number >= 0) && (number < m_nFields), - _T("invalid status bar field index") ); + // only set status widths when n == number of statuswindows + wxCHECK_RET( (size_t)n == m_panes.GetCount(), wxT("status bar field count mismatch") ); - wxString oldText = m_statusStrings[number]; - if (oldText != text) - { - m_statusStrings[number] = text; - - wxRect rect; - GetFieldRect(number, rect); + wxStatusBarBase::SetStatusWidths(n, widths_field); - Refresh( TRUE, &rect ); - } + // update cache + int width; + GetClientSize(&width, &m_lastClientHeight); + m_widthsAbs = CalculateAbsWidths(width); } -wxString wxStatusBarGeneric::GetStatusText(int n) const +bool wxStatusBarGeneric::ShowsSizeGrip() const { - wxCHECK_MSG( (n >= 0) && (n < m_nFields), wxEmptyString, - _T("invalid status bar field index") ); + if ( !HasFlag(wxSTB_SIZEGRIP) ) + return false; - return m_statusStrings[n]; + wxTopLevelWindow * const + tlw = wxDynamicCast(wxGetTopLevelParent(GetParent()), wxTopLevelWindow); + return tlw && !tlw->IsMaximized() && tlw->HasFlag(wxRESIZE_BORDER); } -void wxStatusBarGeneric::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 - wxCHECK_RET( n == m_nFields, _T("status bar field count mismatch") ); + wxString text(GetStatusText(i)); + if (text.empty()) + return; // optimization - // delete the old widths in any case - this function may be used to reset - // the widths to the default (all equal) - // MBN: this is incompatible with at least wxMSW and wxMAC and not - // documented, but let's keep it for now - ReinitWidths(); + int xpos = rect.x + wxFIELD_TEXT_MARGIN, + maxWidth = rect.width - 2*wxFIELD_TEXT_MARGIN, + ypos = (int) (((rect.height - textHeight) / 2) + rect.y + 0.5); - // forget the old cached pixel widths - m_widthsAbs.Empty(); - - if ( !widths_field ) + if (ShowsSizeGrip()) { - // not an error, see the comment above - Refresh(); - return; + // 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; + } } - wxStatusBarBase::SetStatusWidths(n, widths_field); -} + // eventually ellipsize the text so that it fits the field width -void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) ) -{ - wxPaintDC dc(this); + 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; -#ifdef __WXGTK20__ - // Draw grip first - if (HasFlag( wxST_SIZEGRIP )) + if (ellmode == (wxEllipsizeMode)-1) { - 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 ); + // 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 + { + 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)); } -#endif - - if (GetFont().Ok()) - dc.SetFont(GetFont()); - - dc.SetBackgroundMode(wxTRANSPARENT); - -#ifdef __WXPM__ - wxColour vColor; - - vColor = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR); - ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel()); -#endif - - for (int i = 0; i < m_nFields; i ++) - DrawField(dc, i); -} - -void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i) -{ - int leftMargin = 2; - - wxRect rect; - GetFieldRect(i, rect); - - wxString text(GetStatusText(i)); - - long x, y; - - dc.GetTextExtent(text, &x, &y); - - int xpos = rect.x + leftMargin; - int ypos = (int) (((rect.height - y) / 2 ) + rect.y + 0.5) ; #if defined( __WXGTK__ ) || defined(__WXMAC__) - xpos++; - ypos++; + xpos++; + ypos++; #endif - dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height); - - dc.DrawText(text, xpos, ypos); + // draw the text + dc.DrawText(text, xpos, ypos); - dc.DestroyClippingRegion(); + if (ellmode == (wxEllipsizeMode)-1) + dc.DestroyClippingRegion(); } -void wxStatusBarGeneric::DrawField(wxDC& dc, int i) +void wxStatusBarGeneric::DrawField(wxDC& dc, int i, int textHeight) { wxRect rect; GetFieldRect(i, rect); - // Draw border - // Have grey background, plus 3-d border - - // One black rectangle. - // Inside this, left and top sides - dark grey. Bottom and right - - // white. + if (rect.GetWidth() <= 0) + return; // happens when the status bar is shrinked in a very small area! + + 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 - dc.SetPen(m_hilightPen); + dc.SetPen((style == wxSB_RAISED) ? m_mediumShadowPen : 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); - dc.DrawLine(rect.x + rect.width, rect.y + rect.height, - rect.x, rect.y + rect.height); + // 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); - dc.SetPen(m_mediumShadowPen); + dc.SetPen((style == wxSB_RAISED) ? m_hilightPen : m_mediumShadowPen); - // 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); + // 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.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); + 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((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, i); + DrawFieldText(dc, rect, i, textHeight); } - // 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) && ((size_t)n < m_panes.GetCount()), false, + wxT("invalid status bar field index") ); - // FIXME: workarounds for OS/2 bugs have nothing to do here (VZ) - int width, height; -#ifdef __WXPM__ - GetSize(&width, &height); -#else - GetClientSize(&width, &height); -#endif - - // 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) ) - { - 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; - } + if (m_widthsAbs.IsEmpty()) + return false; rect.x = 0; for ( int i = 0; i < n; i++ ) - { rect.x += m_widthsAbs[i]; - } - rect.x += m_borderX; - rect.y = m_borderY; + rect.y = m_borderY; rect.width = m_widthsAbs[n] - 2*m_borderX; - rect.height = height - 2*m_borderY; + rect.height = m_lastClientHeight - 2*m_borderY; - return TRUE; + return true; } -// Initialize colours -void wxStatusBarGeneric::InitColours() +int wxStatusBarGeneric::GetFieldFromPoint(const wxPoint& pt) const { - // Shadow colours -#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(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 + if (m_widthsAbs.IsEmpty()) + return wxNOT_FOUND; -#ifndef __WXPM__ - m_defaultStatusBarFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); -#endif + // 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_lastClientHeight) + return wxNOT_FOUND; + + 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; + + x += m_widthsAbs[i]; + } + + return wxNOT_FOUND; } -// Responds to colour changes, and passes event on to children. -void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event) +void wxStatusBarGeneric::InitColours() { - InitColours(); - Refresh(); - - // Propagate the event to the non-top-level children - wxWindow::OnSysColourChanged(event); +#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__ } 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( wxT("X"), NULL, &y ); + // current font (min height is as calculated above in Create() except for border) + int minHeight = (int)((11*GetCharHeight())/10); + + if ( height > minHeight ) + SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height + 2*m_borderY); +} - if ( height > (11*y)/10 ) +wxRect wxStatusBarGeneric::GetSizeGripRect() const +{ + int width, height; + wxWindow::DoGetClientSize(&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); +} + +// ---------------------------------------------------------------------------- +// wxStatusBarGeneric - event handlers +// ---------------------------------------------------------------------------- + +void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) ) +{ + wxPaintDC dc(this); + +#ifdef __WXGTK20__ + // Draw grip first + if ( ShowsSizeGrip() ) { - SetSize(-1, -1, -1, height + 2*m_borderY); + const wxRect& rc = GetSizeGripRect(); + 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 // __WXGTK20__ + + if (GetFont().IsOk()) + dc.SetFont(GetFont()); + + // compute char height only once for all panes: + int textHeight = dc.GetCharHeight(); + + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); + for (size_t i = 0; i < m_panes.GetCount(); i ++) + DrawField(dc, i, textHeight); +} + +void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event) +{ + InitColours(); + + // Propagate the event to the non-top-level children + wxWindow::OnSysColourChanged(event); } void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event) @@ -392,32 +450,44 @@ void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event) int width, height; GetClientSize(&width, &height); - if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height)) + if ( ShowsSizeGrip() && (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; + GdkWindow *source = GTKGetDrawingWindow(); 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), + 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 ); + event.Skip( true ); } #else - event.Skip( TRUE ); + event.Skip( true ); #endif } @@ -427,14 +497,14 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event) int width, height; GetClientSize(&width, &height); - if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height)) + if ( ShowsSizeGrip() && (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; + GdkWindow *source = GTKGetDrawingWindow(); int org_x = 0; int org_y = 0; @@ -448,12 +518,25 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event) } else { - event.Skip( TRUE ); + event.Skip( true ); } #else - event.Skip( TRUE ); + event.Skip( true ); #endif } -#endif // wxUSE_STATUSBAR +void wxStatusBarGeneric::OnSize(wxSizeEvent& WXUNUSED(event)) +{ + // FIXME: workarounds for OS/2 bugs have nothing to do here (VZ) + int width; +#ifdef __WXPM__ + GetSize(&width, &m_lastClientHeight); +#else + GetClientSize(&width, &m_lastClientHeight); +#endif + + // recompute the cache of the field widths if the status bar width has changed + m_widthsAbs = CalculateAbsWidths(width); +} +#endif // wxUSE_STATUSBAR