X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2d93e735a9f126b855a9353ca8ddeacaaf52817..009c72169f3dc90dbec89fdfe2956065aa35377f:/src/generic/statusbr.cpp?ds=sidebyside

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index a65e6c1e5c..7e9e7791ff 100644
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -1,119 +1,139 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        generic/statusbr.cpp
+// Name:        src/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
+// 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 !defined(__WIN32__) || !wxUSE_NATIVE_STATUSBAR
+#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"
 #endif
 
-#include "wx/statusbr.h"
-
-// with wxUSE_NATIVE_STATUSBAR it is not included from wx/statusbr.h
-#include "wx/generic/statusbr.h"
+#ifdef __WXGTK20__
+    #include <gtk/gtk.h>
+#endif
 
-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()
 
 // Default status border dimensions
 #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;
+    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;
 }
 
 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;
-  m_themeEnabled = TRUE;
-
-  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);
+    style |= wxTAB_TRAVERSAL | wxFULL_REPAINT_ON_RESIZE;
+    if ( !wxWindow::Create(parent, id,
+                           wxDefaultPosition, wxDefaultSize,
+                           style, name) )
+        return false;
+
+    // The status bar should have a themed background
+    SetThemeEnabled( true );
+
+    InitColours();
+
+#ifdef __WXPM__
+    SetFont(*wxSMALL_FONT);
 #endif
-  InitColours();
 
-  SetFont(m_defaultStatusBarFont);
+    wxCoord y;
+    {
+        // Set the height according to the font and the border size
+        wxClientDC dc(this);
+        dc.SetFont(GetFont());
+
+        dc.GetTextExtent(_T("X"), NULL, &y );
+    }
+    int height = (int)( (11*y)/10 + 2*GetBorderY());
+
+    SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height);
+
+    SetFieldsCount(1);
 
-  return success;
+    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);
 
-    SetStatusWidths(number, widths);
+    // forget the old cached pixel widths
+    m_widthsAbs.Empty();
+
+    wxStatusBarBase::SetFieldsCount(number, widths);
+
+    wxASSERT_MSG( m_nFields == (int)m_statusStrings.GetCount(),
+                  _T("This really should never happen, can we do away with m_nFields here?") );
 }
 
 void wxStatusBarGeneric::SetStatusText(const wxString& text, int number)
@@ -121,9 +141,21 @@ 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;
+
+        wxRect rect;
+        GetFieldRect(number, rect);
+
+        Refresh(true, &rect);
 
-    Refresh();
+        // 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();
+    }
 }
 
 wxString wxStatusBarGeneric::GetStatusText(int n) const
@@ -141,109 +173,157 @@ 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;
+    wxStatusBarBase::SetStatusWidths(n, widths_field);
+}
 
