X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ff9d30c0aab3b281ef9b380eac17435556c5088..11a23db53128bf244a089123b7fd27deb577a889:/src/gtk/colordlg.cpp diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp index 8300d82f83..781a2316e1 100644 --- a/src/gtk/colordlg.cpp +++ b/src/gtk/colordlg.cpp @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/colordlg.cpp +// Name: src/gtk/colordlg.cpp // Purpose: Native wxColourDialog for GTK+ // Author: Vaclav Slavik // Modified by: // Created: 2004/06/04 -// RCS-ID: $Id$ // Copyright: (c) Vaclav Slavik, 2004 // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,17 +18,27 @@ #if wxUSE_COLOURDLG #include "wx/colordlg.h" +#include "wx/modalhook.h" #ifndef WX_PRECOMP #include "wx/intl.h" #endif +#include #include "wx/gtk/private.h" +#include "wx/gtk/private/gtk2-compat.h" +#include "wx/gtk/private/dialogcount.h" #if wxUSE_LIBHILDON #include #endif // wxUSE_LIBHILDON +#if wxUSE_LIBHILDON2 +extern "C" { + #include +} +#endif // wxUSE_LIBHILDON2 + IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data) @@ -42,13 +51,15 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) if (data) m_data = *data; - m_parent = GetParentForModalDialog(parent); + 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); -#else // !wxUSE_LIBHILDON +#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 @@ -60,24 +71,31 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) 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_HOOK_MODAL_DIALOG(); + 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: @@ -93,28 +111,49 @@ int wxColourDialog::ShowModal() void wxColourDialog::ColourDataToDialog() { +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 const GdkColor * const - col = m_data.GetColour().Ok() ? m_data.GetColour().GetColor() + 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, wx_const_cast(GdkColor *, col)); -#else // !wxUSE_LIBHILDON - GtkColorSelection *sel = - GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel); + hildon_color_selector_set_color(sel, const_cast(col)); +#elif wxUSE_LIBHILDON2 + GdkColor clr; + if (col) + clr = *col; + else { + clr.pixel = 0; + clr.red = 32768; + clr.green = 32768; + clr.blue = 32768; + } - if ( col ) - gtk_color_selection_set_current_color(sel, col); + 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))); + + const wxColour& color = m_data.GetColour(); + if (color.IsOk()) + { +#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++; @@ -125,7 +164,7 @@ void wxColourDialog::ColourDataToDialog() 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 +#endif // wxUSE_LIBHILDON / wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 } void wxColourDialog::DialogToColourData() @@ -135,12 +174,36 @@ void wxColourDialog::DialogToColourData() 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); +#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); +#endif m_data.SetColour(clr); // Extract custom palette: @@ -153,7 +216,7 @@ void wxColourDialog::DialogToColourData() 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])); } @@ -161,7 +224,7 @@ void wxColourDialog::DialogToColourData() } g_free(pal); -#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON +#endif // wxUSE_LIBHILDON / wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2 } #endif // wxUSE_COLOURDLG