more threds fixes, more threads tests - seems to work ok for non GUI case

[wxWidgets.git] / src / gtk1 / spinctrl.cpp

diff --git a/src/gtk1/spinctrl.cpp b/src/gtk1/spinctrl.cpp
index 5a46da4048f9191ebb37b4623d83bf04cd2418f4..6411633ad3f1ebc86b1d49ae7b8cc7751e00ede8 100644 (file)
--- a/src/gtk1/spinctrl.cpp
+++ b/src/gtk1/spinctrl.cpp
@@ -14,14 +14,15 @@
 
 #include "wx/spinctrl.h"
 
 
 #include "wx/spinctrl.h"
 

-#ifdef wxUSE_SPINBTN
+#if wxUSE_SPINCTRL

 
 #include "wx/utils.h"
 #include "wx/spinbutt.h"
 
 #include "wx/utils.h"
 #include "wx/spinbutt.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


@@ -67,7 +68,7 @@ static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win
     event.SetPosition( value );
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
     event.SetPosition( value );
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );

-    
+

     /* always send a thumbtrack event */
     if (command != wxEVT_SCROLL_THUMBTRACK)
     {
     /* always send a thumbtrack event */
     if (command != wxEVT_SCROLL_THUMBTRACK)
     {


@@ -97,6 +98,7 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
                         const wxString& name)
 {
     m_needParent = TRUE;
                         const wxString& name)
 {
     m_needParent = TRUE;

+    m_acceptsFocus = TRUE;

 
     wxSize new_size = size;
     if (new_size.y == -1)
 
     wxSize new_size = size;
     if (new_size.y == -1)


@@ -115,7 +117,8 @@ bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
 
     m_widget = gtk_spin_button_new( m_adjust, 1, 0 );
 
 
     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_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",


@@ -203,7 +206,7 @@ void wxSpinCtrl::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();
     // these two calls are required due to some bug in GTK
     Refresh();
     SetFocus();


@@ -219,7 +222,7 @@ void wxSpinCtrl::OnChar( wxKeyEvent &event )
         while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame))
             top_frame = top_frame->GetParent();
        GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
         while (top_frame->GetParent() && !(top_frame->GetParent()->m_isFrame))
             top_frame = top_frame->GetParent();
        GtkWindow *window = GTK_WINDOW(top_frame->m_widget);

-       
+

        if (window->default_widget)
         {
             gtk_widget_activate (window->default_widget);
        if (window->default_widget)
         {
             gtk_widget_activate (window->default_widget);


@@ -242,3 +245,4 @@ void wxSpinCtrl::ApplyWidgetStyle()
 }
 
 #endif
 }
 
 #endif

+   // wxUSE_SPINCTRL