// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "colordlg.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
wxString title(_("Choose colour"));
m_widget = gtk_color_selection_dialog_new(wxGTK_CONV(title));
- if (parent)
+ m_parent = GetParentForModalDialog(parent);
+ if ( m_parent )
+ {
+ GtkWindow* gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(m_parent->m_widget) );
gtk_window_set_transient_for(GTK_WINDOW(m_widget),
- GTK_WINDOW(parent->m_widget));
+ gtk_parent);
+ }
GtkColorSelection *sel =
GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel);
}
}
- gchar *pal = gtk_color_selection_palette_to_string(colors, n_colors);
+ 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_free(pal);
+ g_object_set(settings, "gtk-color-palette", pal.c_str(), NULL);
}
void wxColourDialog::DialogToColourData()
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(wxColour(clr));
// Extract custom palette:
{
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);
}