Disable some wxWebView tests that fail on the buildbot but not locally.

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

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index fc63e3e4e015745223cf2d857754eac222d47d36..d9fc4408c7f292f6e709a0f4f49465532a3b23ce 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -38,8 +38,6 @@ gtk_choice_changed_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 // wxChoice
 //-----------------------------------------------------------------------------
 
 // wxChoice
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-

 void wxChoice::Init()
 {
     m_strings = NULL;
 void wxChoice::Init()
 {
     m_strings = NULL;


@@ -142,7 +140,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter & items,
         // the right insertion point
         if (m_strings)
             n = m_strings->Add(items[i]);
         // the right insertion point
         if (m_strings)
             n = m_strings->Add(items[i]);

-            
+

         GTKInsertComboBoxTextItem( n, items[i] );
 
         m_clientData.Insert( NULL, n );
         GTKInsertComboBoxTextItem( n, items[i] );
 
         m_clientData.Insert( NULL, n );


@@ -168,7 +166,7 @@ void wxChoice::DoClear()
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
 

-    DisableEvents();
+    GTKDisableEvents();

 
     GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
     GtkTreeModel* model = gtk_combo_box_get_model( combobox );
 
     GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
     GtkTreeModel* model = gtk_combo_box_get_model( combobox );


@@ -179,7 +177,7 @@ void wxChoice::DoClear()
     if (m_strings)
         m_strings->Clear();
 
     if (m_strings)
         m_strings->Clear();
 

-    EnableEvents();
+    GTKEnableEvents();

 
     InvalidateBestSize();
 }
 
     InvalidateBestSize();
 }


@@ -299,12 +297,12 @@ void wxChoice::SetSelection( int n )
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid control") );
 

-    DisableEvents();
+    GTKDisableEvents();

 
     GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
     gtk_combo_box_set_active( combobox, n );
 
 
     GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
     gtk_combo_box_set_active( combobox, n );
 

-    EnableEvents();
+    GTKEnableEvents();

 }
 
 void wxChoice::SetColumns(int n)
 }
 
 void wxChoice::SetColumns(int n)


@@ -321,13 +319,13 @@ int wxChoice::GetColumns() const
 }
 
 
 }
 
 

-void wxChoice::DisableEvents()
+void wxChoice::GTKDisableEvents()

 {
     g_signal_handlers_block_by_func(m_widget,
                                 (gpointer) gtk_choice_changed_callback, this);
 }
 
 {
     g_signal_handlers_block_by_func(m_widget,
                                 (gpointer) gtk_choice_changed_callback, this);
 }
 

-void wxChoice::EnableEvents()
+void wxChoice::GTKEnableEvents()

 {
     g_signal_handlers_unblock_by_func(m_widget,
                                 (gpointer) gtk_choice_changed_callback, this);
 {
     g_signal_handlers_unblock_by_func(m_widget,
                                 (gpointer) gtk_choice_changed_callback, this);


@@ -336,7 +334,7 @@ void wxChoice::EnableEvents()
 
 GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
 
 GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {

-    return m_widget->window;
+    return gtk_widget_get_window(m_widget);

 }
 
 // Notice that this method shouldn't be necessary, because GTK calculates
 }
 
 // Notice that this method shouldn't be necessary, because GTK calculates


@@ -373,7 +371,7 @@ wxSize wxChoice::DoGetBestSize() const
 void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     gtk_widget_modify_style(m_widget, style);
 void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     gtk_widget_modify_style(m_widget, style);

-    gtk_widget_modify_style(GTK_BIN(m_widget)->child, style);
+    gtk_widget_modify_style(gtk_bin_get_child(GTK_BIN(m_widget)), style);

 }
 
 
 }