Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxSpinButton works ok with negative values

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-03-01 14:30:43 +00:00
parent 20e85460c4
commit 6380910c1f
3 changed files with 101 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
samples/controls/controls.cpp
View File

@@ -549,7 +549,8 @@ m_text(NULL), m_notebook(NULL)
m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) ); m_spintext = new wxTextCtrl( panel, -1, "0", wxPoint(20,160), wxSize(80,-1) );
#ifndef __WIN16__ #ifndef __WIN16__
m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(-1,-1) ); m_spinbutton = new wxSpinButton( panel, ID_SPIN, wxPoint(103,159), wxSize(-1,-1) );
m_spinbutton->SetRange(0,100); m_spinbutton->SetRange(-10,30);
m_spinbutton->SetValue(-5);
#endif #endif
m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge); m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge);
} }
@@ -885,8 +886,14 @@ void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
void MyPanel::OnSpinUpdate( wxSpinEvent &event ) void MyPanel::OnSpinUpdate( wxSpinEvent &event )
{ {
wxString value; wxString value;
value.sprintf( "%d", (int)event.GetPosition() ); value.Printf( "%d", event.GetPosition() );
m_spintext->SetValue( value ); m_spintext->SetValue( value );
value.Printf("Spin control range: (%d, %d), current = %d\n",
m_spinbutton->GetMin(), m_spinbutton->GetMax(),
m_spinbutton->GetValue());
m_text->AppendText(value);
} }
#endif #endif

89
src/gtk/spinbutt.cpp
View File

