X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b976323b04593bf2f642d8bdf36b39a346d840dc..3e7ea45c59410715c4e4f70e89690b71cb1dfa79:/src/gtk/colordlg.cpp?ds=sidebyside

diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp
index 4c14ef5dfc..8300d82f83 100644
--- a/src/gtk/colordlg.cpp
+++ b/src/gtk/colordlg.cpp
@@ -16,7 +16,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_COLOURDLG && defined(__WXGTK20__)
+#if wxUSE_COLOURDLG
 
 #include "wx/colordlg.h"
 
@@ -26,6 +26,10 @@
 
 #include "wx/gtk/private.h"
 
+#if wxUSE_LIBHILDON
+    #include <hildon-widgets/hildon-color-selector.h>
+#endif // wxUSE_LIBHILDON
+
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 
 wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)
@@ -38,14 +42,22 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
     if (data)
         m_data = *data;
 
+    m_parent = GetParentForModalDialog(parent);
+    GtkWindow * const parentGTK = m_parent ? GTK_WINDOW(m_parent->m_widget)
+                                           : NULL;
+
+#if wxUSE_LIBHILDON
+    m_widget = hildon_color_selector_new(parentGTK);
+#else // !wxUSE_LIBHILDON
     wxString title(_("Choose colour"));
     m_widget = gtk_color_selection_dialog_new(wxGTK_CONV(title));
+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+
+    g_object_ref(m_widget);
 
-    if (parent)
+    if ( parentGTK )
     {
-        GtkWindow* gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) );
-        gtk_window_set_transient_for(GTK_WINDOW(m_widget),
-                                     gtk_parent);
+        gtk_window_set_transient_for(GTK_WINDOW(m_widget), parentGTK);
     }
 
     GtkColorSelection *sel =
@@ -81,14 +93,19 @@ int wxColourDialog::ShowModal()
 
 void wxColourDialog::ColourDataToDialog()
 {
+    const GdkColor * const
+        col = m_data.GetColour().Ok() ? m_data.GetColour().GetColor()
+                                      : NULL;
+
+#if wxUSE_LIBHILDON
+    HildonColorSelector * const sel = HILDON_COLOR_SELECTOR(m_widget);
+    hildon_color_selector_set_color(sel, wx_const_cast(GdkColor *, col));
+#else // !wxUSE_LIBHILDON
     GtkColorSelection *sel =
         GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel);
 
-    if (m_data.GetColour().Ok())
-    {
-        gtk_color_selection_set_current_color(sel,
-                                              m_data.GetColour().GetColor());
-    }
+    if ( col )
+        gtk_color_selection_set_current_color(sel, col);
 
     // setup the palette:
 
@@ -107,17 +124,24 @@ void wxColourDialog::ColourDataToDialog()
     wxGtkString pal(gtk_color_selection_palette_to_string(colors, n_colors));
 
     GtkSettings *settings = gtk_widget_get_settings(GTK_WIDGET(sel));
-    g_object_set(settings, "gtk-color-palette", pal, NULL);
+    g_object_set(settings, "gtk-color-palette", pal.c_str(), NULL);
+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
 }
 
 void wxColourDialog::DialogToColourData()
 {
+#if wxUSE_LIBHILDON
+    HildonColorSelector * const sel = HILDON_COLOR_SELECTOR(m_widget);
+    const GdkColor * const clr = hildon_color_selector_get_color(sel);
+    if ( clr )
+        m_data.SetColour(*clr);
+#else // !wxUSE_LIBHILDON
     GtkColorSelection *sel =
         GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel);
 
     GdkColor clr;
     gtk_color_selection_get_current_color(sel, &clr);
-    m_data.SetColour(wxColour(clr.red >> 8, clr.green >> 8, clr.blue >> 8));
+    m_data.SetColour(clr);
 
     // Extract custom palette:
 
@@ -131,15 +155,14 @@ void wxColourDialog::DialogToColourData()
     {
         for (int i = 0; i < wxMin(n_colors, 16); i++)
         {
-            m_data.SetCustomColour(i, wxColour(colors[i].red >> 8,
-                                               colors[i].green >> 8,
-                                               colors[i].blue >> 8));
+            m_data.SetCustomColour(i, wxColour(colors[i]));
         }
         g_free(colors);
     }
 
     g_free(pal);
+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
 }
 
-#endif // wxUSE_COLOURDLG && defined(__WXGTK20__)
+#endif // wxUSE_COLOURDLG