Compilation fix,

[wxWidgets.git] / src / gtk / spinbutt.cpp

diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 239a565cd75a26d47bb8cdca29057125cd9d71aa..2ecf6885e41b4af0baae4cb12dfe089c04e201f1 100644 (file)
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -13,11 +13,15 @@
 #endif
 
 #include "wx/spinbutt.h"
 #endif
 
 #include "wx/spinbutt.h"

+
+#ifdef wxUSE_SPINBTN
+

 #include "wx/utils.h"
 #include "wx/utils.h"

+

 #include <math.h>
 
 #include <math.h>
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -32,7 +36,7 @@ extern bool g_isIdle;
 
 extern bool   g_blockEventsOnDrag;
 
 
 extern bool   g_blockEventsOnDrag;
 

-static const float sensitivity = 0.2;
+static const float sensitivity = 0.02;

 
 //-----------------------------------------------------------------------------
 // "value_changed"
 
 //-----------------------------------------------------------------------------
 // "value_changed"


@@ -42,7 +46,7 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 

-    if (!win->HasVMT()) return;
+    if (!win->m_hasVMT) return;

     if (g_blockEventsOnDrag) return;
 
     float diff = win->m_adjust->value - win->m_oldPos;
     if (g_blockEventsOnDrag) return;
 
     float diff = win->m_adjust->value - win->m_oldPos;


@@ -52,22 +56,27 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
     wxEventType command = wxEVT_NULL;
 
     float line_step = win->m_adjust->step_increment;
     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;
 
     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;

     else command = wxEVT_SCROLL_THUMBTRACK;
 
     int value = (int)ceil(win->m_adjust->value);
 
     wxSpinEvent event( command, win->GetId());
     event.SetPosition( value );
     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 );
     event.SetEventObject( win );

-

     win->GetEventHandler()->ProcessEvent( event );
     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 );
+    }

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -75,28 +84,33 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)

+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);

 
 BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
     EVT_SIZE(wxSpinButton::OnSize)
 END_EVENT_TABLE()
 
 
 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;
 
 {
     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)
     if (new_size.y == -1)

-        new_size.y = 30;
+        new_size.y = sizeBest.y;

 
 

-    PreCreation( parent, id, pos, new_size, style, name );
-
-//  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_oldPos = 0.0;
 


@@ -104,7 +118,8 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
 
     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),
+                              (int)(m_windowStyle & wxSP_WRAP) );

 
     gtk_signal_connect( GTK_OBJECT (m_adjust),
                         "value_changed",
 
     gtk_signal_connect( GTK_OBJECT (m_adjust),
                         "value_changed",


@@ -122,34 +137,30 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
     return TRUE;
 }
 
     return TRUE;
 }
 

-wxSpinButton::~wxSpinButton()
-{
-}
-

 int wxSpinButton::GetMin() const
 {
 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
 {
 
     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
 {
 
     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 )
 {
 
     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;
 
     float fpos = (float)value;
     m_oldPos = fpos;


@@ -162,7 +173,7 @@ void wxSpinButton::SetValue( int value )
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
 
 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;
 
     float fmin = (float)minVal;
     float fmax = (float)maxVal;


@@ -177,13 +188,17 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
     m_adjust->upper = fmax;
 
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
     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) )
 {
 }
 
 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 );
 }
 
     gtk_widget_set_usize( m_widget, m_width, m_height );
 }
 


@@ -198,13 +213,9 @@ void wxSpinButton::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
     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