/////////////////////////////////////////////////////////////////////////////
-// Name: spinbutt.cpp
+// Name: src/gtk1/spinbutt.cpp
// Purpose: wxSpinButton
// Author: Robert
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "spinbutt.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#include "wx/spinbutt.h"
+#if wxUSE_SPINBTN
-#ifdef wxUSE_SPINBTN
+#include "wx/spinbutt.h"
-#include "wx/utils.h"
-#include <math.h>
+#ifndef WX_PRECOMP
+ #include "wx/utils.h"
+#endif
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/math.h"
+#include "wx/gtk1/private.h"
//-----------------------------------------------------------------------------
// idle system
extern bool g_blockEventsOnDrag;
-static const float sensitivity = 0.2;
+static const float sensitivity = 0.02;
//-----------------------------------------------------------------------------
// "value_changed"
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win )
{
if (g_isIdle) wxapp_install_idle_handler();
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;
- if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN;
- else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP;
+ 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.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)
{
win->GetEventHandler()->ProcessEvent( event2 );
}
}
+}
//-----------------------------------------------------------------------------
// wxSpinButton
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
EVT_SIZE(wxSpinButton::OnSize)
long style,
const wxString& name)
{
- m_needParent = TRUE;
+ m_needParent = true;
- wxSize new_size = size;
- new_size.x = 15;
+ wxSize new_size = size,
+ sizeBest = DoGetBestSize();
+ new_size.x = sizeBest.x; // override width always
if (new_size.y == -1)
- new_size.y = 30;
+ new_size.y = sizeBest.y;
if (!PreCreation( parent, pos, new_size ) ||
!CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
{
- wxFAIL_MSG( _T("wxXX creation failed") );
- return FALSE;
+ 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",
m_parent->DoAddChild( this );
- PostCreation();
-
- SetBackgroundColour( parent->GetBackgroundColour() );
+ PostCreation(new_size);
- Show( TRUE );
-
- return TRUE;
-}
-
-wxSpinButton::~wxSpinButton()
-{
+ return true;
}
int wxSpinButton::GetMin() const
{
- wxCHECK_MSG( (m_widget != NULL), 0, _T("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, _T("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, _T("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), _T("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), _T("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), _T("invalid spin button") );
+ wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
- m_width = 15;
+ m_width = DoGetBestSize().x;
gtk_widget_set_usize( m_widget, m_width, m_height );
}
return GTK_SPIN_BUTTON(m_widget)->panel == window;
}
-void wxSpinButton::ApplyWidgetStyle()
+wxSize wxSpinButton::DoGetBestSize() const
{
- SetWidgetStyle();
- gtk_widget_set_style( m_widget, m_widgetStyle );
+ wxSize best(15, 26); // FIXME
+ CacheBestSize(best);
+ return best;
}
-#endif
+// static
+wxVisualAttributes
+wxSpinButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ // TODO: overload to accept functions like gtk_spin_button_new?
+ // Until then use a similar type
+ return GetDefaultAttributesFromGTKWidget(gtk_button_new);
+}
+
+#endif // wxUSE_SPINBTN
projects / wxWidgets.git / blobdiff