Applied patch to wxTextCtrl::IsEditable()
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:
@@ -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__
|
||||||
|
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));
|
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
|
||||||
|
@@ -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__
|
||||||
|
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));
|
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
|
||||||
|
Reference in New Issue
Block a user