wxSpinCtrl no longer emits event when changed programmatically.
Some GUI thread things and tests, Change for borders around cmposite controls. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -101,11 +101,7 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
|
||||
gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
|
||||
(int)(m_windowStyle & wxSP_WRAP) );
|
||||
|
||||
gtk_signal_connect( GTK_OBJECT (m_adjust),
|
||||
"value_changed",
|
||||
(GtkSignalFunc) gtk_spinctrl_callback,
|
||||
(gpointer) this );
|
||||
|
||||
GtkEnableEvents();
|
||||
m_parent->DoAddChild( this );
|
||||
|
||||
PostCreation();
|
||||
@@ -119,6 +115,22 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void wxSpinCtrl::GtkDisableEvents()
|
||||
{
|
||||
gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),
|
||||
GTK_SIGNAL_FUNC(gtk_spinctrl_callback),
|
||||
(gpointer) this );
|
||||
|
||||
}
|
||||
|
||||
void wxSpinCtrl::GtkEnableEvents()
|
||||
{
|
||||
gtk_signal_connect( GTK_OBJECT (m_adjust),
|
||||
"value_changed",
|
||||
GTK_SIGNAL_FUNC(gtk_spinctrl_callback),
|
||||
(gpointer) this );
|
||||
}
|
||||
|
||||
int wxSpinCtrl::GetMin() const
|
||||
{
|
||||
wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
|
||||
@@ -153,7 +165,9 @@ void wxSpinCtrl::SetValue( const wxString& value )
|
||||
else
|
||||
{
|
||||
// invalid number - set text as is (wxMSW compatible)
|
||||
GtkDisableEvents();
|
||||
gtk_entry_set_text( GTK_ENTRY(m_widget), value.mbc_str() );
|
||||
GtkEnableEvents();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -167,7 +181,9 @@ void wxSpinCtrl::SetValue( int value )
|
||||
|
||||
m_adjust->value = fpos;
|
||||
|
||||
GtkDisableEvents();
|
||||
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
|
||||
GtkEnableEvents();
|
||||
}
|
||||
|
||||
void wxSpinCtrl::SetRange(int minVal, int maxVal)
|
||||
|
Reference in New Issue
Block a user