Initial implementation of wxWebProtocolHandler and wxWebFileProtocolHandler for the...

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

diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp
index ca9e536a65ef088f9eccf883a1aab6f41e24de9f..76dc32e93596fa37c17ceb9afb3d911c1a5188c0 100644 (file)
--- a/src/gtk/colordlg.cpp
+++ b/src/gtk/colordlg.cpp
@@ -105,7 +105,7 @@ 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
                                       : NULL;
 
 #if wxUSE_LIBHILDON


@@ -138,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++;


@@ -161,7 +161,7 @@ void wxColourDialog::DialogToColourData()
         m_data.SetColour(*clr);
 #elif wxUSE_LIBHILDON2 // !wxUSE_LIBHILDON
     const GdkColor * const
         m_data.SetColour(*clr);
 #elif wxUSE_LIBHILDON2 // !wxUSE_LIBHILDON
     const GdkColor * const

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

 
     GdkColor clr;
     if (col)
 
     GdkColor clr;
     if (col)