Since wxREADONLY has disappeared, I had to change to wxTE_READONLY
in order to compile. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -60,7 +60,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
|
|||||||
PreCreation( parent, id, pos, size, style, name );
|
PreCreation( parent, id, pos, size, style, name );
|
||||||
|
|
||||||
bool bMultiLine = (style & wxTE_MULTILINE) != 0;
|
bool bMultiLine = (style & wxTE_MULTILINE) != 0;
|
||||||
if ( bMultiLine )
|
if ( bMultiLine )
|
||||||
{
|
{
|
||||||
// a multi-line edit control: create a vertical scrollbar by default and
|
// a multi-line edit control: create a vertical scrollbar by default and
|
||||||
// horizontal if requested
|
// horizontal if requested
|
||||||
@@ -123,7 +123,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
|
|||||||
gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
|
gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
|
||||||
};
|
};
|
||||||
|
|
||||||
if (style & wxREADONLY)
|
if (style & wxTE_READONLY)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -394,4 +394,4 @@ GtkWidget* wxTextCtrl::GetConnectWidget(void)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@@ -60,7 +60,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
|
|||||||
PreCreation( parent, id, pos, size, style, name );
|
PreCreation( parent, id, pos, size, style, name );
|
||||||
|
|
||||||
bool bMultiLine = (style & wxTE_MULTILINE) != 0;
|
bool bMultiLine = (style & wxTE_MULTILINE) != 0;
|
||||||
if ( bMultiLine )
|
if ( bMultiLine )
|
||||||
{
|
{
|
||||||
// a multi-line edit control: create a vertical scrollbar by default and
|
// a multi-line edit control: create a vertical scrollbar by default and
|
||||||
// horizontal if requested
|
// horizontal if requested
|
||||||
@@ -123,7 +123,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
|
|||||||
gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
|
gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
|
||||||
};
|
};
|
||||||
|
|
||||||
if (style & wxREADONLY)
|
if (style & wxTE_READONLY)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -394,4 +394,4 @@ GtkWidget* wxTextCtrl::GetConnectWidget(void)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user