Preserve original menu label for later retrieval

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

diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp
index b264c991ca40c771829732df3237df87655210cc..20bacbb9e29e9658261ac3b1bf63122f060a5856 100644 (file)
--- a/src/gtk/colordlg.cpp
+++ b/src/gtk/colordlg.cpp
@@ -41,9 +41,10 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
     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));
 

-    if (parent)
+    m_parent = GetParentForModalDialog(parent);
+    if ( m_parent )

     {
     {

-        GtkWindow* gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) );
+        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),
                                      gtk_parent);
     }


@@ -117,7 +118,7 @@ void wxColourDialog::DialogToColourData()
 
     GdkColor clr;
     gtk_color_selection_get_current_color(sel, &clr);
 
     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:
 
 
     // Extract custom palette:
 


@@ -131,9 +132,7 @@ void wxColourDialog::DialogToColourData()
     {
         for (int i = 0; i < wxMin(n_colors, 16); i++)
         {
     {
         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(colors);
     }