X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/112892b9180e35d20ca68d2383feb04a0aaa4af3..0f217db31814dde7432ceb2e00ddf42b968b9fa3:/src/gtk1/textctrl.cpp diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index f43f88964d..f5fb50f0fb 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -22,8 +22,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl) void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) -{ - win->m_modified = TRUE; +{ + win->SetModified(); }; @@ -33,48 +33,54 @@ END_EVENT_TABLE() wxTextCtrl::wxTextCtrl(void) : streambuf() { + if( allocate() ) + setp(base(),ebuf()); + m_modified = FALSE; }; -wxTextCtrl::wxTextCtrl( wxWindow *parent, const wxWindowID id, const wxString &value, - const wxPoint &pos, const wxSize &size, - const int style, const wxString &name ) : streambuf() +wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value, + const wxPoint &pos, const wxSize &size, + int style, const wxString &name ) : streambuf() { + if( allocate() ) + setp(base(),ebuf()); + m_modified = FALSE; Create( parent, id, value, pos, size, style, name ); }; -bool wxTextCtrl::Create( wxWindow *parent, const wxWindowID id, const wxString &value, - const wxPoint &pos, const wxSize &size, - const int style, const wxString &name ) +bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, + const wxPoint &pos, const wxSize &size, + int style, const wxString &name ) { m_needParent = TRUE; - + PreCreation( parent, id, pos, size, style, name ); - + if (style & wxTE_MULTILINE) m_widget = gtk_text_new( NULL, NULL ); else m_widget = gtk_entry_new(); - + wxSize newSize = size; if (newSize.x == -1) newSize.x = 80; if (newSize.y == -1) newSize.y = 26; SetSize( newSize.x, newSize.y ); - + PostCreation(); - + + // we want to be notified about text changes + gtk_signal_connect(GTK_OBJECT(m_widget), "changed", + GTK_SIGNAL_FUNC(gtk_text_changed_callback), + (gpointer)this); + if (!value.IsNull()) { gint tmp = 0; - - // Don't know why this is so - if (style & wxTE_MULTILINE) - gtk_editable_insert_text( GTK_EDITABLE(m_widget), value, value.Length()+1, &tmp ); - else - gtk_editable_insert_text( GTK_EDITABLE(m_widget), value, value.Length(), &tmp ); + gtk_editable_insert_text( GTK_EDITABLE(m_widget), value, value.Length(), &tmp ); }; - + if (style & wxREADONLY) { } @@ -82,9 +88,9 @@ bool wxTextCtrl::Create( wxWindow *parent, const wxWindowID id, const wxString & { if (style & wxTE_MULTILINE) gtk_text_set_editable( GTK_TEXT(m_widget), 1 ); }; - + Show( TRUE ); - + return TRUE; }; @@ -94,7 +100,7 @@ wxString wxTextCtrl::GetValue(void) const if (m_windowStyle & wxTE_MULTILINE) { gint len = gtk_text_get_length( GTK_TEXT(m_widget) ); - tmp = gtk_editable_get_chars( GTK_EDITABLE(m_widget), 0, len-1 ); + tmp = gtk_editable_get_chars( GTK_EDITABLE(m_widget), 0, len ); } else { @@ -110,7 +116,7 @@ void wxTextCtrl::SetValue( const wxString &value ) if (m_windowStyle & wxTE_MULTILINE) { gint len = gtk_text_get_length( GTK_TEXT(m_widget) ); - gtk_editable_delete_text( GTK_EDITABLE(m_widget), 0, len-1 ); + gtk_editable_delete_text( GTK_EDITABLE(m_widget), 0, len ); len = 0; gtk_editable_insert_text( GTK_EDITABLE(m_widget), tmp, tmp.Length(), &len ); } @@ -123,10 +129,10 @@ void wxTextCtrl::SetValue( const wxString &value ) void wxTextCtrl::WriteText( const wxString &text ) { if (text.IsNull()) return; - + if (m_windowStyle & wxTE_MULTILINE) { - gint len = gtk_text_get_length( GTK_TEXT(m_widget) ) - 1; + gint len = gtk_text_get_length( GTK_TEXT(m_widget) ); gtk_editable_insert_text( GTK_EDITABLE(m_widget), text, text.Length(), &len ); } else @@ -137,25 +143,20 @@ void wxTextCtrl::WriteText( const wxString &text ) bool wxTextCtrl::LoadFile( const wxString &WXUNUSED(file) ) { - return FALSE; -}; + wxFAIL_MSG("wxTextCtrl::LoadFile not implemented"); -bool wxTextCtrl::SaveFile( const wxString &WXUNUSED(file) ) -{ return FALSE; }; -bool wxTextCtrl::IsModified(void) +bool wxTextCtrl::SaveFile( const wxString &WXUNUSED(file) ) { - return m_modified; -}; + wxFAIL_MSG("wxTextCtrl::SaveFile not implemented"); -void wxTextCtrl::DiscardEdits(void) -{ + return FALSE; }; /* -wxString wxTextCtrl::GetLineText( const long lineNo ) const +wxString wxTextCtrl::GetLineText( long lineNo ) const { }; @@ -164,11 +165,11 @@ void wxTextCtrl::OnDropFiles( wxDropFilesEvent &event ) { }; -long wxTextCtrl::PositionToXY( const long pos, long *x, long *y ) const +long wxTextCtrl::PositionToXY( long pos, long *x, long *y ) const { }; -long wxTextCtrl::XYToPosition( const long x, const long y ) +long wxTextCtrl::XYToPosition( long x, long y ) { }; @@ -177,7 +178,7 @@ int wxTextCtrl::GetNumberOfLines(void) }; */ -void wxTextCtrl::SetInsertionPoint( const long pos ) +void wxTextCtrl::SetInsertionPoint( long pos ) { int tmp = (int) pos; if (m_windowStyle & wxTE_MULTILINE) @@ -196,7 +197,7 @@ void wxTextCtrl::SetInsertionPointEnd(void) SetInsertionPoint( pos-1 ); }; -void wxTextCtrl::SetEditable( const bool editable ) +void wxTextCtrl::SetEditable( bool editable ) { if (m_windowStyle & wxTE_MULTILINE) gtk_text_set_editable( GTK_TEXT(m_widget), editable ); @@ -204,13 +205,14 @@ void wxTextCtrl::SetEditable( const bool editable ) gtk_entry_set_editable( GTK_ENTRY(m_widget), editable ); }; -void wxTextCtrl::SetSelection( const long from, const long to ) +void wxTextCtrl::SetSelection( long from, long to ) { gtk_editable_select_region( GTK_EDITABLE(m_widget), (gint)from, (gint)to ); }; -void wxTextCtrl::ShowPosition( const long WXUNUSED(pos) ) +void wxTextCtrl::ShowPosition( long WXUNUSED(pos) ) { + wxFAIL_MSG("wxTextCtrl::ShowPosition not implemented"); }; long wxTextCtrl::GetInsertionPoint(void) const @@ -228,12 +230,12 @@ long wxTextCtrl::GetLastPosition(void) const return (long)pos-1; }; -void wxTextCtrl::Remove( const long from, const long to ) +void wxTextCtrl::Remove( long from, long to ) { gtk_editable_delete_text( GTK_EDITABLE(m_widget), (gint)from, (gint)to ); }; -void wxTextCtrl::Replace( const long from, const long to, const wxString &value ) +void wxTextCtrl::Replace( long from, long to, const wxString &value ) { gtk_editable_delete_text( GTK_EDITABLE(m_widget), (gint)from, (gint)to ); if (value.IsNull()) return; @@ -267,65 +269,6 @@ void wxTextCtrl::OnChar( wxKeyEvent &WXUNUSED(event) ) int wxTextCtrl::overflow(int c) { - // Make sure there is a holding area - if ( allocate()==EOF ) - { - wxError("Streambuf allocation failed","Internal error"); - return EOF; - } - - // Verify that there are no characters in get area - if ( gptr() && gptr() < egptr() ) - { - wxError("Who's trespassing my get area?","Internal error"); - return EOF; - } - - // Reset get area - setg(0,0,0); - - // Make sure there is a put area - if ( ! pptr() ) - { -/* This doesn't seem to be fatal so comment out error message */ -// wxError("Put area not opened","Internal error"); - setp( base(), base() ); - } - - // Determine how many characters have been inserted but no consumed - int plen = pptr() - pbase(); - - // Now Jerry relies on the fact that the buffer is at least 2 chars - // long, but the holding area "may be as small as 1" ??? - // And we need an additional \0, so let's keep this inefficient but - // safe copy. - - // If c!=EOF, it is a character that must also be comsumed - int xtra = c==EOF? 0 : 1; - - // Write temporary C-string to wxTextWindow - { - char *txt = new char[plen+xtra+1]; - memcpy(txt, pbase(), plen); - txt[plen] = (char)c; // append c - txt[plen+xtra] = '\0'; // append '\0' or overwrite c - // If the put area already contained \0, output will be truncated there - WriteText(txt); - delete[] txt; - } - - // Reset put area - setp(pbase(), epptr()); - -#if defined(__WATCOMC__) - return __NOT_EOF; -#elif defined(zapeof) // HP-UX (all cfront based?) - return zapeof(c); -#else - return c!=EOF ? c : 0; // this should make everybody happy -#endif - -/* OLD CODE int len = pptr() - pbase(); char *txt = new char[len+1]; strncpy(txt, pbase(), len); @@ -334,22 +277,10 @@ int wxTextCtrl::overflow(int c) setp(pbase(), epptr()); delete[] txt; return EOF; -*/ }; int wxTextCtrl::sync(void) { - // Verify that there are no characters in get area - if ( gptr() && gptr() < egptr() ) - { - wxError("Who's trespassing my get area?","Internal error"); - return EOF; - } - - if ( pptr() && pptr() > pbase() ) return overflow(EOF); - - return 0; -/* OLD CODE int len = pptr() - pbase(); char *txt = new char[len+1]; strncpy(txt, pbase(), len); @@ -358,7 +289,6 @@ int wxTextCtrl::sync(void) setp(pbase(), epptr()); delete[] txt; return 0; -*/ }; int wxTextCtrl::underflow(void) @@ -372,7 +302,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const wxString& s) return *this; } -wxTextCtrl& wxTextCtrl::operator<<(const float f) +wxTextCtrl& wxTextCtrl::operator<<(float f) { static char buf[100]; sprintf(buf, "%.2f", f); @@ -380,7 +310,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const float f) return *this; } -wxTextCtrl& wxTextCtrl::operator<<(const double d) +wxTextCtrl& wxTextCtrl::operator<<(double d) { static char buf[100]; sprintf(buf, "%.2f", d); @@ -388,7 +318,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const double d) return *this; } -wxTextCtrl& wxTextCtrl::operator<<(const int i) +wxTextCtrl& wxTextCtrl::operator<<(int i) { static char buf[100]; sprintf(buf, "%i", i); @@ -396,7 +326,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const int i) return *this; } -wxTextCtrl& wxTextCtrl::operator<<(const long i) +wxTextCtrl& wxTextCtrl::operator<<(long i) { static char buf[100]; sprintf(buf, "%ld", i);