Fix text extent computation in wxMSW wxGraphicsContext.

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

diff --git a/src/gtk/clrpicker.cpp b/src/gtk/clrpicker.cpp
index 57272a0e88f8d20259fbdebcda22041db9d47925..fe56ed4e2b2629cc9424b5571d81e345e6525371 100644 (file)
--- a/src/gtk/clrpicker.cpp
+++ b/src/gtk/clrpicker.cpp
@@ -43,7 +43,7 @@ static void gtk_clrbutton_setcolor_callback(GtkColorButton *widget,
 
     // fire the colour-changed event
     wxColourPickerEvent event(p, p->GetId(), p->GetColour());
-    p->GetEventHandler()->ProcessEvent(event);
+    p->HandleWindowEvent(event);
 }
 }
 
@@ -68,7 +68,7 @@ bool wxColourButton::Create( wxWindow *parent, wxWindowID id,
 
     m_colour = col;
     m_widget = gtk_color_button_new_with_color( m_colour.GetColor() );
-    gtk_widget_show(m_widget);
+    g_object_ref(m_widget);
 
     // GtkColourButton signals
     g_signal_connect(m_widget, "color-set",