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

Applied patch to wxTextCtrl::IsEditable()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2003-07-06 10:38:21 +00:00
parent 76bad0760c
commit 1d6e7c3803
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/textctrl.cpp
View File

@@ -1088,7 +1088,7 @@ void wxTextCtrl::Remove( long from, long to )
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
#ifdef __WXGTK20__ #ifdef __WXGTK20__
if ( m_windowStyle & wxTE_MULTILINE ) if (m_windowStyle & wxTE_MULTILINE)
{ {
GtkTextBuffer * GtkTextBuffer *
text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
@@ -1229,7 +1229,14 @@ bool wxTextCtrl::IsEditable() const
wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
#ifdef __WXGTK20__ #ifdef __WXGTK20__
return gtk_editable_get_editable(GTK_EDITABLE(m_text)); if (m_windowStyle & wxTE_MULTILINE)
{
return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text));
}
else
{
return gtk_editable_get_editable(GTK_EDITABLE(m_text));
}
#else #else
return GTK_EDITABLE(m_text)->editable; return GTK_EDITABLE(m_text)->editable;
#endif #endif

11
src/gtk1/textctrl.cpp
View File

@@ -1088,7 +1088,7 @@ void wxTextCtrl::Remove( long from, long to )
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") ); wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
#ifdef __WXGTK20__ #ifdef __WXGTK20__
if ( m_windowStyle & wxTE_MULTILINE ) if (m_windowStyle & wxTE_MULTILINE)
{ {
GtkTextBuffer * GtkTextBuffer *
text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) ); text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
@@ -1229,7 +1229,14 @@ bool wxTextCtrl::IsEditable() const
wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") ); wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
#ifdef __WXGTK20__ #ifdef __WXGTK20__
return gtk_editable_get_editable(GTK_EDITABLE(m_text)); if (m_windowStyle & wxTE_MULTILINE)
{
return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text));
}
else
{
return gtk_editable_get_editable(GTK_EDITABLE(m_text));
}
#else #else
return GTK_EDITABLE(m_text)->editable; return GTK_EDITABLE(m_text)->editable;
#endif #endif