CheckValidator should not return false if no variable is associated for data storage...

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index c3a28902cb90a3c6872c8b4491fb96cd1c939670..74425264affe64cd87ce20917f0756d6c2a15f86 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -634,7 +634,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
     if (style & wxTE_READONLY)
     {
         if (!multi_line)
     if (style & wxTE_READONLY)
     {
         if (!multi_line)

-            gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
+            gtk_editable_set_editable( GTK_EDITABLE(m_text), FALSE );

         else
             gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
     }
         else
             gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
     }


@@ -830,7 +830,7 @@ void wxTextCtrl::WriteText( const wxString &text )
         gtk_editable_delete_selection( GTK_EDITABLE(m_text) );
 
         // This moves the cursor pos to behind the inserted text.
         gtk_editable_delete_selection( GTK_EDITABLE(m_text) );
 
         // This moves the cursor pos to behind the inserted text.

-        gint len = GET_EDITABLE_POS(m_text);
+        gint len = gtk_editable_get_position(GTK_EDITABLE(m_text));

 
 #if wxUSE_UNICODE
         wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
 
 #if wxUSE_UNICODE
         wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );


@@ -846,7 +846,7 @@ void wxTextCtrl::WriteText( const wxString &text )
         gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
 
         // Bring entry's cursor uptodate.
         gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
 
         // Bring entry's cursor uptodate.

-        gtk_entry_set_position( GTK_ENTRY(m_text), len );
+        gtk_editable_set_position( GTK_EDITABLE(m_text), len );

     }
 
     m_modified = oldModified;
     }
 
     m_modified = oldModified;


@@ -974,10 +974,8 @@ void wxTextCtrl::SetInsertionPoint( long pos )
     }
     else
     {
     }
     else
     {

-        gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
-
-        // Bring editable's cursor uptodate. Bug in GTK.
-        SET_EDITABLE_POS(m_text, (guint32)pos);
+        // FIXME: Is the editable's cursor really uptodate without double set_position in GTK2?
+        gtk_editable_set_position(GTK_EDITABLE(m_text), int(pos));

     }
 }
 
     }
 }
 


@@ -993,7 +991,7 @@ void wxTextCtrl::SetInsertionPointEnd()
     }
     else
     {
     }
     else
     {

-        gtk_entry_set_position( GTK_ENTRY(m_text), -1 );
+        gtk_editable_set_position( GTK_EDITABLE(m_text), -1 );

     }
 }
 
     }
 }
 


@@ -1007,7 +1005,7 @@ void wxTextCtrl::SetEditable( bool editable )
     }
     else
     {
     }
     else
     {

-        gtk_entry_set_editable( GTK_ENTRY(m_text), editable );
+        gtk_editable_set_editable( GTK_EDITABLE(m_text), editable );

     }
 }
 
     }
 }
 


@@ -1191,7 +1189,7 @@ long wxTextCtrl::GetInsertionPoint() const
     }
     else
     {
     }
     else
     {

-        return (long) GET_EDITABLE_POS(m_text);
+        return (long) gtk_editable_get_position(GTK_EDITABLE(m_text));

     }
 }
 
     }
 }
 


@@ -1252,7 +1250,7 @@ void wxTextCtrl::Cut()
     if (m_windowStyle & wxTE_MULTILINE)
         g_signal_emit_by_name (m_text, "cut-clipboard");
     else
     if (m_windowStyle & wxTE_MULTILINE)
         g_signal_emit_by_name (m_text, "cut-clipboard");
     else

-        gtk_editable_cut_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
+        gtk_editable_cut_clipboard(GTK_EDITABLE(m_text));

 }
 
 void wxTextCtrl::Copy()
 }
 
 void wxTextCtrl::Copy()


@@ -1262,7 +1260,7 @@ void wxTextCtrl::Copy()
     if (m_windowStyle & wxTE_MULTILINE)
         g_signal_emit_by_name (m_text, "copy-clipboard");
     else
     if (m_windowStyle & wxTE_MULTILINE)
         g_signal_emit_by_name (m_text, "copy-clipboard");
     else

-        gtk_editable_copy_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
+        gtk_editable_copy_clipboard(GTK_EDITABLE(m_text));

 }
 
 void wxTextCtrl::Paste()
 }
 
 void wxTextCtrl::Paste()


@@ -1272,7 +1270,7 @@ void wxTextCtrl::Paste()
     if (m_windowStyle & wxTE_MULTILINE)
         g_signal_emit_by_name (m_text, "paste-clipboard");
     else
     if (m_windowStyle & wxTE_MULTILINE)
         g_signal_emit_by_name (m_text, "paste-clipboard");
     else

-        gtk_editable_paste_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
+        gtk_editable_paste_clipboard(GTK_EDITABLE(m_text));

 }
 
 // Undo/redo
 }
 
 // Undo/redo