X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d5027818a42043052ac375b1a0ba30fac491ddc4..bb996f289574defb0ae4339ae8e46ff3cf6fa54c:/src/gtk/spinctrl.cpp diff --git a/src/gtk/spinctrl.cpp b/src/gtk/spinctrl.cpp index 8a7e8649e3..e7b798197a 100644 --- a/src/gtk/spinctrl.cpp +++ b/src/gtk/spinctrl.cpp @@ -21,7 +21,9 @@ #include "wx/wxcrtvararg.h" #endif +#include #include "wx/gtk/private.h" +#include "wx/gtk/private/gtk2-compat.h" //----------------------------------------------------------------------------- // data @@ -37,7 +39,7 @@ extern "C" { static void gtk_value_changed(GtkSpinButton* spinbutton, wxSpinCtrlGTKBase* win) { - if (!win->m_hasVMT || g_blockEventsOnDrag) + if (g_blockEventsOnDrag) return; if (wxIsKindOf(win, wxSpinCtrl)) @@ -67,9 +69,6 @@ extern "C" { static void gtk_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win) { - if (!win->m_hasVMT) - return; - wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() ); event.SetEventObject( win ); event.SetString(gtk_entry_get_text(GTK_ENTRY(spinbutton))); @@ -82,8 +81,6 @@ gtk_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win) // wxSpinCtrlGTKBase //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrlGTKBase, wxSpinCtrlBase) - BEGIN_EVENT_TABLE(wxSpinCtrlGTKBase, wxSpinCtrlBase) EVT_CHAR(wxSpinCtrlGTKBase::OnChar) END_EVENT_TABLE() @@ -325,10 +322,15 @@ void wxSpinCtrlGTKBase::OnChar( wxKeyEvent &event ) GdkWindow *wxSpinCtrlGTKBase::GTKGetWindow(wxArrayGdkWindows& windows) const { +#ifdef __WXGTK3__ + // no access to internal GdkWindows + wxUnusedVar(windows); +#else GtkSpinButton* spinbutton = GTK_SPIN_BUTTON(m_widget); windows.push_back(spinbutton->entry.text_area); windows.push_back(spinbutton->panel); +#endif return NULL; } @@ -354,6 +356,78 @@ wxSpinCtrlGTKBase::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) // wxSpinCtrl //----------------------------------------------------------------------------- +extern "C" +{ + +static gboolean +wx_gtk_spin_input(GtkSpinButton* spin, gdouble* val, wxSpinCtrl* win) +{ + // We might use g_ascii_strtoll() here but it's 2.12+ only, so use our own + // wxString function even if this requires an extra conversion. + const wxString + text(wxString::FromUTF8(gtk_entry_get_text(GTK_ENTRY(spin)))); + + long lval; + if ( !text.ToLong(&lval, win->GetBase()) ) + return FALSE; + + *val = lval; + + return TRUE; +} + +static gint +wx_gtk_spin_output(GtkSpinButton* spin, wxSpinCtrl* win) +{ + const gint val = gtk_spin_button_get_value_as_int(spin); + + gtk_entry_set_text + ( + GTK_ENTRY(spin), + wxPrivate::wxSpinCtrlFormatAsHex(val, win->GetMax()).utf8_str() + ); + + return TRUE; +} + +} // extern "C" + +bool wxSpinCtrl::SetBase(int base) +{ + // Currently we only support base 10 and 16. We could add support for base + // 8 quite easily but wxMSW doesn't support it natively so don't bother + // with doing something wxGTK-specific here. + if ( base != 10 && base != 16 ) + return false; + + if ( base == m_base ) + return true; + + m_base = base; + + // We need to be able to enter letters for any base greater than 10. + gtk_spin_button_set_numeric( GTK_SPIN_BUTTON(m_widget), m_base <= 10 ); + + if ( m_base != 10 ) + { + g_signal_connect( m_widget, "input", + G_CALLBACK(wx_gtk_spin_input), this); + g_signal_connect( m_widget, "output", + G_CALLBACK(wx_gtk_spin_output), this); + } + else + { + g_signal_handlers_disconnect_by_func(m_widget, + (gpointer)wx_gtk_spin_input, + this); + g_signal_handlers_disconnect_by_func(m_widget, + (gpointer)wx_gtk_spin_output, + this); + } + + return true; +} + //----------------------------------------------------------------------------- // wxSpinCtrlDouble //-----------------------------------------------------------------------------