X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbe0af5b15f8b8e95ed45abc2140fb3a1fac3c87..2b854a32613f34669af815e1416a6c623a4c2c5b:/src/gtk/textctrl.cpp diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 61c406c6fb..4f221beeff 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -34,25 +34,25 @@ extern bool g_blockEventsOnDrag; // "changed" //----------------------------------------------------------------------------- -static void +static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) { win->SetModified(); - + win->CalculateScrollbar(); wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId ); - wxString val( win->GetValue() ); - if (!val.IsNull()) event.m_commandString = WXSTRINGCAST val; + event.SetString( copystring(win->GetValue()) ); event.SetEventObject( win ); win->GetEventHandler()->ProcessEvent( event ); + delete[] event.GetString(); } //----------------------------------------------------------------------------- // "size_allocate" //----------------------------------------------------------------------------- -static void +static void gtk_text_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* WXUNUSED(alloc), wxTextCtrl *win ) { win->CalculateScrollbar(); @@ -112,7 +112,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, PreCreation( parent, id, pos, size, style, name ); SetValidator( validator ); - + m_vScrollbarVisible = TRUE; bool multi_line = (style & wxTE_MULTILINE) != 0; @@ -121,7 +121,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, // a multi-line edit control: create a vertical scrollbar by default and // horizontal if requested bool bHasHScrollbar = (style & wxHSCROLL) != 0; - + // create our control... m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); @@ -150,7 +150,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK), 0, 0); gtk_widget_show( m_vScrollbar ); - + gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", GTK_SIGNAL_FUNC(gtk_text_size_callback), (gpointer)this ); } @@ -182,11 +182,17 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, gtk_signal_connect( GTK_OBJECT(m_text), "changed", GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); - if (!value.IsNull()) + if (!value.IsEmpty()) { gint tmp = 0; gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp ); - SetInsertionPointEnd(); + + if (multi_line) + { + /* bring editable's cursor uptodate. bug in GTK. */ + + GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); + } } if (style & wxTE_PASSWORD) @@ -205,9 +211,9 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, if (multi_line) gtk_text_set_editable( GTK_TEXT(m_text), 1 ); } - + Show( TRUE ); - + SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); @@ -219,23 +225,23 @@ void wxTextCtrl::CalculateScrollbar() if ((m_windowStyle & wxTE_MULTILINE) == 0) return; GtkAdjustment *adj = GTK_TEXT(m_text)->vadj; - + if (adj->upper - adj->page_size < 0.8) { if (m_vScrollbarVisible) { - gtk_widget_hide( m_vScrollbar ); - - m_vScrollbarVisible = FALSE; + gtk_widget_hide( m_vScrollbar ); + + m_vScrollbarVisible = FALSE; } } else { if (!m_vScrollbarVisible) { - gtk_widget_show( m_vScrollbar ); - - m_vScrollbarVisible = TRUE; + gtk_widget_show( m_vScrollbar ); + + m_vScrollbarVisible = TRUE; } } } @@ -286,8 +292,33 @@ void wxTextCtrl::WriteText( const wxString &text ) if (m_windowStyle & wxTE_MULTILINE) { + /* this moves the cursor pos to behind the inserted text */ + + gint len = GTK_EDITABLE(m_text)->current_pos; + + gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len ); + + /* bring editable's cursor uptodate. bug in GTK. */ + + GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); + + } + else + { + gtk_entry_append_text( GTK_ENTRY(m_text), text ); + } +} + +void wxTextCtrl::AppendText( const wxString &text ) +{ + wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); + + if (m_windowStyle & wxTE_MULTILINE) + { + /* we'll insert at the last position */ gint len = gtk_text_get_length( GTK_TEXT(m_text) ); gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len ); + GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) ); } else { @@ -321,8 +352,8 @@ bool wxTextCtrl::LoadFile( const wxString &file ) return FALSE; } if (fread (text, sizeof (char), len, fp) != (size_t) len) - { - } + { + } fclose (fp); text[len] = 0; @@ -372,13 +403,13 @@ bool wxTextCtrl::SaveFile( const wxString &file ) } if (fwrite (text, sizeof (char), len, fp) != (size_t) len) - { - // Did not write whole file - } + { + // Did not write whole file + } // Make sure newline terminates the file if (text[len - 1] != '\n') - fputc ('\n', fp); + fputc ('\n', fp); fclose (fp); @@ -426,45 +457,61 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) ) { + /* If you implement this, don't forget to update the documentation! + * (file docs/latex/wx/text.tex) */ wxFAIL_MSG( "wxTextCtrl::OnDropFiles not implemented" ); } long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const { - if (!(m_windowStyle & wxTE_MULTILINE)) - return 0; - gint len = gtk_text_get_length( GTK_TEXT(m_text) ); - char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len ); - if(!text) - return 0; - if( pos >= len) - return pos=len-1; + if ( m_windowStyle & wxTE_MULTILINE ) + { + wxString text = GetValue(); + + // cast to prevent warning. But pos really should've been unsigned. + if( (unsigned long)pos > text.Len() ) + return FALSE; - *x=1; // Col 1 - *y=1; // Line 1 - for (int i = 0; i < pos; i++ ) + *x=0; // First Col + *y=0; // First Line + + const char* stop = text.c_str() + pos; + for ( const char *p = text.c_str(); p < stop; p++ ) + { + if (*p == '\n') + { + (*y)++; + *x=0; + } + else + (*x)++; + } + } + else // single line control { - if (text[i] == '\n') - { - (*y)++; - *x=1; - } - else - (*x)++; + if ( pos <= GTK_ENTRY(m_text)->text_length ) + { + *y = 0; + *x = pos; + } + else + { + // index out of bounds + return FALSE; + } } - g_free( text ); - return 1; + + return TRUE; } long wxTextCtrl::XYToPosition(long x, long y ) const { if (!(m_windowStyle & wxTE_MULTILINE)) return 0; - + long pos=0; + for( int i=0; icurrent_pos = gtk_text_get_point( GTK_TEXT(m_text) ); + } else - gtk_entry_set_position( GTK_ENTRY(m_text), tmp ); + { + gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos ); + } } void wxTextCtrl::SetInsertionPointEnd() { wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); - int pos = 0; if (m_windowStyle & wxTE_MULTILINE) - pos = gtk_text_get_length( GTK_TEXT(m_text) ); + SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text))); else - pos = GTK_ENTRY(m_text)->text_length; - - SetInsertionPoint((pos-1)>0 ? (pos-1):0); + gtk_entry_set_position( GTK_ENTRY(m_text), -1 ); } void wxTextCtrl::SetEditable( bool editable ) @@ -565,8 +633,8 @@ long wxTextCtrl::GetLastPosition() const pos = gtk_text_get_length( GTK_TEXT(m_text) ); else pos = GTK_ENTRY(m_text)->text_length; - - return (long)pos-1; + + return (long)pos; } void wxTextCtrl::Remove( long from, long to ) @@ -627,7 +695,7 @@ void wxTextCtrl::Clear() void wxTextCtrl::OnChar( wxKeyEvent &key_event ) { wxCHECK_RET( m_text != NULL, "invalid text ctrl" ); - + if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) { wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); @@ -670,7 +738,7 @@ int wxTextCtrl::underflow() wxTextCtrl& wxTextCtrl::operator<<(const wxString& s) { - WriteText(s); + AppendText(s); return *this; } @@ -678,7 +746,7 @@ wxTextCtrl& wxTextCtrl::operator<<(float f) { static char buf[100]; sprintf(buf, "%.2f", f); - WriteText(buf); + AppendText(buf); return *this; } @@ -686,7 +754,7 @@ wxTextCtrl& wxTextCtrl::operator<<(double d) { static char buf[100]; sprintf(buf, "%.2f", d); - WriteText(buf); + AppendText(buf); return *this; } @@ -694,7 +762,7 @@ wxTextCtrl& wxTextCtrl::operator<<(int i) { static char buf[100]; sprintf(buf, "%i", i); - WriteText(buf); + AppendText(buf); return *this; } @@ -702,7 +770,7 @@ wxTextCtrl& wxTextCtrl::operator<<(long i) { static char buf[100]; sprintf(buf, "%ld", i); - WriteText(buf); + AppendText(buf); return *this; } @@ -712,7 +780,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c) buf[0] = c; buf[1] = 0; - WriteText(buf); + AppendText(buf); return *this; } #endif @@ -751,13 +819,13 @@ void wxTextCtrl::SetBackgroundColour( const wxColour &colour ) wxControl::SetBackgroundColour( colour ); wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ); - if (sysbg.Red() == colour.Red() && - sysbg.Green() == colour.Green() && + if (sysbg.Red() == colour.Red() && + sysbg.Green() == colour.Green() && sysbg.Blue() == colour.Blue()) { return; - } - + } + if (!m_backgroundColour.Ok()) return; if (m_windowStyle & wxTE_MULTILINE) @@ -774,7 +842,7 @@ void wxTextCtrl::ApplyWidgetStyle() if (m_windowStyle & wxTE_MULTILINE) { // how ? - } + } else { SetWidgetStyle();