add strike-through font support to wxGraphicsContext on GTK

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

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index ddeb7570c7218d567fb530d747f819727f95cc02..c0187f3cca408d19bea62a248b6b89a680fc6ba3 100644 (file)
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -44,13 +44,6 @@ static inline bool AreSameAdjustValues(double x, double y)
     return fabs(x - y) < 0.02;
 }
 
     return fabs(x - y) < 0.02;
 }
 

-static inline int AdjustValueToInt(double x)
-{
-    // we want to round to the nearest integer, i.e. 0.9 is rounded to 1 and
-    // -0.9 is rounded to -1
-    return (int)(x < 0 ? x - 0.5 : x + 0.5);
-}
-

 // process a scroll event
 static void
 ProcessScrollEvent(wxSlider *win, wxEventType evtType, double dvalue)
 // process a scroll event
 static void
 ProcessScrollEvent(wxSlider *win, wxEventType evtType, double dvalue)


@@ -61,19 +54,19 @@ ProcessScrollEvent(wxSlider *win, wxEventType evtType, double dvalue)
     int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
     wxScrollEvent event( evtType, win->GetId(), value, orient );
     event.SetEventObject( win );
     int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
     wxScrollEvent event( evtType, win->GetId(), value, orient );
     event.SetEventObject( win );

-    win->GetEventHandler()->ProcessEvent( event );
+    win->HandleWindowEvent( event );

 
     if ( evtType != wxEVT_SCROLL_THUMBTRACK )
     {
         wxScrollEvent event2(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
         event2.SetEventObject( win );
 
     if ( evtType != wxEVT_SCROLL_THUMBTRACK )
     {
         wxScrollEvent event2(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
         event2.SetEventObject( win );

-        win->GetEventHandler()->ProcessEvent( event2 );
+        win->HandleWindowEvent( event2 );

     }
 
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
     cevent.SetEventObject( win );
     cevent.SetInt( value );
     }
 
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
     cevent.SetEventObject( win );
     cevent.SetInt( value );

-    win->GetEventHandler()->ProcessEvent( cevent );
+    win->HandleWindowEvent( cevent );

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


@@ -132,8 +125,6 @@ static gint gtk_slider_button_release_callback( GtkWidget *scale,
 // wxSlider
 //-----------------------------------------------------------------------------
 
 // wxSlider
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
-

 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos, const wxSize& size,
 bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         int value, int minValue, int maxValue,
         const wxPoint& pos, const wxSize& size,


@@ -152,9 +143,9 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     m_oldPos = 0.0;
 
     if (style & wxSL_VERTICAL)
     m_oldPos = 0.0;
 
     if (style & wxSL_VERTICAL)

-        m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
+        m_widget = gtk_vscale_new( NULL );

     else
     else

-        m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
+        m_widget = gtk_hscale_new( NULL );

 
     if (style & wxSL_LABELS)
     {
 
     if (style & wxSL_LABELS)
     {


@@ -209,7 +200,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
 int wxSlider::GetValue() const
 {
 
 int wxSlider::GetValue() const
 {

-    return AdjustValueToInt(m_adjust->value);
+    return wxRound(m_adjust->value);

 }
 
 void wxSlider::SetValue( int value )
 }
 
 void wxSlider::SetValue( int value )