@@ -5,7 +5,7 @@
// Modified by: // Modified by:
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Robert Roebling // Copyright: (c) Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -25,37 +25,39 @@
extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnDrag;
static const float sensitivity = 0.2;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "value_changed" // "value_changed"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win ) static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win )
{ {
if (!win->HasVMT()) return; if (!win->HasVMT()) return;
if (g_blockEventsOnDrag) return; if (g_blockEventsOnDrag) return;
float diff = win->m_adjust->value - win->m_oldPos; float diff = win->m_adjust->value - win->m_oldPos;
if (fabs(diff) < 0.2) return; if (fabs(diff) < sensitivity) return;
win->m_oldPos = win->m_adjust->value; win->m_oldPos = win->m_adjust->value;
wxEventType command = wxEVT_NULL; wxEventType command = wxEVT_NULL;
float line_step = win->m_adjust->step_increment; float line_step = win->m_adjust->step_increment;
float page_step = win->m_adjust->page_increment; float page_step = win->m_adjust->page_increment;
if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN; if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN;
else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP; else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP;
else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN; else if (fabs(diff-page_step) < sensitivity) command = wxEVT_SCROLL_PAGEDOWN;
else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP; else if (fabs(diff+page_step) < sensitivity) command = wxEVT_SCROLL_PAGEUP;
else command = wxEVT_SCROLL_THUMBTRACK; else command = wxEVT_SCROLL_THUMBTRACK;
int value = (int)(win->m_adjust->value+0.5); int value = ceil(win->m_adjust->value);
wxSpinEvent event( command, win->GetId()); wxSpinEvent event( command, win->GetId());
event.SetPosition( value ); event.SetPosition( value );
event.SetOrientation( wxVERTICAL ); event.SetOrientation( wxVERTICAL );
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
} }
@@ -77,38 +79,39 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
long style, const wxString& name) long style, const wxString& name)
{ {
m_needParent = TRUE; m_needParent = TRUE;
wxSize new_size = size; wxSize new_size = size;
new_size.x = 16; new_size.x = 16;
if (new_size.y == -1) new_size.y = 30; if (new_size.y == -1)
new_size.y = 30;
PreCreation( parent, id, pos, new_size, style, name ); PreCreation( parent, id, pos, new_size, style, name );
// SetValidator( validator ); // SetValidator( validator );
m_oldPos = 0.0; m_oldPos = 0.0;
m_adjust = (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 100.0, 1.0, 5.0, 0.0); m_adjust = (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 100.0, 1.0, 5.0, 0.0);
m_widget = gtk_spin_button_new( m_adjust, 0, 0 ); m_widget = gtk_spin_button_new( m_adjust, 0, 0 );
gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (m_windowStyle & wxSP_WRAP) ); gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (m_windowStyle & wxSP_WRAP) );
gtk_signal_connect( GTK_OBJECT (m_adjust), gtk_signal_connect( GTK_OBJECT (m_adjust),
"value_changed", "value_changed",
(GtkSignalFunc) gtk_spinbutt_callback, (GtkSignalFunc) gtk_spinbutt_callback,
(gpointer) this ); (gpointer) this );
m_parent->AddChild( this ); m_parent->AddChild( this );
(m_parent->m_insertCallback)( m_parent, this ); (m_parent->m_insertCallback)( m_parent, this );
PostCreation(); PostCreation();
SetBackgroundColour( parent->GetBackgroundColour() ); SetBackgroundColour( parent->GetBackgroundColour() );
Show( TRUE ); Show( TRUE );
return TRUE; return TRUE;
} }
@@ -119,50 +122,50 @@ wxSpinButton::~wxSpinButton()
int wxSpinButton::GetMin() const int wxSpinButton::GetMin() const
{ {
wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
return (int)(m_adjust->lower+0.5); return ceil(m_adjust->lower);
} }
int wxSpinButton::GetMax() const int wxSpinButton::GetMax() const
{ {
wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
return (int)(m_adjust->upper+0.5); return ceil(m_adjust->upper);
} }
int wxSpinButton::GetValue() const int wxSpinButton::GetValue() const
{ {
wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
return (int)(m_adjust->value+0.5); return ceil(m_adjust->value);
} }
void wxSpinButton::SetValue( int value ) void wxSpinButton::SetValue( int value )
{ {
wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
float fpos = (float)value; float fpos = (float)value;
m_oldPos = fpos; m_oldPos = fpos;
if (fabs(fpos-m_adjust->value) < 0.2) return; if (fabs(fpos-m_adjust->value) < sensitivity) return;
m_adjust->value = fpos; m_adjust->value = fpos;
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
} }
void wxSpinButton::SetRange(int minVal, int maxVal) void wxSpinButton::SetRange(int minVal, int maxVal)
{ {
wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
float fmin = (float)minVal; float fmin = (float)minVal;
float fmax = (float)maxVal; float fmax = (float)maxVal;
if ((fabs(fmin-m_adjust->lower) < 0.2) && if ((fabs(fmin-m_adjust->lower) < sensitivity) &&
(fabs(fmax-m_adjust->upper) < 0.2)) (fabs(fmax-m_adjust->upper) < sensitivity))
{ {
return; return;
} }
m_adjust->lower = fmin; m_adjust->lower = fmin;
m_adjust->upper = fmax; m_adjust->upper = fmax;
@@ -172,7 +175,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
{ {
wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
m_width = 16; m_width = 16;
gtk_widget_set_usize( m_widget, m_width, m_height ); gtk_widget_set_usize( m_widget, m_width, m_height );
} }

89
src/gtk1/spinbutt.cpp
View File

@@ -5,7 +5,7 @@
// Modified by: // Modified by:
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Robert Roebling // Copyright: (c) Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -25,37 +25,39 @@
extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnDrag;
static const float sensitivity = 0.2;
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "value_changed" // "value_changed"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win ) static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win )
{ {
if (!win->HasVMT()) return; if (!win->HasVMT()) return;
if (g_blockEventsOnDrag) return; if (g_blockEventsOnDrag) return;
float diff = win->m_adjust->value - win->m_oldPos; float diff = win->m_adjust->value - win->m_oldPos;
if (fabs(diff) < 0.2) return; if (fabs(diff) < sensitivity) return;
win->m_oldPos = win->m_adjust->value; win->m_oldPos = win->m_adjust->value;
wxEventType command = wxEVT_NULL; wxEventType command = wxEVT_NULL;
float line_step = win->m_adjust->step_increment; float line_step = win->m_adjust->step_increment;
float page_step = win->m_adjust->page_increment; float page_step = win->m_adjust->page_increment;
if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN; if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN;
else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP; else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP;
else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN; else if (fabs(diff-page_step) < sensitivity) command = wxEVT_SCROLL_PAGEDOWN;
else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP; else if (fabs(diff+page_step) < sensitivity) command = wxEVT_SCROLL_PAGEUP;
else command = wxEVT_SCROLL_THUMBTRACK; else command = wxEVT_SCROLL_THUMBTRACK;
int value = (int)(win->m_adjust->value+0.5); int value = ceil(win->m_adjust->value);
wxSpinEvent event( command, win->GetId()); wxSpinEvent event( command, win->GetId());
event.SetPosition( value ); event.SetPosition( value );
event.SetOrientation( wxVERTICAL ); event.SetOrientation( wxVERTICAL );
event.SetEventObject( win ); event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event ); win->GetEventHandler()->ProcessEvent( event );
} }
@@ -77,38 +79,39 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
long style, const wxString& name) long style, const wxString& name)
{ {
m_needParent = TRUE; m_needParent = TRUE;
wxSize new_size = size; wxSize new_size = size;
new_size.x = 16; new_size.x = 16;
if (new_size.y == -1) new_size.y = 30; if (new_size.y == -1)
new_size.y = 30;
PreCreation( parent, id, pos, new_size, style, name ); PreCreation( parent, id, pos, new_size, style, name );
// SetValidator( validator ); // SetValidator( validator );
m_oldPos = 0.0; m_oldPos = 0.0;
m_adjust = (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 100.0, 1.0, 5.0, 0.0); m_adjust = (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 100.0, 1.0, 5.0, 0.0);
m_widget = gtk_spin_button_new( m_adjust, 0, 0 ); m_widget = gtk_spin_button_new( m_adjust, 0, 0 );
gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (m_windowStyle & wxSP_WRAP) ); gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (m_windowStyle & wxSP_WRAP) );
gtk_signal_connect( GTK_OBJECT (m_adjust), gtk_signal_connect( GTK_OBJECT (m_adjust),
"value_changed", "value_changed",
(GtkSignalFunc) gtk_spinbutt_callback, (GtkSignalFunc) gtk_spinbutt_callback,
(gpointer) this ); (gpointer) this );
m_parent->AddChild( this ); m_parent->AddChild( this );
(m_parent->m_insertCallback)( m_parent, this ); (m_parent->m_insertCallback)( m_parent, this );
PostCreation(); PostCreation();
SetBackgroundColour( parent->GetBackgroundColour() ); SetBackgroundColour( parent->GetBackgroundColour() );
Show( TRUE ); Show( TRUE );
return TRUE; return TRUE;
} }
@@ -119,50 +122,50 @@ wxSpinButton::~wxSpinButton()
int wxSpinButton::GetMin() const int wxSpinButton::GetMin() const
{ {
wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
return (int)(m_adjust->lower+0.5); return ceil(m_adjust->lower);
} }
int wxSpinButton::GetMax() const int wxSpinButton::GetMax() const
{ {
wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
return (int)(m_adjust->upper+0.5); return ceil(m_adjust->upper);
} }
int wxSpinButton::GetValue() const int wxSpinButton::GetValue() const
{ {
wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" ); wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
return (int)(m_adjust->value+0.5); return ceil(m_adjust->value);
} }
void wxSpinButton::SetValue( int value ) void wxSpinButton::SetValue( int value )
{ {
wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
float fpos = (float)value; float fpos = (float)value;
m_oldPos = fpos; m_oldPos = fpos;
if (fabs(fpos-m_adjust->value) < 0.2) return; if (fabs(fpos-m_adjust->value) < sensitivity) return;
m_adjust->value = fpos; m_adjust->value = fpos;
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" ); gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
} }
void wxSpinButton::SetRange(int minVal, int maxVal) void wxSpinButton::SetRange(int minVal, int maxVal)
{ {
wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
float fmin = (float)minVal; float fmin = (float)minVal;
float fmax = (float)maxVal; float fmax = (float)maxVal;
if ((fabs(fmin-m_adjust->lower) < 0.2) && if ((fabs(fmin-m_adjust->lower) < sensitivity) &&
(fabs(fmax-m_adjust->upper) < 0.2)) (fabs(fmax-m_adjust->upper) < sensitivity))
{ {
return; return;
} }
m_adjust->lower = fmin; m_adjust->lower = fmin;
m_adjust->upper = fmax; m_adjust->upper = fmax;
@@ -172,7 +175,7 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) ) void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
{ {
wxCHECK_RET( (m_widget != NULL), "invalid spin button" ); wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
m_width = 16; m_width = 16;
gtk_widget_set_usize( m_widget, m_width, m_height ); gtk_widget_set_usize( m_widget, m_width, m_height );
} }