Remove wxT from prototype

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

diff --git a/src/gtk/infobar.cpp b/src/gtk/infobar.cpp
index e386a95f963a3aac9339b8c65e247653ff779adf..9963cdb51683aa82351491a1403071e1162fd744 100644 (file)
--- a/src/gtk/infobar.cpp
+++ b/src/gtk/infobar.cpp
@@ -82,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


@@ -209,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
                         );
 


@@ -275,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