use typed containers in wxHtmlParser instead of type-unsafe wxList/wxHashTable

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

diff --git a/src/gtk/clrpicker.cpp b/src/gtk/clrpicker.cpp
index 9b5cc89a47f0d53a95e9ee4391fe769af5764c96..9184ed70257df6e7589ee722434c3963cc583470 100644 (file)
--- a/src/gtk/clrpicker.cpp
+++ b/src/gtk/clrpicker.cpp
@@ -21,9 +21,6 @@
 
 #include "wx/clrpicker.h"
 
-#include "wx/gtk/private.h"
-
-#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 // ============================================================================
@@ -40,7 +37,9 @@ static void gtk_clrbutton_setcolor_callback(GtkColorButton *widget,
 {
     // update the m_colour member of the wxColourButton
     wxASSERT(p);
-    gtk_color_button_get_color(widget, p->GetGdkColor());
+    GdkColor gdkColor;
+    gtk_color_button_get_color(widget, &gdkColor);
+    p->SetGdkColor(gdkColor);
 
     // fire the colour-changed event
     wxColourPickerEvent event(p, p->GetId(), p->GetColour());
@@ -62,8 +61,6 @@ bool wxColourButton::Create( wxWindow *parent, wxWindowID id,
 {
     if (!gtk_check_version(2,4,0))
     {
-        m_needParent = true;
-
         if (!PreCreation( parent, pos, size ) ||
             !wxControl::CreateBase(parent, id, pos, size, style, validator, name))
         {
@@ -73,7 +70,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( GTK_WIDGET(m_widget) );
+        gtk_widget_show(m_widget);
 
         // GtkColourButton signals
         g_signal_connect(m_widget, "color-set",
@@ -83,7 +80,7 @@ bool wxColourButton::Create( wxWindow *parent, wxWindowID id,
         m_parent->DoAddChild( this );
 
         PostCreation(size);
-        SetBestSize(size);
+        SetInitialSize(size);
     }
     else
         return wxGenericColourButton::Create(parent, id, col, pos, size,