Fix broken and missing DataView interface items for Phoenix

[wxWidgets.git] / src / gtk1 / textctrl.cpp

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 1aa82a3fffef5b9bc785d0179988310d7c60f83b..7ce0d35e3d62abfd17c9d6ef6fc0b2c2e9350628 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -726,7 +726,7 @@ void wxTextCtrl::OnEnabled( bool WXUNUSED(enable) )
     // disabled and enabled mode, or we end up with a different colour under the
     // text.
     wxColour oldColour = GetBackgroundColour();
     // disabled and enabled mode, or we end up with a different colour under the
     // text.
     wxColour oldColour = GetBackgroundColour();

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

     {
         // Need to set twice or it'll optimize the useful stuff out
         if (oldColour == * wxWHITE)
     {
         // Need to set twice or it'll optimize the useful stuff out
         if (oldColour == * wxWHITE)


@@ -1110,7 +1110,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
     if (!m_widget->window)
         return false;
 
     if (!m_widget->window)
         return false;
 

-    if (!m_backgroundColour.Ok())
+    if (!m_backgroundColour.IsOk())

         return false;
 
     if (m_windowStyle & wxTE_MULTILINE)
         return false;
 
     if (m_windowStyle & wxTE_MULTILINE)


@@ -1242,9 +1242,9 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
 void wxTextCtrl::OnInternalIdle()
 {
     wxCursor cursor = m_cursor;
 void wxTextCtrl::OnInternalIdle()
 {
     wxCursor cursor = m_cursor;

-    if (g_globalCursor.Ok()) cursor = g_globalCursor;
+    if (g_globalCursor.IsOk()) cursor = g_globalCursor;

 
 

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

     {
         GdkWindow *window = NULL;
         if (HasFlag(wxTE_MULTILINE))
     {
         GdkWindow *window = NULL;
         if (HasFlag(wxTE_MULTILINE))


@@ -1255,7 +1255,7 @@ void wxTextCtrl::OnInternalIdle()
         if (window)
             gdk_window_set_cursor( window, cursor.GetCursor() );
 
         if (window)
             gdk_window_set_cursor( window, cursor.GetCursor() );
 

-        if (!g_globalCursor.Ok())
+        if (!g_globalCursor.IsOk())

             cursor = *wxSTANDARD_CURSOR;
 
         window = m_widget->window;
             cursor = *wxSTANDARD_CURSOR;
 
         window = m_widget->window;