Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use GTK_WRAP_WORD_CHAR for wxTE_BESTWRAP if available

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-03-28 00:36:04 +00:00
parent c12b7f79a7
commit c4590236d7
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk/textctrl.cpp
View File

@@ -601,10 +601,19 @@ bool wxTextCtrl::Create( wxWindow *parent,
GtkWrapMode wrap; GtkWrapMode wrap;
if ( HasFlag( wxTE_DONTWRAP ) ) if ( HasFlag( wxTE_DONTWRAP ) )
wrap = GTK_WRAP_NONE; 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__
wrap = GTK_WRAP_WORD_CHAR;
#else
wrap = GTK_WRAP_WORD;
#endif
}
gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap ); gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );

13
src/gtk1/textctrl.cpp
View File

@@ -601,10 +601,19 @@ bool wxTextCtrl::Create( wxWindow *parent,
GtkWrapMode wrap; GtkWrapMode wrap;
if ( HasFlag( wxTE_DONTWRAP ) ) if ( HasFlag( wxTE_DONTWRAP ) )
wrap = GTK_WRAP_NONE; 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__
wrap = GTK_WRAP_WORD_CHAR;
#else
wrap = GTK_WRAP_WORD;
#endif
}
gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap ); gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );