X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3e65dac0c4e7ad19e3c270caa1e0eea138e5d8d..520e470fdd0daef09c77938db642e4583933c90d:/src/gtk1/textctrl.cpp diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index afd11f78a7..77ecdef60d 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -14,58 +14,69 @@ #include "wx/textctrl.h" #include "wx/utils.h" +#include //----------------------------------------------------------------------------- -// wxTextCtrl +// "changed" //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl) - -void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) +static void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win ) { win->SetModified(); -}; + + wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId ); + wxString val( win->GetValue() ); + if (!val.IsNull()) event.m_commandString = WXSTRINGCAST val; + event.SetEventObject( win ); + win->GetEventHandler()->ProcessEvent( event ); +} +//----------------------------------------------------------------------------- +// wxTextCtrl +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl) BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) -// EVT_CHAR(wxTextCtrl::OnChar) + EVT_CHAR(wxTextCtrl::OnChar) END_EVENT_TABLE() -wxTextCtrl::wxTextCtrl(void) : streambuf() +wxTextCtrl::wxTextCtrl() : streambuf() { - if( allocate() ) - setp(base(),ebuf()); + if (allocate()) setp(base(),ebuf()); m_modified = FALSE; -}; +} wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value, const wxPoint &pos, const wxSize &size, - int style, const wxString &name ) : streambuf() + int style, const wxValidator& validator, const wxString &name ) : streambuf() { - if( allocate() ) - setp(base(),ebuf()); + if (allocate()) setp(base(),ebuf()); m_modified = FALSE; - Create( parent, id, value, pos, size, style, name ); -}; + Create( parent, id, value, pos, size, style, validator, name ); +} bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, const wxPoint &pos, const wxSize &size, - int style, const wxString &name ) + int style, const wxValidator& validator, const wxString &name ) { m_needParent = TRUE; PreCreation( parent, id, pos, size, style, name ); + SetValidator( validator ); + 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; // create our control... - m_text = gtk_text_new( NULL, NULL ); + m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); // ... and put into the upper left hand corner of the table m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE); @@ -75,7 +86,8 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, 0, 0); // put the horizontal scrollbar in the lower left hand corner - if ( bHasHScrollbar ) { + if (bHasHScrollbar) + { GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj); gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2, GTK_EXPAND | GTK_FILL, @@ -90,9 +102,10 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, GTK_FILL, GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0, 0); - gtk_widget_show(vscrollbar); + gtk_widget_show( vscrollbar ); } - else { + else + { // a single-line text control: no need for scrollbars m_widget = m_text = gtk_entry_new(); @@ -105,7 +118,8 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, PostCreation(); - if ( bMultiLine ) { + if (bMultiLine) + { gtk_widget_realize(m_text); gtk_widget_show(m_text); } @@ -119,23 +133,23 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value, { gint tmp = 0; gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp ); - }; + } - if (style & wxREADONLY) + if (style & wxTE_READONLY) { } else { - if ( bMultiLine ) + if (bMultiLine) gtk_text_set_editable( GTK_TEXT(m_text), 1 ); - }; + } Show( TRUE ); return TRUE; -}; +} -wxString wxTextCtrl::GetValue(void) const +wxString wxTextCtrl::GetValue() const { wxString tmp; if (m_windowStyle & wxTE_MULTILINE) @@ -146,9 +160,9 @@ wxString wxTextCtrl::GetValue(void) const else { tmp = gtk_entry_get_text( GTK_ENTRY(m_text) ); - }; + } return tmp; -}; +} void wxTextCtrl::SetValue( const wxString &value ) { @@ -164,8 +178,8 @@ void wxTextCtrl::SetValue( const wxString &value ) else { gtk_entry_set_text( GTK_ENTRY(m_text), tmp ); - }; -}; + } +} void wxTextCtrl::WriteText( const wxString &text ) { @@ -179,44 +193,44 @@ void wxTextCtrl::WriteText( const wxString &text ) else { gtk_entry_append_text( GTK_ENTRY(m_text), 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; -}; +} /* wxString wxTextCtrl::GetLineText( long lineNo ) const { -}; +} void wxTextCtrl::OnDropFiles( wxDropFilesEvent &event ) { -}; +} long wxTextCtrl::PositionToXY( long pos, long *x, long *y ) const { -}; +} long wxTextCtrl::XYToPosition( long x, long y ) { -}; +} -int wxTextCtrl::GetNumberOfLines(void) +int wxTextCtrl::GetNumberOfLines() { -}; +} */ void wxTextCtrl::SetInsertionPoint( long pos ) @@ -226,9 +240,9 @@ void wxTextCtrl::SetInsertionPoint( long pos ) gtk_text_set_point( GTK_TEXT(m_text), tmp ); else gtk_entry_set_position( GTK_ENTRY(m_text), tmp ); -}; +} -void wxTextCtrl::SetInsertionPointEnd(void) +void wxTextCtrl::SetInsertionPointEnd() { int pos = 0; if (m_windowStyle & wxTE_MULTILINE) @@ -236,7 +250,7 @@ void wxTextCtrl::SetInsertionPointEnd(void) else pos = GTK_ENTRY(m_text)->text_length; SetInsertionPoint( pos-1 ); -}; +} void wxTextCtrl::SetEditable( bool editable ) { @@ -244,24 +258,24 @@ void wxTextCtrl::SetEditable( bool editable ) gtk_text_set_editable( GTK_TEXT(m_text), editable ); else gtk_entry_set_editable( GTK_ENTRY(m_text), editable ); -}; +} void wxTextCtrl::SetSelection( long from, long to ) { gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to ); -}; +} void wxTextCtrl::ShowPosition( long WXUNUSED(pos) ) { - wxFAIL_MSG("wxTextCtrl::ShowPosition not implemented"); -}; + wxFAIL_MSG(_("wxTextCtrl::ShowPosition not implemented")); +} -long wxTextCtrl::GetInsertionPoint(void) const +long wxTextCtrl::GetInsertionPoint() const { return (long) GTK_EDITABLE(m_text)->current_pos; -}; +} -long wxTextCtrl::GetLastPosition(void) const +long wxTextCtrl::GetLastPosition() const { int pos = 0; if (m_windowStyle & wxTE_MULTILINE) @@ -269,12 +283,12 @@ long wxTextCtrl::GetLastPosition(void) const else pos = GTK_ENTRY(m_text)->text_length; return (long)pos-1; -}; +} void wxTextCtrl::Remove( long from, long to ) { gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to ); -}; +} void wxTextCtrl::Replace( long from, long to, const wxString &value ) { @@ -282,31 +296,59 @@ void wxTextCtrl::Replace( long from, long to, const wxString &value ) if (value.IsNull()) return; gint pos = (gint)to; gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos ); -}; +} -void wxTextCtrl::Cut(void) +void wxTextCtrl::Cut() { +#if (GTK_MINOR_VERSION == 1) + gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) ); +#else gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 ); -}; +#endif +} -void wxTextCtrl::Copy(void) +void wxTextCtrl::Copy() { +#if (GTK_MINOR_VERSION == 1) + gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) ); +#else gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 ); -}; +#endif +} -void wxTextCtrl::Paste(void) +void wxTextCtrl::Paste() { +#if (GTK_MINOR_VERSION == 1) + gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) ); +#else gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 ); -}; +#endif +} -void wxTextCtrl::Delete(void) +void wxTextCtrl::Clear() { SetValue( "" ); -}; +} -void wxTextCtrl::OnChar( wxKeyEvent &WXUNUSED(event) ) +void wxTextCtrl::OnChar( wxKeyEvent &key_event ) { -}; + if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER)) + { + wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId); + event.SetEventObject(this); + if (GetEventHandler()->ProcessEvent(event)) return; + } + else if (key_event.KeyCode() == WXK_TAB) + { + wxNavigationKeyEvent event; + event.SetDirection( key_event.m_shiftDown ); + event.SetWindowChange(FALSE); + event.SetEventObject(this); + + if (GetEventHandler()->ProcessEvent(event)) return; + } + key_event.Skip(); +} int wxTextCtrl::overflow( int WXUNUSED(c) ) { @@ -318,9 +360,9 @@ int wxTextCtrl::overflow( int WXUNUSED(c) ) setp(pbase(), epptr()); delete[] txt; return EOF; -}; +} -int wxTextCtrl::sync(void) +int wxTextCtrl::sync() { int len = pptr() - pbase(); char *txt = new char[len+1]; @@ -330,12 +372,12 @@ int wxTextCtrl::sync(void) setp(pbase(), epptr()); delete[] txt; return 0; -}; +} -int wxTextCtrl::underflow(void) +int wxTextCtrl::underflow() { return EOF; -}; +} wxTextCtrl& wxTextCtrl::operator<<(const wxString& s) { @@ -385,11 +427,41 @@ wxTextCtrl& wxTextCtrl::operator<<(const char c) return *this; } -GtkWidget* wxTextCtrl::GetDropTargetWidget(void) +GtkWidget* wxTextCtrl::GetConnectWidget() { return GTK_WIDGET(m_text); -}; - +} +bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window ) +{ + if (m_windowStyle & wxTE_MULTILINE) + return (window == GTK_TEXT(m_text)->text_area); + else + return (window == GTK_ENTRY(m_text)->text_area); +} +void wxTextCtrl::SetFont( const wxFont &font ) +{ + if (((wxFont*)&font)->Ok()) + m_font = font; + else + m_font = *wxSWISS_FONT; + + GtkStyle *style = (GtkStyle*) NULL; + if (!m_hasOwnStyle) + { + m_hasOwnStyle = TRUE; + style = gtk_style_copy( gtk_widget_get_style( m_text ) ); + } + else + { + style = gtk_widget_get_style( m_text ); + } + gdk_font_unref( style->font ); + style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) ); + + gtk_widget_set_style( m_text, style ); +} + +