use GTK_WRAP_WORD instead of GTK_WRAP_WORD_CHAR which is not defined in older GTK...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index d896b0403563d9e3d1f8bd387a3925edcc0fb1db..08fd4c335c105bcc530203578a639a7cca3083cc 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -598,12 +598,15 @@ bool wxTextCtrl::Create( wxWindow *parent,
         gtk_container_add( GTK_CONTAINER(m_widget), m_text );
 
         // translate wx wrapping style to GTK+
         gtk_container_add( GTK_CONTAINER(m_widget), m_text );
 
         // translate wx wrapping style to GTK+

+        GtkWrapMode wrap;

         if ( HasFlag( wxTE_DONTWRAP ) )
         if ( HasFlag( wxTE_DONTWRAP ) )

-            gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_NONE );
+            wrap = GTK_WRAP_NONE;

         else if ( HasFlag( wxTE_LINEWRAP ) )
         else if ( HasFlag( wxTE_LINEWRAP ) )

-            gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_CHAR );
+            wrap = GTK_WRAP_CHAR;

         else // HasFlag(wxTE_WORDWRAP) always true as wxTE_WORDWRAP == 0
         else // HasFlag(wxTE_WORDWRAP) always true as wxTE_WORDWRAP == 0

-            gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_WORD_CHAR );
+            wrap = GTK_WRAP_WORD;
+
+        gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );

 
         if (!HasFlag(wxNO_BORDER))
             gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );
 
         if (!HasFlag(wxNO_BORDER))
             gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index d896b0403563d9e3d1f8bd387a3925edcc0fb1db..08fd4c335c105bcc530203578a639a7cca3083cc 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -598,12 +598,15 @@ bool wxTextCtrl::Create( wxWindow *parent,
         gtk_container_add( GTK_CONTAINER(m_widget), m_text );
 
         // translate wx wrapping style to GTK+
         gtk_container_add( GTK_CONTAINER(m_widget), m_text );
 
         // translate wx wrapping style to GTK+

+        GtkWrapMode wrap;

         if ( HasFlag( wxTE_DONTWRAP ) )
         if ( HasFlag( wxTE_DONTWRAP ) )

-            gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_NONE );
+            wrap = GTK_WRAP_NONE;

         else if ( HasFlag( wxTE_LINEWRAP ) )
         else if ( HasFlag( wxTE_LINEWRAP ) )

-            gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_CHAR );
+            wrap = GTK_WRAP_CHAR;

         else // HasFlag(wxTE_WORDWRAP) always true as wxTE_WORDWRAP == 0
         else // HasFlag(wxTE_WORDWRAP) always true as wxTE_WORDWRAP == 0

-            gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_WORD_CHAR );
+            wrap = GTK_WRAP_WORD;
+
+        gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );

 
         if (!HasFlag(wxNO_BORDER))
             gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );
 
         if (!HasFlag(wxNO_BORDER))
             gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );