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

added support for wxTE_LINEWRAP; use GTK_WRAP_WORD_CHAR for wxTE_WORDWRAP instead of GTK_WRAP_WORD (parts of patch 1156507)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-03-21 23:23:46 +00:00
parent 44353523d8
commit c211082373
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -41,6 +41,7 @@ wxGTK:
- Corrected default button size handling for different themes. - Corrected default button size handling for different themes.
- Corrected splitter sash size and look for different themes. - Corrected splitter sash size and look for different themes.
- Fixed keyboard input for dead-keys. - Fixed keyboard input for dead-keys.
- Added support for wxTE_LINEWRAP (Mart Raudsepp)
wxMac: wxMac:

14
src/gtk/textctrl.cpp
View File

@@ -570,11 +570,13 @@ bool wxTextCtrl::Create( wxWindow *parent,
// Insert view into scrolled window // Insert view into scrolled window
gtk_container_add( GTK_CONTAINER(m_widget), m_text ); gtk_container_add( GTK_CONTAINER(m_widget), m_text );
// Global settings which can be overridden by tags, I guess. // translate wx wrapping style to GTK+
if (HasFlag( wxHSCROLL ) || HasFlag( wxTE_DONTWRAP )) if ( HasFlag( wxTE_DONTWRAP ) )
gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_NONE ); gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_NONE );
else else if ( HasFlag( wxTE_LINEWRAP ) )
gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_WORD ); gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), 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 );
if (!HasFlag(wxNO_BORDER)) if (!HasFlag(wxNO_BORDER))
gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN ); gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );
@@ -582,7 +584,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK ); gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK );
GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
#else #else // GTK+ 1
// create our control ... // create our control ...
m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
@@ -605,7 +607,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
GTK_FILL, GTK_FILL,
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
0, 0); 0, 0);
#endif #endif // GTK+ 2/1
} }
else else
{ {

14
src/gtk1/textctrl.cpp
View File

@@ -570,11 +570,13 @@ bool wxTextCtrl::Create( wxWindow *parent,
// Insert view into scrolled window // Insert view into scrolled window
gtk_container_add( GTK_CONTAINER(m_widget), m_text ); gtk_container_add( GTK_CONTAINER(m_widget), m_text );
// Global settings which can be overridden by tags, I guess. // translate wx wrapping style to GTK+
if (HasFlag( wxHSCROLL ) || HasFlag( wxTE_DONTWRAP )) if ( HasFlag( wxTE_DONTWRAP ) )
gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_NONE ); gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_NONE );
else else if ( HasFlag( wxTE_LINEWRAP ) )
gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_WORD ); gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), 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 );
if (!HasFlag(wxNO_BORDER)) if (!HasFlag(wxNO_BORDER))
gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN ); gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );
@@ -582,7 +584,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK ); gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK );
GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
#else #else // GTK+ 1
// create our control ... // create our control ...
m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
@@ -605,7 +607,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
GTK_FILL, GTK_FILL,
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK), (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
0, 0); 0, 0);
#endif #endif // GTK+ 2/1
} }
else else
{ {