Added spinbutton

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/spinbutt.h b/include/wx/gtk/spinbutt.h
new file mode 100644 (file)
index 0000000..4192465
--- /dev/null
+++ b/include/wx/gtk/spinbutt.h
@@ -0,0 +1,98 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        spinbutt.h
+// Purpose:     wxSpinButton class
+// Author:      Robert Roebling
+// Modified by:
+// RCS-ID:      $Id$
+// Copyright:   (c) Robert Roebling
+// Licence:    wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __GTKSPINPUTTH__
+#define __GTKSPINBUTTH__
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/control.h"
+
+//-----------------------------------------------------------------------------
+// classes
+//-----------------------------------------------------------------------------
+
+class wxSpinButton;
+class wxSpinEvent;
+
+//-----------------------------------------------------------------------------
+// wxSpinButton
+//-----------------------------------------------------------------------------
+
+class wxSpinButton : public wxControl
+{
+  DECLARE_DYNAMIC_CLASS(wxSpinButton)
+ 
+public:
+  wxSpinButton();
+  inline wxSpinButton( wxWindow *parent, wxWindowID id = -1, 
+                      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+                      long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton")
+  {
+    Create(parent, id, pos, size, style, name);
+  }
+  ~wxSpinButton();
+  bool Create( wxWindow *parent, wxWindowID id = -1, 
+               const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+               long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton" );
+
+  int GetValue() const;
+  void SetValue( int value );
+  void SetRange( int minVal, int maxVal );
+  int GetMin() const;
+  int GetMax() const;
+
+// implementation
+
+  void OnSize( wxSizeEvent &event );  
+  
+  bool IsOwnGtkWindow( GdkWindow *window );
+  void ApplyWidgetStyle();
+    
+  GtkAdjustment  *m_adjust;
+  float           m_oldPos;
+  
+  DECLARE_EVENT_TABLE();
+};
+
+//-----------------------------------------------------------------------------
+// wxSpinEvent
+//-----------------------------------------------------------------------------
+
+class wxSpinEvent : public wxScrollEvent
+{
+  DECLARE_DYNAMIC_CLASS(wxSpinEvent)
+
+public:
+  wxSpinEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
+};
+
+typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
+
+// Spin events
+
+#define EVT_SPIN_UP(id, func) { wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func }
+#define EVT_SPIN_DOWN(id, func) { wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func }
+
+#define EVT_SPIN(id, func) \
+  { wxEVT_SCROLL_TOP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
+  { wxEVT_SCROLL_BOTTOM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
+  { wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
+  { wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
+  { wxEVT_SCROLL_PAGEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
+  { wxEVT_SCROLL_PAGEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
+  { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },
+
+#endif
+    // __GTKSPINBUTTH__

diff --git a/include/wx/gtk1/spinbutt.h b/include/wx/gtk1/spinbutt.h
new file mode 100644 (file)
index 0000000..4192465
--- /dev/null
+++ b/include/wx/gtk1/spinbutt.h
@@ -0,0 +1,98 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        spinbutt.h
+// Purpose:     wxSpinButton class
+// Author:      Robert Roebling
+// Modified by:
+// RCS-ID:      $Id$
+// Copyright:   (c) Robert Roebling
+// Licence:    wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __GTKSPINPUTTH__
+#define __GTKSPINBUTTH__
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/control.h"
+
+//-----------------------------------------------------------------------------
+// classes
+//-----------------------------------------------------------------------------
+
+class wxSpinButton;
+class wxSpinEvent;
+
+//-----------------------------------------------------------------------------
+// wxSpinButton
+//-----------------------------------------------------------------------------
+
+class wxSpinButton : public wxControl
+{
+  DECLARE_DYNAMIC_CLASS(wxSpinButton)
+ 
+public:
+  wxSpinButton();
+  inline wxSpinButton( wxWindow *parent, wxWindowID id = -1, 
+                      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+                      long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton")
+  {
+    Create(parent, id, pos, size, style, name);
+  }
+  ~wxSpinButton();
+  bool Create( wxWindow *parent, wxWindowID id = -1, 
+               const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+               long style = wxSP_VERTICAL, const wxString& name = "wxSpinButton" );
+
+  int GetValue() const;
+  void SetValue( int value );
+  void SetRange( int minVal, int maxVal );
+  int GetMin() const;
+  int GetMax() const;
+
+// implementation
+
+  void OnSize( wxSizeEvent &event );  
+  
+  bool IsOwnGtkWindow( GdkWindow *window );
+  void ApplyWidgetStyle();
+    
+  GtkAdjustment  *m_adjust;
+  float           m_oldPos;
+  
+  DECLARE_EVENT_TABLE();
+};
+
+//-----------------------------------------------------------------------------
+// wxSpinEvent
+//-----------------------------------------------------------------------------
+
+class wxSpinEvent : public wxScrollEvent
+{
+  DECLARE_DYNAMIC_CLASS(wxSpinEvent)
+
+public:
+  wxSpinEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
+};
+
+typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
+
+// Spin events
+
+#define EVT_SPIN_UP(id, func) { wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func }
+#define EVT_SPIN_DOWN(id, func) { wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func }
+
+#define EVT_SPIN(id, func) \
+  { wxEVT_SCROLL_TOP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
+  { wxEVT_SCROLL_BOTTOM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
+  { wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
+  { wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
+  { wxEVT_SCROLL_PAGEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
+  { wxEVT_SCROLL_PAGEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },\
+  { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },
+
+#endif
+    // __GTKSPINBUTTH__

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
new file mode 100644 (file)
index 0000000..83eb28e
--- /dev/null
+++ b/src/gtk/spinbutt.cpp
@@ -0,0 +1,192 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        spinbutt.cpp
+// Purpose:     wxSpinButton
+// Author:      Robert
+// Modified by:
+// RCS-ID:      $Id$
+// Copyright:   (c) Robert Roebling
+// Licence:    wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "spinbutt.h"
+#endif
+
+#include "wx/spinbutt.h"
+#include "wx/utils.h"
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+
+//-----------------------------------------------------------------------------
+// "value_changed"
+//-----------------------------------------------------------------------------
+
+static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win )
+{ 
+  if (!win->HasVMT()) return;
+  if (g_blockEventsOnDrag) return;
+  
+  float diff = win->m_adjust->value - win->m_oldPos;
+  if (fabs(diff) < 0.2) return;
+  
+  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) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
+  else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
+  else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
+  else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
+  else command = wxEVT_SCROLL_THUMBTRACK;
+
+  int value = (int)(win->m_adjust->value+0.5);
+      
+  wxSpinEvent event( command, win->GetId());
+  event.SetPosition( value );
+  event.SetOrientation( wxVERTICAL );
+  event.SetEventObject( win );
+  
+  win->ProcessEvent( event );
+}
+
+//-----------------------------------------------------------------------------
+// wxSpinButton
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)
+
+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)
+{
+  m_needParent = TRUE;
+  
+  wxSize new_size = size;
+  new_size.x = 16;
+  if (new_size.y == -1) new_size.y = 30;
+  
+  PreCreation( parent, id, pos, new_size, style, name );
+  
+//  SetValidator( validator );
+
+  m_oldPos = 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 );
+    
+  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_spinbutt_callback, (gpointer) this );
+  
+  m_parent->AddChild( this );
+
+  (m_parent->m_insertCallback)( m_parent, this );
+  
+  PostCreation();
+  
+  SetBackgroundColour( parent->GetBackgroundColour() );
+
+  Show( TRUE );
+    
+  return TRUE;
+}
+
+wxSpinButton::~wxSpinButton()
+{
+}
+
+int wxSpinButton::GetMin() const
+{
+  wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+  
+  return (int)(m_adjust->lower+0.5);
+}
+
+int wxSpinButton::GetMax() const
+{
+  wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+  
+  return (int)(m_adjust->upper+0.5);
+}
+
+int wxSpinButton::GetValue() const
+{
+  wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+  
+  return (int)(m_adjust->value+0.5);
+}
+
+void wxSpinButton::SetValue( int value )
+{
+  wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+  
+  float fpos = (float)value;
+  m_oldPos = fpos;
+  if (fabs(fpos-m_adjust->value) < 0.2) return;
+  m_adjust->value = fpos;
+  
+  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+}
+
+void wxSpinButton::SetRange(int minVal, int maxVal)
+{
+  wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+  
+  float fmin = (float)minVal;
+  float fmax = (float)maxVal;
+      
+  if ((fabs(fmin-m_adjust->lower) < 0.2) &&
+      (fabs(fmax-m_adjust->upper) < 0.2))
+      return;
+      
+  m_adjust->lower = fmin;
+  m_adjust->upper = fmax;
+
+  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+}
+
+void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
+{
+  wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+  
+  m_width = 16;
+  gtk_widget_set_usize( m_widget, m_width, m_height );
+}
+
+bool wxSpinButton::IsOwnGtkWindow( GdkWindow *window )
+{
+  return GTK_SPIN_BUTTON(m_widget)->panel == window;
+}
+
+void wxSpinButton::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+}
+
+//-----------------------------------------------------------------------------
+// wxSpinEvent
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
+
+wxSpinEvent::wxSpinEvent(wxEventType commandType, int id):
+  wxScrollEvent(commandType, id)
+{
+}
+
+

diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp
new file mode 100644 (file)
index 0000000..83eb28e
--- /dev/null
+++ b/src/gtk1/spinbutt.cpp
@@ -0,0 +1,192 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        spinbutt.cpp
+// Purpose:     wxSpinButton
+// Author:      Robert
+// Modified by:
+// RCS-ID:      $Id$
+// Copyright:   (c) Robert Roebling
+// Licence:    wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "spinbutt.h"
+#endif
+
+#include "wx/spinbutt.h"
+#include "wx/utils.h"
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+
+//-----------------------------------------------------------------------------
+// "value_changed"
+//-----------------------------------------------------------------------------
+
+static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *win )
+{ 
+  if (!win->HasVMT()) return;
+  if (g_blockEventsOnDrag) return;
+  
+  float diff = win->m_adjust->value - win->m_oldPos;
+  if (fabs(diff) < 0.2) return;
+  
+  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) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
+  else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
+  else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
+  else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
+  else command = wxEVT_SCROLL_THUMBTRACK;
+
+  int value = (int)(win->m_adjust->value+0.5);
+      
+  wxSpinEvent event( command, win->GetId());
+  event.SetPosition( value );
+  event.SetOrientation( wxVERTICAL );
+  event.SetEventObject( win );
+  
+  win->ProcessEvent( event );
+}
+
+//-----------------------------------------------------------------------------
+// wxSpinButton
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)
+
+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)
+{
+  m_needParent = TRUE;
+  
+  wxSize new_size = size;
+  new_size.x = 16;
+  if (new_size.y == -1) new_size.y = 30;
+  
+  PreCreation( parent, id, pos, new_size, style, name );
+  
+//  SetValidator( validator );
+
+  m_oldPos = 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 );
+    
+  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_spinbutt_callback, (gpointer) this );
+  
+  m_parent->AddChild( this );
+
+  (m_parent->m_insertCallback)( m_parent, this );
+  
+  PostCreation();
+  
+  SetBackgroundColour( parent->GetBackgroundColour() );
+
+  Show( TRUE );
+    
+  return TRUE;
+}
+
+wxSpinButton::~wxSpinButton()
+{
+}
+
+int wxSpinButton::GetMin() const
+{
+  wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+  
+  return (int)(m_adjust->lower+0.5);
+}
+
+int wxSpinButton::GetMax() const
+{
+  wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+  
+  return (int)(m_adjust->upper+0.5);
+}
+
+int wxSpinButton::GetValue() const
+{
+  wxCHECK_MSG( (m_widget != NULL), 0, "invalid spin button" );
+  
+  return (int)(m_adjust->value+0.5);
+}
+
+void wxSpinButton::SetValue( int value )
+{
+  wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+  
+  float fpos = (float)value;
+  m_oldPos = fpos;
+  if (fabs(fpos-m_adjust->value) < 0.2) return;
+  m_adjust->value = fpos;
+  
+  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+}
+
+void wxSpinButton::SetRange(int minVal, int maxVal)
+{
+  wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+  
+  float fmin = (float)minVal;
+  float fmax = (float)maxVal;
+      
+  if ((fabs(fmin-m_adjust->lower) < 0.2) &&
+      (fabs(fmax-m_adjust->upper) < 0.2))
+      return;
+      
+  m_adjust->lower = fmin;
+  m_adjust->upper = fmax;
+
+  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+}
+
+void wxSpinButton::OnSize( wxSizeEvent &WXUNUSED(event) )
+{
+  wxCHECK_RET( (m_widget != NULL), "invalid spin button" );
+  
+  m_width = 16;
+  gtk_widget_set_usize( m_widget, m_width, m_height );
+}
+
+bool wxSpinButton::IsOwnGtkWindow( GdkWindow *window )
+{
+  return GTK_SPIN_BUTTON(m_widget)->panel == window;
+}
+
+void wxSpinButton::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+}
+
+//-----------------------------------------------------------------------------
+// wxSpinEvent
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
+
+wxSpinEvent::wxSpinEvent(wxEventType commandType, int id):
+  wxScrollEvent(commandType, id)
+{
+}
+
+