Minor header cleaning.

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

diff --git a/src/gtk1/spinbutt.cpp b/src/gtk1/spinbutt.cpp
index 2ecf6885e41b4af0baae4cb12dfe089c04e201f1..84e55b4d933068a9b95ba5a3e3b9f99f8f8a1914 100644 (file)
--- a/src/gtk1/spinbutt.cpp
+++ b/src/gtk1/spinbutt.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        spinbutt.cpp
+// Name:        src/gtk1/spinbutt.cpp
 // Purpose:     wxSpinButton
 // Author:      Robert
 // Modified by:
@@ -8,20 +8,19 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "spinbutt.h"
-#endif
-
-#include "wx/spinbutt.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
-#ifdef wxUSE_SPINBTN
+#if wxUSE_SPINBTN
 
-#include "wx/utils.h"
+#include "wx/spinbutt.h"
 
-#include <math.h>
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/math.h"
+#endif
 
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -42,6 +41,7 @@ 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();
@@ -51,14 +51,13 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
 
     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);
@@ -66,8 +65,28 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
     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)
     {
@@ -78,13 +97,14 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
         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)
@@ -97,7 +117,7 @@ bool wxSpinButton::Create(wxWindow *parent,
                           long style,
                           const wxString& name)
 {
-    m_needParent = TRUE;
+    m_needParent = true;
 
     wxSize new_size = size,
            sizeBest = DoGetBestSize();
@@ -109,7 +129,7 @@ bool wxSpinButton::Create(wxWindow *parent,
         !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
     {
         wxFAIL_MSG( wxT("wxXX creation failed") );
-       return FALSE;
+        return false;
     }
 
     m_oldPos = 0.0;
@@ -128,13 +148,9 @@ bool wxSpinButton::Create(wxWindow *parent,
 
     m_parent->DoAddChild( this );
 
-    PostCreation();
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
+    PostCreation(new_size);
 
-    Show( TRUE );
-
-    return TRUE;
+    return true;
 }
 
 int wxSpinButton::GetMin() const
@@ -188,7 +204,7 @@ void wxSpinButton::SetRange(int minVal, int 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();
@@ -207,15 +223,20 @@ bool wxSpinButton::IsOwnGtkWindow( GdkWindow *window )
     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;
 }
 
-wxSize wxSpinButton::DoGetBestSize() const
+// static
+wxVisualAttributes
+wxSpinButton::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return wxSize(15, 26);
+    // TODO: overload to accept functions like gtk_spin_button_new?
+    // Until then use a similar type
+    return GetDefaultAttributesFromGTKWidget(gtk_button_new);
 }
 
-#endif
+#endif // wxUSE_SPINBTN