Fix history in wxWebViewIE when using a custom file scheme.

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 740df48eed026e533fefd1aa232566f25270ffd6..3fdc2d8bc856305574c2682af3c8935fac7ad8fe 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -248,7 +248,7 @@ void wxStatusBarGeneric::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int
         text = wxControl::Ellipsize(text, dc,
                                     ellmode,
                                     maxWidth,
         text = wxControl::Ellipsize(text, dc,
                                     ellmode,
                                     maxWidth,

-                                    wxELLIPSIZE_EXPAND_TAB);
+                                    wxELLIPSIZE_FLAGS_EXPAND_TABS);

             // Ellipsize() will do something only if necessary
 
         // update the ellipsization status for this pane; this is used later to
             // Ellipsize() will do something only if necessary
 
         // update the ellipsization status for this pane; this is used later to


@@ -345,7 +345,7 @@ int wxStatusBarGeneric::GetFieldFromPoint(const wxPoint& pt) const
     if (m_widthsAbs.IsEmpty())
         return wxNOT_FOUND;
 
     if (m_widthsAbs.IsEmpty())
         return wxNOT_FOUND;
 

-    // NOTE: we explicitely don't take in count the borders since they are only
+    // 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)
     //       useful when rendering the status text, not for hit-test computations
 
     if (pt.y <= 0 || pt.y >= m_lastClientHeight)


@@ -414,9 +414,9 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
         GdkWindowEdge edge =
             GetLayoutDirection() == wxLayout_RightToLeft ? GDK_WINDOW_EDGE_SOUTH_WEST :
                                                            GDK_WINDOW_EDGE_SOUTH_EAST;
         GdkWindowEdge edge =
             GetLayoutDirection() == wxLayout_RightToLeft ? GDK_WINDOW_EDGE_SOUTH_WEST :
                                                            GDK_WINDOW_EDGE_SOUTH_EAST;

-        gtk_paint_resize_grip( m_widget->style,
+        gtk_paint_resize_grip(gtk_widget_get_style(m_widget),

                             GTKGetDrawingWindow(),
                             GTKGetDrawingWindow(),

-                            (GtkStateType) GTK_WIDGET_STATE (m_widget),
+                            gtk_widget_get_state(m_widget),

                             NULL,
                             m_widget,
                             "statusbar",
                             NULL,
                             m_widget,
                             "statusbar",