Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

[wxWidgets.git] / src / gtk / infobar.cpp

diff --git a/src/gtk/infobar.cpp b/src/gtk/infobar.cpp
index c69787d1520d5cc99b9ad91564ed873d0524e973..9963cdb51683aa82351491a1403071e1162fd744 100644 (file)
--- a/src/gtk/infobar.cpp
+++ b/src/gtk/infobar.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxInfoBar implementation for GTK
 // Author:      Vadim Zeitlin
 // Created:     2009-09-27
 // Purpose:     wxInfoBar implementation for GTK
 // Author:      Vadim Zeitlin
 // Created:     2009-09-27

-// RCS-ID:      $Id: wxhead.cpp,v 1.10 2009-06-29 10:23:04 zeitlin Exp $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -31,6 +31,7 @@
 #endif // WX_PRECOMP
 
 #include "wx/vector.h"
 #endif // WX_PRECOMP
 
 #include "wx/vector.h"

+#include "wx/stockitem.h"

 
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/messagetype.h"
 
 #include "wx/gtk/private.h"
 #include "wx/gtk/private/messagetype.h"


@@ -81,8 +82,12 @@ namespace
 
 inline bool UseNative()
 {
 
 inline bool UseNative()
 {

+#ifdef __WXGTK3__
+    return true;
+#else

     // native GtkInfoBar widget is only available in GTK+ 2.18 and later
     return gtk_check_version(2, 18, 0) == 0;
     // native GtkInfoBar widget is only available in GTK+ 2.18 and later
     return gtk_check_version(2, 18, 0) == 0;

+#endif

 }
 
 } // anonymous namespace
 }
 
 } // anonymous namespace


@@ -143,7 +148,7 @@ bool wxInfoBar::Create(wxWindow *parent, wxWindowID winid)
     GTKConnectWidget("response", G_CALLBACK(wxgtk_infobar_response));
     GTKConnectWidget("close", G_CALLBACK(wxgtk_infobar_close));
 
     GTKConnectWidget("response", G_CALLBACK(wxgtk_infobar_response));
     GTKConnectWidget("close", G_CALLBACK(wxgtk_infobar_close));
 

-    return false;
+    return true;

 }
 
 wxInfoBar::~wxInfoBar()
 }
 
 wxInfoBar::~wxInfoBar()


@@ -208,9 +213,9 @@ GtkWidget *wxInfoBar::GTKAddButton(wxWindowID btnid, const wxString& label)
     GtkWidget *button = gtk_info_bar_add_button
                         (
                             GTK_INFO_BAR(m_widget),
     GtkWidget *button = gtk_info_bar_add_button
                         (
                             GTK_INFO_BAR(m_widget),

-                            label.empty()
+                            (label.empty()

                                 ? GTKConvertMnemonics(wxGetStockGtkID(btnid))
                                 ? GTKConvertMnemonics(wxGetStockGtkID(btnid))

-                                : label,
+                                : label).utf8_str(),

                             btnid
                         );
 
                             btnid
                         );
 


@@ -254,13 +259,16 @@ void wxInfoBar::RemoveButton(wxWindowID btnid)
           i != buttons.rend();
           ++i )
     {
           i != buttons.rend();
           ++i )
     {

-        gtk_widget_destroy(i->button);
-        buttons.erase(i.base());
+        if (i->id == btnid)
+        {
+            gtk_widget_destroy(i->button);
+            buttons.erase(i.base());

 
 

-        // see comment in GTKAddButton()
-        InvalidateBestSize();
+            // see comment in GTKAddButton()
+            InvalidateBestSize();

 
 

-        return;
+            return;
+        }

     }
 
     wxFAIL_MSG( wxString::Format("button with id %d not found", btnid) );
     }
 
     wxFAIL_MSG( wxString::Format("button with id %d not found", btnid) );


@@ -271,7 +279,7 @@ void wxInfoBar::DoApplyWidgetStyle(GtkRcStyle *style)
     wxInfoBarGeneric::DoApplyWidgetStyle(style);
 
     if ( UseNative() )
     wxInfoBarGeneric::DoApplyWidgetStyle(style);
 
     if ( UseNative() )

-        gtk_widget_modify_style(m_impl->m_label, style);
+        GTKApplyStyle(m_impl->m_label, style);

 }
 
 #endif // wxUSE_INFOBAR
 }
 
 #endif // wxUSE_INFOBAR