/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/colordlg.cpp
+// Name: src/gtk/colordlg.cpp
// Purpose: Native wxColourDialog for GTK+
// Author: Vaclav Slavik
// Modified by:
#pragma hdrstop
#endif
-#if wxUSE_COLOURDLG && defined(__WXGTK20__)
+#if wxUSE_COLOURDLG
#include "wx/colordlg.h"
+#include "wx/testing.h"
#ifndef WX_PRECOMP
#include "wx/intl.h"
#endif
+#include <gtk/gtk.h>
#include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/dialogcount.h"
+
+#if wxUSE_LIBHILDON
+ #include <hildon-widgets/hildon-color-selector.h>
+#endif // wxUSE_LIBHILDON
+
+#if wxUSE_LIBHILDON2
+extern "C" {
+ #include <hildon/hildon.h>
+}
+#endif // wxUSE_LIBHILDON2
IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
if (data)
m_data = *data;
+ m_parent = GetParentForModalDialog(parent, 0);
+ GtkWindow * const parentGTK = m_parent ? GTK_WINDOW(m_parent->m_widget)
+ : NULL;
+
+#if wxUSE_LIBHILDON
+ m_widget = hildon_color_selector_new(parentGTK);
+#elif wxUSE_LIBHILDON2 // !wxUSE_LIBHILDON
+ m_widget = hildon_color_chooser_dialog_new();
+#else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
wxString title(_("Choose colour"));
m_widget = gtk_color_selection_dialog_new(wxGTK_CONV(title));
+#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+
+ g_object_ref(m_widget);
- m_parent = GetParentForModalDialog(parent);
- if ( m_parent )
+ if ( parentGTK )
{
- GtkWindow* gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(m_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 =
- GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel);
+#if !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+ GtkColorSelection* sel = GTK_COLOR_SELECTION(
+ gtk_color_selection_dialog_get_color_selection(
+ GTK_COLOR_SELECTION_DIALOG(m_widget)));
gtk_color_selection_set_has_palette(sel, true);
+#endif // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
return true;
}
int wxColourDialog::ShowModal()
{
+ WX_TESTING_SHOW_MODAL_HOOK();
+
ColourDataToDialog();
+ wxOpenModalDialogLocker modalLocker;
+
gint result = gtk_dialog_run(GTK_DIALOG(m_widget));
gtk_widget_hide(m_widget);
switch (result)
{
default:
- wxFAIL_MSG(_T("unexpected GtkColorSelectionDialog return code"));
+ wxFAIL_MSG(wxT("unexpected GtkColorSelectionDialog return code"));
// fall through
case GTK_RESPONSE_CANCEL:
void wxColourDialog::ColourDataToDialog()
{
- GtkColorSelection *sel =
- GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel);
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+ const GdkColor * const
+ col = m_data.GetColour().IsOk() ? m_data.GetColour().GetColor()
+ : NULL;
+#endif
+#if wxUSE_LIBHILDON
+ HildonColorSelector * const sel = HILDON_COLOR_SELECTOR(m_widget);
+ hildon_color_selector_set_color(sel, const_cast<GdkColor *>(col));
+#elif wxUSE_LIBHILDON2
+ GdkColor clr;
+ if (col)
+ clr = *col;
+ else {
+ clr.pixel = 0;
+ clr.red = 32768;
+ clr.green = 32768;
+ clr.blue = 32768;
+ }
+
+ hildon_color_chooser_dialog_set_color((HildonColorChooserDialog *)m_widget, &clr);
+#else // !wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
+ GtkColorSelection* sel = GTK_COLOR_SELECTION(
+ gtk_color_selection_dialog_get_color_selection(
+ GTK_COLOR_SELECTION_DIALOG(m_widget)));
- if (m_data.GetColour().Ok())
+ const wxColour& color = m_data.GetColour();
+ if (color.IsOk())
{
- gtk_color_selection_set_current_color(sel,
- m_data.GetColour().GetColor());
+#ifdef __WXGTK3__
+ gtk_color_selection_set_current_rgba(sel, color);
+#else
+ gtk_color_selection_set_current_color(sel, color.GetColor());
+#endif
}
// setup the palette:
- GdkColor colors[16];
+ GdkColor colors[wxColourData::NUM_CUSTOM];
gint n_colors = 0;
- for (unsigned i = 0; i < 16; i++)
+ for (unsigned i = 0; i < WXSIZEOF(colors); i++)
{
wxColour c = m_data.GetCustomColour(i);
- if (c.Ok())
+ if (c.IsOk())
{
colors[n_colors] = *c.GetColor();
n_colors++;
GtkSettings *settings = gtk_widget_get_settings(GTK_WIDGET(sel));
g_object_set(settings, "gtk-color-palette", pal.c_str(), NULL);
+#endif // wxUSE_LIBHILDON / wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
}
void wxColourDialog::DialogToColourData()
{
- GtkColorSelection *sel =
- GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel);
+#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);
+#elif wxUSE_LIBHILDON2 // !wxUSE_LIBHILDON
+ const GdkColor * const
+ col = m_data.GetColour().IsOk() ? m_data.GetColour().GetColor() : NULL;
+ GdkColor clr;
+ if (col)
+ clr = *col;
+ else {
+ clr.pixel = 0;
+ clr.red = 32768;
+ clr.green = 32768;
+ clr.blue = 32768;
+ }
+ GdkColor new_color = clr;
+ hildon_color_chooser_dialog_get_color((HildonColorChooserDialog *)m_widget, &new_color);
+
+ m_data.SetColour(new_color);
+#else // !wxUSE_LIBHILDON2
+
+ GtkColorSelection* sel = GTK_COLOR_SELECTION(
+ gtk_color_selection_dialog_get_color_selection(
+ GTK_COLOR_SELECTION_DIALOG(m_widget)));
+
+#ifdef __WXGTK3__
+ GdkRGBA clr;
+ gtk_color_selection_get_current_rgba(sel, &clr);
+#else
GdkColor clr;
gtk_color_selection_get_current_color(sel, &clr);
- m_data.SetColour(wxColour(clr));
+#endif
+ m_data.SetColour(clr);
// Extract custom palette:
gint n_colors;
if (gtk_color_selection_palette_from_string(pal, &colors, &n_colors))
{
- for (int i = 0; i < wxMin(n_colors, 16); i++)
+ for (int i = 0; i < n_colors && i < wxColourData::NUM_CUSTOM; i++)
{
m_data.SetCustomColour(i, wxColour(colors[i]));
}
}
g_free(pal);
+#endif // wxUSE_LIBHILDON / wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
}
-#endif // wxUSE_COLOURDLG && defined(__WXGTK20__)
+#endif // wxUSE_COLOURDLG
projects / wxWidgets.git / blobdiff