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

corrected previous commit's wrongly applied patch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-05-25 12:55:56 +00:00
parent 2a21ac1590
commit 98a8daf4cf
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gtk/textctrl.cpp
View File

@@ -414,6 +414,16 @@ bool wxTextCtrl::Create( wxWindow *parent,
gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE ); gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
#ifdef __WXGTK20__ #ifdef __WXGTK20__
else else
gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
#else
}
else
{
if (multi_line)
gtk_text_set_editable( GTK_TEXT(m_text), 1 );
#endif
}
#ifdef __WXGTK20__ #ifdef __WXGTK20__
if (multi_line) if (multi_line)
{ {
@@ -434,16 +444,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
} }
#endif // gtk+-2.3.5 #endif // gtk+-2.3.5
#endif // __WXGTK20__ #endif // __WXGTK20__
gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
#else
}
else
{
if (multi_line)
gtk_text_set_editable( GTK_TEXT(m_text), 1 );
#endif
}
// We want to be notified about text changes. // We want to be notified about text changes.
#ifdef __WXGTK20__ #ifdef __WXGTK20__

20
src/gtk1/textctrl.cpp
View File

@@ -414,6 +414,16 @@ bool wxTextCtrl::Create( wxWindow *parent,
gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE ); gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
#ifdef __WXGTK20__ #ifdef __WXGTK20__
else else
gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
#else
}
else
{
if (multi_line)
gtk_text_set_editable( GTK_TEXT(m_text), 1 );
#endif
}
#ifdef __WXGTK20__ #ifdef __WXGTK20__
if (multi_line) if (multi_line)
{ {
@@ -434,16 +444,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
} }
#endif // gtk+-2.3.5 #endif // gtk+-2.3.5
#endif // __WXGTK20__ #endif // __WXGTK20__
gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
#else
}
else
{
if (multi_line)
gtk_text_set_editable( GTK_TEXT(m_text), 1 );
#endif
}
// We want to be notified about text changes. // We want to be notified about text changes.
#ifdef __WXGTK20__ #ifdef __WXGTK20__