Fix type mismatch in wxLogTrace() call in wxSocket.

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

diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp
index 07623444a34f1fef6e45c1dd5c03516f4be83ebf..76dc32e93596fa37c17ceb9afb3d911c1a5188c0 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:


@@ -30,6 +30,12 @@
     #include <hildon-widgets/hildon-color-selector.h>
 #endif // 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)
 
 wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 
 wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)


@@ -42,25 +48,32 @@ 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);

-#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
 
     wxString title(_("Choose colour"));
     m_widget = gtk_color_selection_dialog_new(wxGTK_CONV(title));
 #endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
 

+    g_object_ref(m_widget);
+

     if ( parentGTK )
     {
         gtk_window_set_transient_for(GTK_WINDOW(m_widget), parentGTK);
     }
 
     if ( parentGTK )
     {
         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);
     gtk_color_selection_set_has_palette(sel, true);

+#endif // !wxUSE_LIBHILDON && !wxUSE_LIBHILDON2

 
     return true;
 }
 
     return true;
 }


@@ -75,7 +88,7 @@ int wxColourDialog::ShowModal()
     switch (result)
     {
         default:
     switch (result)
     {
         default:

-            wxFAIL_MSG(_T("unexpected GtkColorSelectionDialog return code"));
+            wxFAIL_MSG(wxT("unexpected GtkColorSelectionDialog return code"));

             // fall through
 
         case GTK_RESPONSE_CANCEL:
             // fall through
 
         case GTK_RESPONSE_CANCEL:


@@ -92,15 +105,28 @@ int wxColourDialog::ShowModal()
 void wxColourDialog::ColourDataToDialog()
 {
     const GdkColor * const
 void wxColourDialog::ColourDataToDialog()
 {
     const GdkColor * const

-        col = m_data.GetColour().Ok() ? m_data.GetColour().GetColor()
+        col = m_data.GetColour().IsOk() ? m_data.GetColour().GetColor()

                                       : NULL;
 
 #if wxUSE_LIBHILDON
     HildonColorSelector * const sel = HILDON_COLOR_SELECTOR(m_widget);
                                       : NULL;
 
 #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<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 ( col )
         gtk_color_selection_set_current_color(sel, col);
 
     if ( col )
         gtk_color_selection_set_current_color(sel, col);


@@ -112,7 +138,7 @@ void wxColourDialog::ColourDataToDialog()
     for (unsigned i = 0; i < 16; i++)
     {
         wxColour c = m_data.GetCustomColour(i);
     for (unsigned i = 0; i < 16; i++)
     {
         wxColour c = m_data.GetCustomColour(i);

-        if (c.Ok())
+        if (c.IsOk())

         {
             colors[n_colors] = *c.GetColor();
             n_colors++;
         {
             colors[n_colors] = *c.GetColor();
             n_colors++;


@@ -123,7 +149,7 @@ void wxColourDialog::ColourDataToDialog()
 
     GtkSettings *settings = gtk_widget_get_settings(GTK_WIDGET(sel));
     g_object_set(settings, "gtk-color-palette", pal.c_str(), NULL);
 
     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()
 }
 
 void wxColourDialog::DialogToColourData()


@@ -133,9 +159,28 @@ void wxColourDialog::DialogToColourData()
     const GdkColor * const clr = hildon_color_selector_get_color(sel);
     if ( clr )
         m_data.SetColour(*clr);
     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)));

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


@@ -159,7 +204,7 @@ void wxColourDialog::DialogToColourData()
     }
 
     g_free(pal);
     }
 
     g_free(pal);

-#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON
+#endif // wxUSE_LIBHILDON / wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2

 }
 
 #endif // wxUSE_COLOURDLG
 }
 
 #endif // wxUSE_COLOURDLG