/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "spinbutt.h"
+ #pragma implementation "spinbutt.h"
+ #pragma implementation "spinbutbase.h"
#endif
#include "wx/spinbutt.h"
+
+#if wxUSE_SPINBTN
+
#include "wx/utils.h"
+
#include <math.h>
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
//-----------------------------------------------------------------------------
// data
extern bool g_blockEventsOnDrag;
-static const float sensitivity = 0.2;
+static const float sensitivity = 0.02;
//-----------------------------------------------------------------------------
// "value_changed"
static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win )
{
- if (!win->HasVMT()) return;
+ if (g_isIdle) wxapp_install_idle_handler();
+
+ if (!win->m_hasVMT) return;
if (g_blockEventsOnDrag) return;
float diff = win->m_adjust->value - win->m_oldPos;
if (fabs(diff) < sensitivity) return;
- win->m_oldPos = win->m_adjust->value;
wxEventType command = wxEVT_NULL;
float line_step = win->m_adjust->step_increment;
- float page_step = win->m_adjust->page_increment;
- if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN;
- else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP;
- else if (fabs(diff-page_step) < sensitivity) command = wxEVT_SCROLL_PAGEDOWN;
- else if (fabs(diff+page_step) < sensitivity) command = wxEVT_SCROLL_PAGEUP;
+ if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP;
+ else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN;
else command = wxEVT_SCROLL_THUMBTRACK;
int value = (int)ceil(win->m_adjust->value);
wxSpinEvent event( command, win->GetId());
event.SetPosition( value );
- event.SetOrientation( wxVERTICAL );
event.SetEventObject( win );
- win->GetEventHandler()->ProcessEvent( event );
+ if ((win->GetEventHandler()->ProcessEvent( event )) &&
+ !event.IsAllowed() )
+ {
+ /* program has vetoed */
+ win->m_adjust->value = win->m_oldPos;
+
+ gtk_signal_disconnect_by_func( GTK_OBJECT (win->m_adjust),
+ (GtkSignalFunc) gtk_spinbutt_callback,
+ (gpointer) win );
+
+ gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
+
+ gtk_signal_connect( GTK_OBJECT (win->m_adjust),
+ "value_changed",
+ (GtkSignalFunc) gtk_spinbutt_callback,
+ (gpointer) win );
+ return;
+ }
+
+ win->m_oldPos = win->m_adjust->value;
+
+ /* always send a thumbtrack event */
+ if (command != wxEVT_SCROLL_THUMBTRACK)
+ {
+ command = wxEVT_SCROLL_THUMBTRACK;
+ wxSpinEvent event2( command, win->GetId());
+ event2.SetPosition( value );
+ event2.SetEventObject( win );
+ win->GetEventHandler()->ProcessEvent( event2 );
+ }
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
EVT_SIZE(wxSpinButton::OnSize)
END_EVENT_TABLE()
-wxSpinButton::wxSpinButton()
-{
-}
-
-bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
- long style, const wxString& name)
+bool wxSpinButton::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
{
m_needParent = TRUE;
- wxSize new_size = size;
- new_size.x = 16;
+ wxSize new_size = size,
+ sizeBest = DoGetBestSize();
+ new_size.x = sizeBest.x; // override width always
if (new_size.y == -1)
- new_size.y = 30;
-
- PreCreation( parent, id, pos, new_size, style, name );
+ new_size.y = sizeBest.y;
-// SetValidator( validator );
+ if (!PreCreation( parent, pos, new_size ) ||
+ !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
+ {
+ wxFAIL_MSG( wxT("wxXX creation failed") );
+ return FALSE;
+ }
m_oldPos = 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),
+ (int)(m_windowStyle & wxSP_WRAP) );
gtk_signal_connect( GTK_OBJECT (m_adjust),
"value_changed",
(GtkSignalFunc) gtk_spinbutt_callback,
(gpointer) this );
- m_parent->AddChild( this );
-
- (m_parent->m_insertCallback)( m_parent, this );
+ m_parent->DoAddChild( this );
PostCreation();
return TRUE;
}
-wxSpinButton::~wxSpinButton()
-{
-}
-
int wxSpinButton::GetMin() const
{
- wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+ wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
return (int)ceil(m_adjust->lower);
}
int wxSpinButton::GetMax() const
{
- wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+ wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
return (int)ceil(m_adjust->upper);
}
int wxSpinButton::GetValue() const
{
- wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+ wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
return (int)ceil(m_adjust->value);
}
void wxSpinButton::SetValue( int value )
{
- wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+ wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
float fpos = (float)value;
m_oldPos = fpos;
void wxSpinButton::SetRange(int minVal, int maxVal)
{
- wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+ wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
float fmin = (float)minVal;
float fmax = (float)maxVal;
m_adjust->upper = fmax;
gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+
+ // these two calls are required due to some bug in GTK
+ Refresh();
+ SetFocus();
}
void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
{
- wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+ wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
- m_width = 16;
+ m_width = DoGetBestSize().x;
gtk_widget_set_usize( m_widget, m_width, m_height );
}
gtk_widget_set_style( m_widget, m_widgetStyle );
}
-//-----------------------------------------------------------------------------
-// wxSpinEvent
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
-
-wxSpinEvent::wxSpinEvent(wxEventType commandType, int id):
- wxScrollEvent(commandType, id)
+wxSize wxSpinButton::DoGetBestSize() const
{
+ return wxSize(15, 26);
}
-
+#endif
projects / wxWidgets.git / blobdiff