X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/13289f04aee52cae316f984163f4f38d32d2eaf4..d1427b705318677afe28b1291867f6930c8823a7:/src/gtk1/textctrl.cpp diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 59c3d33980..d1a19473eb 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -14,6 +14,7 @@ #include "wx/textctrl.h" #include "wx/utils.h" +#include //----------------------------------------------------------------------------- // wxTextCtrl @@ -59,7 +60,8 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, PreCreation( parent, id, pos, size, style, name ); bool bMultiLine = (style & wxTE_MULTILINE) != 0; - if ( bMultiLine ) { + if ( bMultiLine ) + { // a multi-line edit control: create a vertical scrollbar by default and // horizontal if requested bool bHasHScrollbar = (style & wxHSCROLL) != 0; @@ -121,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 ); }; - if (style & wxREADONLY) + if (style & wxTE_READONLY) { } else @@ -184,14 +186,14 @@ void wxTextCtrl::WriteText( const wxString &text ) bool wxTextCtrl::LoadFile( const wxString &WXUNUSED(file) ) { - wxFAIL_MSG("wxTextCtrl::LoadFile not implemented"); + wxFAIL_MSG(_("wxTextCtrl::LoadFile not implemented")); return FALSE; }; bool wxTextCtrl::SaveFile( const wxString &WXUNUSED(file) ) { - wxFAIL_MSG("wxTextCtrl::SaveFile not implemented"); + wxFAIL_MSG(_("wxTextCtrl::SaveFile not implemented")); return FALSE; }; @@ -253,7 +255,7 @@ void wxTextCtrl::SetSelection( long from, long to ) void wxTextCtrl::ShowPosition( long WXUNUSED(pos) ) { - wxFAIL_MSG("wxTextCtrl::ShowPosition not implemented"); + wxFAIL_MSG(_("wxTextCtrl::ShowPosition not implemented")); }; long wxTextCtrl::GetInsertionPoint(void) const @@ -308,7 +310,7 @@ void wxTextCtrl::OnChar( wxKeyEvent &WXUNUSED(event) ) { }; -int wxTextCtrl::overflow(int c) +int wxTextCtrl::overflow( int WXUNUSED(c) ) { int len = pptr() - pbase(); char *txt = new char[len+1]; @@ -385,3 +387,11 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c) return *this; } +GtkWidget* wxTextCtrl::GetConnectWidget(void) +{ + return GTK_WIDGET(m_text); +}; + + + +