X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec376c8fd9ff813392030426acd2317c6fa6527e..8e5ec129614e2473fd240f2a6e94ee56e3a9039b:/src/gtk/clrpicker.cpp diff --git a/src/gtk/clrpicker.cpp b/src/gtk/clrpicker.cpp index f331fe7794..672a8593cb 100644 --- a/src/gtk/clrpicker.cpp +++ b/src/gtk/clrpicker.cpp @@ -17,20 +17,16 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/gtk/private.h" +#if wxUSE_COLOURPICKERCTRL && defined(__WXGTK24__) + #include "wx/clrpicker.h" -#include #include - - // ============================================================================ // implementation // ============================================================================ -#if wxUSE_COLOURPICKERCTRL && defined(__WXGTK24__) - //----------------------------------------------------------------------------- // "color-set" //----------------------------------------------------------------------------- @@ -41,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());