Fix a number of mingw compile errors.

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

diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp
index 893311f989be2ef1b0f129de66da1e585c767640..ca9e536a65ef088f9eccf883a1aab6f41e24de9f 100644 (file)
--- a/src/gtk/colordlg.cpp
+++ b/src/gtk/colordlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/colordlg.cpp
+// Name:        src/gtk/colordlg.cpp

 // Purpose:     Native wxColourDialog for GTK+
 // Author:      Vaclav Slavik
 // Modified by:
 // Purpose:     Native wxColourDialog for GTK+
 // Author:      Vaclav Slavik
 // Modified by:


@@ -48,13 +48,13 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
     if (data)
         m_data = *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);
     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 
+#elif wxUSE_LIBHILDON2 // !wxUSE_LIBHILDON

     m_widget = hildon_color_chooser_dialog_new();
 #else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
     wxString title(_("Choose colour"));
     m_widget = hildon_color_chooser_dialog_new();
 #else // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
     wxString title(_("Choose colour"));


@@ -69,8 +69,9 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
     }
 
 #if !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
     }
 
 #if !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2

-    GtkColorSelection *sel =
-        GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel);
+    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
 
     gtk_color_selection_set_has_palette(sel, true);
 #endif // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
 


@@ -123,8 +124,9 @@ void wxColourDialog::ColourDataToDialog()
 
     hildon_color_chooser_dialog_set_color((HildonColorChooserDialog *)m_widget, &clr);
 #else // !wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
 
     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(m_widget)->colorsel);
+    GtkColorSelection* sel = GTK_COLOR_SELECTION(
+        gtk_color_selection_dialog_get_color_selection(
+        GTK_COLOR_SELECTION_DIALOG(m_widget)));

 
     if ( col )
         gtk_color_selection_set_current_color(sel, col);
 
     if ( col )
         gtk_color_selection_set_current_color(sel, col);


@@ -176,8 +178,9 @@ void wxColourDialog::DialogToColourData()
     m_data.SetColour(new_color);
 #else // !wxUSE_LIBHILDON2
 
     m_data.SetColour(new_color);
 #else // !wxUSE_LIBHILDON2
 

-    GtkColorSelection *sel =
-        GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel);
+    GtkColorSelection* sel = GTK_COLOR_SELECTION(
+        gtk_color_selection_dialog_get_color_selection(
+        GTK_COLOR_SELECTION_DIALOG(m_widget)));

 
     GdkColor clr;
     gtk_color_selection_get_current_color(sel, &clr);
 
     GdkColor clr;
     gtk_color_selection_get_current_color(sel, &clr);