Crash fix under VC++

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

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index 00a061af9ed749a9fbc2a8a47edfb6269cf6a621..bcd260ad6eeeb5c596cdec3f70099a5311205d04 100644 (file)
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -1,16 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        slider.cpp
+// Name:        gtk/slider.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:           wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "slider.h"
 #endif
 
 #pragma implementation "slider.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/slider.h"
 
 #if wxUSE_SLIDER
 #include "wx/slider.h"
 
 #if wxUSE_SLIDER


@@ -19,8 +22,7 @@
 
 #include <math.h>
 
 
 #include <math.h>
 

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

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


@@ -33,7 +35,7 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern bool   g_blockEventsOnDrag;
+extern bool g_blockEventsOnDrag;

 
 static const float sensitivity = 0.02;
 
 
 static const float sensitivity = 0.02;
 


@@ -41,7 +43,9 @@ static const float sensitivity = 0.02;
 // "value_changed"
 //-----------------------------------------------------------------------------
 
 // "value_changed"
 //-----------------------------------------------------------------------------
 

-static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
+static void gtk_slider_callback( GtkAdjustment *adjust,
+                                 SCROLLBAR_CBACK_ARG
+                                 wxSlider *win )

 {
     if (g_isIdle) wxapp_install_idle_handler();
 
 {
     if (g_isIdle) wxapp_install_idle_handler();
 


@@ -53,20 +57,13 @@ static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
 
     win->m_oldPos = adjust->value;
 
 
     win->m_oldPos = adjust->value;
 

-    GtkRange *range = GTK_RANGE( win->m_widget );
-
-    wxEventType command = wxEVT_SCROLL_THUMBTRACK;
-    if      (range->scroll_type == GTK_SCROLL_STEP_BACKWARD) command = wxEVT_SCROLL_LINEUP;
-    else if (range->scroll_type == GTK_SCROLL_STEP_FORWARD)  command = wxEVT_SCROLL_LINEDOWN;
-    else if (range->scroll_type == GTK_SCROLL_PAGE_BACKWARD) command = wxEVT_SCROLL_PAGEUP;
-    else if (range->scroll_type == GTK_SCROLL_PAGE_FORWARD)  command = wxEVT_SCROLL_PAGEDOWN;
+    wxEventType command = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget));

 
     double dvalue = adjust->value;
     int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
 
 
     double dvalue = adjust->value;
     int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
 

-    int orient = wxHORIZONTAL;
-    if ( (win->GetWindowStyleFlag() & wxSB_VERTICAL) == wxSB_VERTICAL)
-        orient = wxVERTICAL;
+    int orient = win->GetWindowStyleFlag() & wxSL_VERTICAL ? wxVERTICAL
+                                                           : wxHORIZONTAL;

 
     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );
 
     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );


@@ -137,21 +134,14 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
 
 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
 

-    gtk_signal_connect( GTK_OBJECT(m_adjust),
-                        "value_changed",
-                        (GtkSignalFunc) gtk_slider_callback,
-                        (gpointer) this );
+    GtkEnableEvents();

 
     SetRange( minValue, maxValue );
     SetValue( value );
 
     m_parent->DoAddChild( this );
 
 
     SetRange( minValue, maxValue );
     SetValue( value );
 
     m_parent->DoAddChild( this );
 

-    PostCreation();
-
-    SetBackgroundColour( parent->GetBackgroundColour() );
-
-    Show( TRUE );
+    PostCreation(size);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -172,7 +162,11 @@ void wxSlider::SetValue( int value )
 
     m_adjust->value = fpos;
 
 
     m_adjust->value = fpos;
 

+    GtkDisableEvents();
+    

     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );

+    
+    GtkEnableEvents();

 }
 
 void wxSlider::SetRange( int minValue, int maxValue )
 }
 
 void wxSlider::SetRange( int minValue, int maxValue )


@@ -191,7 +185,11 @@ void wxSlider::SetRange( int minValue, int maxValue )
     m_adjust->step_increment = 1.0;
     m_adjust->page_increment = ceil((fmax-fmin) / 10.0);
 
     m_adjust->step_increment = 1.0;
     m_adjust->page_increment = ceil((fmax-fmin) / 10.0);
 

+    GtkDisableEvents();
+    

     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

+    
+    GtkEnableEvents();

 }
 
 int wxSlider::GetMin() const
 }
 
 int wxSlider::GetMin() const


@@ -212,7 +210,11 @@ void wxSlider::SetPageSize( int pageSize )
 
     m_adjust->page_increment = fpage;
 
 
     m_adjust->page_increment = fpage;
 

+    GtkDisableEvents();
+    

     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

+    
+    GtkEnableEvents();

 }
 
 int wxSlider::GetPageSize() const
 }
 
 int wxSlider::GetPageSize() const


@@ -228,7 +230,11 @@ void wxSlider::SetThumbLength( int len )
 
     m_adjust->page_size = flen;
 
 
     m_adjust->page_size = flen;
 

+    GtkDisableEvents();
+    

     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );

+    
+    GtkEnableEvents();

 }
 
 int wxSlider::GetThumbLength() const
 }
 
 int wxSlider::GetThumbLength() const


@@ -245,55 +251,40 @@ int wxSlider::GetLineSize() const
     return 0;
 }
 
     return 0;
 }
 

-void wxSlider::SetTick( int WXUNUSED(tickPos) )
-{
-}
-
-void wxSlider::SetTickFreq( int WXUNUSED(n), int WXUNUSED(pos) )
-{
-}
-
-int wxSlider::GetTickFreq() const
-{
-    return 0;
-}
-
-void wxSlider::ClearTicks()
-{
-}
-
-void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) )
-{
-}
-
-int wxSlider::GetSelEnd() const
-{
-    return 0;
-}
-
-int wxSlider::GetSelStart() const
+bool wxSlider::IsOwnGtkWindow( GdkWindow *window )

 {
 {

-    return 0;
+    GtkRange *range = GTK_RANGE(m_widget);
+#ifdef __WXGTK20__
+    return (range->event_window == window);
+#else
+    return ( (window == GTK_WIDGET(range)->window)
+                || (window == range->trough)
+                || (window == range->slider)
+                || (window == range->step_forw)
+                || (window == range->step_back) );
+#endif

 }
 
 }
 

-void wxSlider::ClearSel()
+void wxSlider::GtkDisableEvents()

 {
 {

+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),
+                        GTK_SIGNAL_FUNC(gtk_slider_callback),
+                        (gpointer) this );

 }
 
 }
 

-bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
+void wxSlider::GtkEnableEvents()

 {
 {

-    GtkRange *range = GTK_RANGE(m_widget);
-    return ( (window == GTK_WIDGET(range)->window) ||
-             (window == range->trough) ||
-             (window == range->slider) ||
-             (window == range->step_forw) ||
-             (window == range->step_back) );
+    gtk_signal_connect( GTK_OBJECT (m_adjust),
+                        "value_changed",
+                        GTK_SIGNAL_FUNC(gtk_slider_callback),
+                        (gpointer) this );

 }
 
 }
 

-void wxSlider::ApplyWidgetStyle()
+// static
+wxVisualAttributes
+wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    return GetDefaultAttributesFromGTKWidget(gtk_vscale_new);

 }
 
 #endif
 }
 
 #endif