-    // 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
+bool wxStatusBarGeneric::ShowsSizeGrip() const
+{
+    if ( !HasFlag(wxST_SIZEGRIP) )
+        return false;
 
-    // set widths
-    m_statusWidths = new int[n];
-    for (i = 0; i < m_nFields; i++)
-    {
-        m_statusWidths[i] = widths_field[i];
-    }
+    wxTopLevelWindow * const
+        tlw = wxDynamicCast(wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
+    return tlw && !tlw->IsMaximized() && tlw->HasFlag(wxRESIZE_BORDER);
 }
 
 void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
-  wxPaintDC dc(this);
+    wxPaintDC dc(this);
 
-  int i;
-  if ( GetFont().Ok() )
-    dc.SetFont(GetFont());
-  dc.SetBackgroundMode(wxTRANSPARENT);
-  dc.SetTextForeground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
+#ifdef __WXGTK20__
+    // Draw grip first
+    if ( ShowsSizeGrip() )
+    {
+        int width, height;
+        GetClientSize(&width, &height);
+
+        if (GetLayoutDirection() == wxLayout_RightToLeft)
+        {
+            gtk_paint_resize_grip( m_widget->style,
+                               GTKGetDrawingWindow(),
+                               (GtkStateType) GTK_WIDGET_STATE (m_widget),
+                               NULL,
+                               m_widget,
+                               "statusbar",
+                               GDK_WINDOW_EDGE_SOUTH_WEST,
+                               2, 2, height-2, height-4 );
+        }
+        else
+        {
+            gtk_paint_resize_grip( m_widget->style,
+                               GTKGetDrawingWindow(),
+                               (GtkStateType) GTK_WIDGET_STATE (m_widget),
+                               NULL,
+                               m_widget,
+                               "statusbar",
+                               GDK_WINDOW_EDGE_SOUTH_EAST,
+                               width-height-2, 2, height-2, height-4 );
+        }
+    }
+#endif // __WXGTK20__
+
+    if (GetFont().Ok())
+        dc.SetFont(GetFont());
 
-  for ( i = 0; i < m_nFields; i ++ )
-    DrawField(dc, i);
+    dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
 
-#   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)
 {
-  int leftMargin = 2;
+    int leftMargin = 2;
 
-  wxRect rect;
-  GetFieldRect(i, rect);
+    wxRect rect;
+    GetFieldRect(i, rect);
 
-  wxString text(GetStatusText(i));
+    wxString text(GetStatusText(i));
 
-  long x, y;
+    wxCoord x = 0, y = 0;
 
-  dc.GetTextExtent(text, &x, &y);
+    dc.GetTextExtent(text, &x, &y);
 
-  int xpos = rect.x + leftMargin;
-  int ypos = (int) (((rect.height - y) / 2 ) + rect.y + 0.5) ;
+    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.SetClippingRegion(rect.x, rect.y, rect.width, rect.height);
 
-  dc.DrawText(text, xpos, ypos);
+    dc.DrawText(text, xpos, ypos);
 
-  dc.DestroyClippingRegion();
+    dc.DestroyClippingRegion();
 }
 
 void wxStatusBarGeneric::DrawField(wxDC& dc, int i)
 {
-  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.
+    wxRect rect;
+    GetFieldRect(i, rect);
 
-    dc.SetPen(m_hilightPen);
+    int style = wxSB_NORMAL;
+    if (m_statusStyles)
+        style = m_statusStyles[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);
-
-    dc.SetPen(m_mediumShadowPen);
+    if (style != wxSB_FLAT)
+    {
+        // Draw border
+        // For wxSB_NORMAL:
+        // Have 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((style == wxSB_RAISED) ? m_mediumShadowPen : m_hilightPen);
+
+    #ifndef __WXPM__
+
+        // 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((style == wxSB_RAISED) ? m_hilightPen : m_mediumShadowPen);
+
+        // 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((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);
 
-    // 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);
+#endif
+    }
 
     DrawFieldText(dc, i);
 }
@@ -251,97 +331,62 @@ 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") );
-
-  int width, height;
-  GetClientSize(&width, &height);
-
-  int i;
-  int sum_of_nonvar = 0;
-  int num_of_var = 0;
-  bool do_same_width = FALSE;
+    wxCHECK_MSG( (n >= 0) && (n < m_nFields), false,
+                 _T("invalid status bar field index") );
 
-  int fieldWidth = 0;
-  int fieldPosition = 0;
+    // 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
 
-  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++)
+    // 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) 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++)
-    {
-      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;
+    return true;
 }
 
 // Initialize colours
 void wxStatusBarGeneric::InitColours()
 {
-    // Shadow colours
-#ifndef __WIN16__
-    wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
-    m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);
-
-    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);
-#endif
-
-    m_defaultStatusBarFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+#if defined(__WXPM__)
+    m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID);
+    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__
 }
 
 // Responds to colour changes, and passes event on to children.
 void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     InitColours();
-    Refresh();
 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
@@ -353,12 +398,93 @@ 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 )
     {
-        SetSize(-1, -1, -1, height + 2*m_borderY);
+        SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height + 2*m_borderY);
+    }
+}
+
+void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event)
+{
+#ifdef __WXGTK20__
+    int width, height;
+    GetClientSize(&width, &height);
+
+    if ( ShowsSizeGrip()  && (event.GetX() > width-height) )
+    {
+        GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
+
+        if (!GTK_IS_WINDOW (ancestor))
+            return;
+
+        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 );
     }
+#else
+    event.Skip( true );
+#endif
+}
+
+void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
+{
+#ifdef __WXGTK20__
+    int width, height;
+    GetClientSize(&width, &height);
+
+    if ( ShowsSizeGrip() && (event.GetX() > width-height) )
+    {
+        GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
+
+        if (!GTK_IS_WINDOW (ancestor))
+            return;
+
+        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 );
+    }
+#else
+    event.Skip( true );
+#endif
 }
 
-//#endif // Win32 && wxUSE_NATIVE_STATUSBAR
+#endif // wxUSE_STATUSBAR