From 9ddb394878d390c3eb065f393d9a5664010d9ada Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 23 Mar 2005 20:04:31 +0000 Subject: [PATCH] use GTK_WRAP_WORD instead of GTK_WRAP_WORD_CHAR which is not defined in older GTK versions git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/textctrl.cpp | 9 ++++++--- src/gtk1/textctrl.cpp | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index d896b04035..08fd4c335c 100644 --- 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+ + GtkWrapMode wrap; 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 ) ) - 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 - 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 ); diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index d896b04035..08fd4c335c 100644 --- 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+ + GtkWrapMode wrap; 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 ) ) - 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 - 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 ); -- 2.45.2