From 8194f0555396e368fd13404517f8cda73c34fb78 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 20 Apr 2021 01:04:37 +0200 Subject: [PATCH] Simplify event sending code by using GetTextValue() Just use this function now that it's available rather than calling gtk_entry_get_text() (and sometimes forgetting to specify UTF-8 encoding explicitly). --- src/gtk/spinctrl.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp index bd293c8a68..5f5dce9bd9 100644 --- a/src/gtk/spinctrl.cpp +++ b/src/gtk/spinctrl.cpp @@ -67,11 +67,11 @@ gtk_value_changed(GtkSpinButton* spinbutton, wxSpinCtrlGTKBase* win) extern "C" { static void -gtk_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win) +gtk_changed(GtkSpinButton*, wxSpinCtrl* win) { wxCommandEvent event( wxEVT_TEXT, win->GetId() ); event.SetEventObject( win ); - event.SetString(gtk_entry_get_text(GTK_ENTRY(spinbutton))); + event.SetString(win->GetTextValue()); event.SetInt(win->GetValue()); win->HandleWindowEvent( event ); } @@ -343,9 +343,7 @@ void wxSpinCtrlGTKBase::OnChar( wxKeyEvent &event ) { wxCommandEvent evt( wxEVT_TEXT_ENTER, m_windowId ); evt.SetEventObject(this); - GtkSpinButton *gsb = GTK_SPIN_BUTTON(m_widget); - wxString val = wxGTK_CONV_BACK( gtk_entry_get_text( &gsb->entry ) ); - evt.SetString( val ); + evt.SetString(GetTextValue()); if (HandleWindowEvent(evt)) return; }