don't use built-in support for menu bitmaps if they are too big, they don't come...

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

diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp
index 34e9c118fea275d20cd3f43b18d11bee17fbbf99..8eaca8bc7878320311e3de9064ce478d4b9846e0 100644 (file)
--- a/src/gtk/colordlg.cpp
+++ b/src/gtk/colordlg.cpp
@@ -16,7 +16,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_COLOURDLG && defined(__WXGTK20__)
+#if wxUSE_COLOURDLG

 
 #include "wx/colordlg.h"
 
 
 #include "wx/colordlg.h"
 


@@ -26,6 +26,10 @@
 
 #include "wx/gtk/private.h"
 
 
 #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)
 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;
 
     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));
     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 =
     }
 
     GtkColorSelection *sel =


@@ -81,14 +93,19 @@ int wxColourDialog::ShowModal()
 
 void wxColourDialog::ColourDataToDialog()
 {
 
 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, const_cast<GdkColor *>(col));
+#else // !wxUSE_LIBHILDON

     GtkColorSelection *sel =
         GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel);
 
     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:
 
 
     // setup the palette:
 


@@ -108,16 +125,23 @@ void wxColourDialog::ColourDataToDialog()
 
     GtkSettings *settings = gtk_widget_get_settings(GTK_WIDGET(sel));
     g_object_set(settings, "gtk-color-palette", pal.c_str(), NULL);
 
     GtkSettings *settings = gtk_widget_get_settings(GTK_WIDGET(sel));
     g_object_set(settings, "gtk-color-palette", pal.c_str(), NULL);

+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON

 }
 
 void wxColourDialog::DialogToColourData()
 {
 }
 
 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);
     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));
+    m_data.SetColour(clr);

 
     // Extract custom palette:
 
 
     // Extract custom palette:
 


@@ -137,7 +161,8 @@ void wxColourDialog::DialogToColourData()
     }
 
     g_free(pal);
     }
 
     g_free(pal);

+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON

 }
 
 }
 

-#endif // wxUSE_COLOURDLG && defined(__WXGTK20__)
+#endif // wxUSE_COLOURDLG