applying OSAF patch for "toolbar selection not correct on Mac after calling Realize...

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 08fd4c335c105bcc530203578a639a7cca3083cc..5ec85604f15d1f50a51eac443c850fa5eb3f25cc 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -601,10 +601,22 @@ bool wxTextCtrl::Create( wxWindow *parent,
         GtkWrapMode wrap;
         if ( HasFlag( wxTE_DONTWRAP ) )
             wrap = GTK_WRAP_NONE;
         GtkWrapMode wrap;
         if ( HasFlag( wxTE_DONTWRAP ) )
             wrap = GTK_WRAP_NONE;

-        else if ( HasFlag( wxTE_LINEWRAP ) )
+        else if ( HasFlag( wxTE_CHARWRAP ) )

             wrap = GTK_WRAP_CHAR;
             wrap = GTK_WRAP_CHAR;

-        else // HasFlag(wxTE_WORDWRAP) always true as wxTE_WORDWRAP == 0
+        else if ( HasFlag( wxTE_WORDWRAP ) )

             wrap = GTK_WRAP_WORD;
             wrap = GTK_WRAP_WORD;

+        else // HasFlag(wxTE_BESTWRAP) always true as wxTE_BESTWRAP == 0
+        {
+            // GTK_WRAP_WORD_CHAR seems to be new in GTK+ 2.4
+#ifdef __WXGTK24__
+            if ( !gtk_check_version(2,4,0) )
+            {
+                wrap = GTK_WRAP_WORD_CHAR;
+            }
+            else
+#endif
+            wrap = GTK_WRAP_WORD;
+        }

 
         gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );
 
 
         gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );