Added logic, API and docs for wxDataViewModel::HasDefaultCompare indicating a compare...

[wxWidgets.git] / src / generic / statusbr.cpp

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 5517573f79a2bfd38e0644931d219c484457f61a..44fa9ad078fb59cf9a70dfd961f9f6bd4e9f64dd 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -18,19 +18,18 @@
 
 #if wxUSE_STATUSBAR
 
 
 #if wxUSE_STATUSBAR
 

+#include "wx/statusbr.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/frame.h"

     #include "wx/settings.h"
     #include "wx/dcclient.h"
 #endif
 
 #ifdef __WXGTK20__
     #include "wx/settings.h"
     #include "wx/dcclient.h"
 #endif
 
 #ifdef __WXGTK20__

-#include "wx/gtk/private.h"
-#include "wx/gtk/win_gtk.h"
+    #include <gtk/gtk.h>
+    #include "wx/gtk/win_gtk.h"

 #endif
 
 #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
 // 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


@@ -67,9 +66,10 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
                                 long style,
                                 const wxString& name)
 {
                                 long style,
                                 const wxString& name)
 {

+    style |= wxTAB_TRAVERSAL | wxFULL_REPAINT_ON_RESIZE;

     if ( !wxWindow::Create(parent, id,
                            wxDefaultPosition, wxDefaultSize,
     if ( !wxWindow::Create(parent, id,
                            wxDefaultPosition, wxDefaultSize,

-                           style | wxTAB_TRAVERSAL, name) )
+                           style, name) )

         return false;
 
     // The status bar should have a themed background
         return false;
 
     // The status bar should have a themed background


@@ -81,13 +81,14 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
     SetFont(*wxSMALL_FONT);
 #endif
 
     SetFont(*wxSMALL_FONT);
 #endif
 

-    // 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 );
+       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);
     int height = (int)( (11*y)/10 + 2*GetBorderY());
 
     SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height);


@@ -148,7 +149,12 @@ void wxStatusBarGeneric::SetStatusText(const wxString& text, int number)
         wxRect rect;
         GetFieldRect(number, rect);
 
         wxRect rect;
         GetFieldRect(number, rect);
 

-        Refresh( true, &rect );
+        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();

     }
 }
 
     }
 }
 


@@ -194,16 +200,29 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
     {
         int width, height;
         GetClientSize(&width, &height);
     {
         int width, height;
         GetClientSize(&width, &height);

-
-        gtk_paint_resize_grip( m_widget->style,
+        
+        if (GetLayoutDirection() == wxLayout_RightToLeft)
+        {
+            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_WEST,
+                               2, 2, height-2, height-4 );
+        }
+        else
+        {
+            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,
                                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 );
-
+                               width-height-2, 2, height-2, height-4 );
+        }

     }
 #endif
 
     }
 #endif
 


@@ -232,7 +251,7 @@ void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i)
 
     wxString text(GetStatusText(i));
 
 
     wxString text(GetStatusText(i));
 

-    long x = 0, y = 0;
+    wxCoord x = 0, y = 0;

 
     dc.GetTextExtent(text, &x, &y);
 
 
     dc.GetTextExtent(text, &x, &y);
 


@@ -410,12 +429,24 @@ void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event)
         int org_y = 0;
         gdk_window_get_origin( source, &org_x, &org_y );
 
         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);
                                   GDK_WINDOW_EDGE_SOUTH_EAST,
                                   1,
                                   org_x + event.GetX(),
                                   org_y + event.GetY(),
                                   0);

+        }

     }
     else
     {
     }
     else
     {