/////////////////////////////////////////////////////////////////////////////
-// Name: spinbutt.cpp
+// Name: src/gtk/spinbutt.cpp
// Purpose: wxSpinCtrl
// Author: Robert
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "spinctrl.h"
-#endif
-
-#include "wx/spinctrl.h"
-
-#ifdef wxUSE_SPINBTN
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#include "wx/utils.h"
-#include "wx/spinbutt.h"
-#include <math.h>
+#if wxUSE_SPINCTRL
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/spinctrl.h"
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+ #include "wx/textctrl.h" // for wxEVT_COMMAND_TEXT_UPDATED
+ #include "wx/utils.h"
+ #include "wx/wxcrtvararg.h"
+#endif
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#include "wx/gtk/private.h"
//-----------------------------------------------------------------------------
// data
extern bool g_blockEventsOnDrag;
-static const float sensitivity = 0.02;
-
//-----------------------------------------------------------------------------
// "value_changed"
//-----------------------------------------------------------------------------
-static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win )
+extern "C" {
+static void
+gtk_value_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win)
{
- 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;
+ win->m_pos = int(gtk_spin_button_get_value(spinbutton));
+ if (!win->m_hasVMT || g_blockEventsOnDrag || win->m_blockScrollEvent)
+ return;
- wxEventType command = wxEVT_NULL;
+ wxCommandEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, win->GetId());
+ event.SetEventObject( win );
- float line_step = win->m_adjust->step_increment;
+ // note that we don't use wxSpinCtrl::GetValue() here because it would
+ // adjust the value to fit into the control range and this means that we
+ // would never be able to enter an "invalid" value in the control, even
+ // temporarily - and trying to enter 10 into the control which accepts the
+ // values in range 5..50 is then, ummm, quite challenging (hint: you can't
+ // enter 1!) (VZ)
+ event.SetInt(win->m_pos);
+ win->GetEventHandler()->ProcessEvent( event );
+}
+}
- if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN;
- else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP;
- else command = wxEVT_SCROLL_THUMBTRACK;
+//-----------------------------------------------------------------------------
+// "changed"
+//-----------------------------------------------------------------------------
- int value = (int)ceil(win->m_adjust->value);
+extern "C" {
+static void
+gtk_changed(GtkSpinButton* spinbutton, wxSpinCtrl* win)
+{
+ if (!win->m_hasVMT || win->m_blockScrollEvent)
+ return;
- wxSpinEvent event( command, win->GetId());
- event.SetPosition( value );
+ wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
event.SetEventObject( win );
+ event.SetString( GTK_ENTRY(spinbutton)->text );
+
+ // see above
+ event.SetInt(win->m_pos);
win->GetEventHandler()->ProcessEvent( event );
-
- /* 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(wxSpinCtrl,wxControl)
+BEGIN_EVENT_TABLE(wxSpinCtrl, wxControl)
+ EVT_CHAR(wxSpinCtrl::OnChar)
+END_EVENT_TABLE()
+
+wxSpinCtrl::wxSpinCtrl()
+{
+ m_pos = 0;
+}
+
bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
const wxString& value,
const wxPoint& pos, const wxSize& size,
int min, int max, int initial,
const wxString& name)
{
- m_needParent = TRUE;
-
- wxSize new_size = size;
- if (new_size.y == -1)
- new_size.y = 26;
-
- if (!PreCreation( parent, pos, new_size ) ||
- !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
wxFAIL_MSG( wxT("wxSpinCtrl creation failed") );
- return FALSE;
+ return false;
}
- m_oldPos = initial;
+ m_widget = gtk_spin_button_new_with_range(min, max, 1);
+ gtk_spin_button_set_value( GTK_SPIN_BUTTON(m_widget), initial);
+ m_pos = (int) gtk_spin_button_get_value( GTK_SPIN_BUTTON(m_widget));
- m_adjust = (GtkAdjustment*) gtk_adjustment_new( initial, min, max, 1.0, 5.0, 0.0);
+ gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
+ (int)(m_windowStyle & wxSP_WRAP) );
- m_widget = gtk_spin_button_new( m_adjust, 1, 0 );
-
- gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (m_windowStyle & wxSP_WRAP) );
-
- gtk_signal_connect( GTK_OBJECT (m_adjust),
- "value_changed",
- (GtkSignalFunc) gtk_spinctrl_callback,
- (gpointer) this );
+ g_signal_connect_after(m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this);
+ g_signal_connect_after(m_widget, "changed", G_CALLBACK(gtk_changed), this);
m_parent->DoAddChild( this );
- PostCreation();
-
- SetBackgroundColour( parent->GetBackgroundColour() );
-
- SetValue( value );
+ PostCreation(size);
- Show( TRUE );
+ if (!value.empty())
+ {
+ SetValue(value);
+ }
- return TRUE;
+ return true;
}
int wxSpinCtrl::GetMin() const
{
wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
- return (int)ceil(m_adjust->lower);
+ double min;
+ gtk_spin_button_get_range( GTK_SPIN_BUTTON(m_widget), &min, NULL);
+ return int(min);
}
int wxSpinCtrl::GetMax() const
{
wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
- return (int)ceil(m_adjust->upper);
+ double max;
+ gtk_spin_button_get_range( GTK_SPIN_BUTTON(m_widget), NULL, &max);
+ return int(max);
}
int wxSpinCtrl::GetValue() const
{
wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
- return (int)ceil(m_adjust->value);
+ GtkDisableEvents();
+ gtk_spin_button_update( GTK_SPIN_BUTTON(m_widget) );
+ GtkEnableEvents();
+
+ return m_pos;
}
void wxSpinCtrl::SetValue( const wxString& value )
else
{
// invalid number - set text as is (wxMSW compatible)
- gtk_entry_set_text( GTK_ENTRY(m_widget), value.mbc_str() );
+ GtkDisableEvents();
+ gtk_entry_set_text( GTK_ENTRY(m_widget), wxGTK_CONV( value ) );
+ GtkEnableEvents();
}
}
{
wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
- float fpos = (float)value;
- m_oldPos = fpos;
- if (fabs(fpos-m_adjust->value) < sensitivity) return;
+ GtkDisableEvents();
+ gtk_spin_button_set_value( GTK_SPIN_BUTTON(m_widget), value);
+ m_pos = (int) gtk_spin_button_get_value( GTK_SPIN_BUTTON(m_widget));
+ GtkEnableEvents();
+}
- m_adjust->value = fpos;
+void wxSpinCtrl::SetSelection(long from, long to)
+{
+ // translate from wxWidgets conventions to GTK+ ones: (-1, -1) means the
+ // entire range
+ if ( from == -1 && to == -1 )
+ {
+ from = 0;
+ to = INT_MAX;
+ }
- gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+ gtk_editable_select_region( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
}
void wxSpinCtrl::SetRange(int minVal, int maxVal)
{
wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
- float fmin = (float)minVal;
- float fmax = (float)maxVal;
+ GtkDisableEvents();
+ gtk_spin_button_set_range( GTK_SPIN_BUTTON(m_widget), minVal, maxVal);
+ GtkEnableEvents();
+}
- if ((fabs(fmin-m_adjust->lower) < sensitivity) &&
- (fabs(fmax-m_adjust->upper) < sensitivity))
+
+void wxSpinCtrl::GtkDisableEvents() const
+{
+ g_signal_handlers_block_by_func( m_widget,
+ (gpointer)gtk_value_changed, (void*) this);
+
+ g_signal_handlers_block_by_func(m_widget,
+ (gpointer)gtk_changed, (void*) this);
+}
+
+void wxSpinCtrl::GtkEnableEvents() const
+{
+ g_signal_handlers_unblock_by_func(m_widget,
+ (gpointer)gtk_value_changed, (void*) this);
+
+ g_signal_handlers_unblock_by_func(m_widget,
+ (gpointer)gtk_changed, (void*) this);
+}
+
+void wxSpinCtrl::OnChar( wxKeyEvent &event )
+{
+ wxCHECK_RET( m_widget != NULL, wxT("invalid spin ctrl") );
+
+ if (event.GetKeyCode() == WXK_RETURN)
{
- return;
+ wxWindow *top_frame = wxGetTopLevelParent(m_parent);
+
+ if ( GTK_IS_WINDOW(top_frame->m_widget) )
+ {
+ GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+ if ( window )
+ {
+ GtkWidget *widgetDef = window->default_widget;
+
+ if ( widgetDef )
+ {
+ gtk_widget_activate(widgetDef);
+ return;
+ }
+ }
+ }
}
- m_adjust->lower = fmin;
- m_adjust->upper = fmax;
+ if ((event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxTE_PROCESS_ENTER))
+ {
+ wxCommandEvent evt( wxEVT_COMMAND_TEXT_ENTER, m_windowId );
+ evt.SetEventObject(this);
+ GtkSpinButton *gsb = GTK_SPIN_BUTTON(m_widget);
+ wxString val = wxGTK_CONV_BACK( gtk_entry_get_text( &gsb->entry ) );
+ evt.SetString( val );
+ if (GetEventHandler()->ProcessEvent(evt)) return;
+ }
+
+ event.Skip();
+}
+
+GdkWindow *wxSpinCtrl::GTKGetWindow(wxArrayGdkWindows& windows) const
+{
+ GtkSpinButton* spinbutton = GTK_SPIN_BUTTON(m_widget);
+
+ windows.push_back(spinbutton->entry.text_area);
+ windows.push_back(spinbutton->panel);
- gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
-
- // these two calls are required due to some bug in GTK
- Refresh();
- SetFocus();
+ return NULL;
}
-bool wxSpinCtrl::IsOwnGtkWindow( GdkWindow *window )
+wxSize wxSpinCtrl::DoGetBestSize() const
{
- return GTK_SPIN_BUTTON(m_widget)->panel == window;
+ wxSize ret( wxControl::DoGetBestSize() );
+ wxSize best(95, ret.y); // FIXME: 95?
+ CacheBestSize(best);
+ return best;
}
-void wxSpinCtrl::ApplyWidgetStyle()
+// static
+wxVisualAttributes
+wxSpinCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
{
- SetWidgetStyle();
- gtk_widget_set_style( m_widget, m_widgetStyle );
+ // TODO: overload to accept functions like gtk_spin_button_new?
+ // Until then use a similar type
+ return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true);
}
#endif
+ // wxUSE_SPINCTRL
projects / wxWidgets.git / blobdiff