Changed two conflicting defines in defs.h

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

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index 504b1cfb5ac895ac50bff146ab70f9d85a8fa289..c611e0e480b3c84759d8cb82656cb5425835601e 100644 (file)
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -38,39 +38,36 @@ extern bool   g_blockEventsOnDrag;
 // "value_changed"
 //-----------------------------------------------------------------------------
 
 // "value_changed"
 //-----------------------------------------------------------------------------
 

-static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
-{ 
+static void gtk_slider_callback( GtkAdjustment *adjust, wxSlider *win )
+{

     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!win->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;

-    
-    float diff = win->m_adjust->value - win->m_oldPos;
+
+    float diff = adjust->value - win->m_oldPos;

     if (fabs(diff) < 0.2) return;
     if (fabs(diff) < 0.2) return;

-    win->m_oldPos = win->m_adjust->value;
-  
-    wxEventType command = wxEVT_NULL;
-  
-    float line_step = win->m_adjust->step_increment;
-    float page_step = win->m_adjust->page_increment;
-  
-    if (fabs(win->m_adjust->value-win->m_adjust->lower) < 0.2) command = wxEVT_SCROLL_BOTTOM;
-    else if (fabs(win->m_adjust->value-win->m_adjust->upper) < 0.2) command = wxEVT_SCROLL_TOP;
-    else if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
-    else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
-    else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
-    else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
-    else command = wxEVT_SCROLL_THUMBTRACK;
-
-    int value = (int)ceil(win->m_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;
+
+    int value = (int)ceil(adjust->value);
+

     int orient = wxHORIZONTAL;
     int orient = wxHORIZONTAL;

-    if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
-  
+    if ( (win->GetWindowStyleFlag() & wxSB_VERTICAL) == wxSB_VERTICAL)
+        orient = wxVERTICAL;
+

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

-  
+

     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
     cevent.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( cevent );
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
     cevent.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( cevent );


@@ -97,10 +94,13 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
 {
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;
 {
     m_acceptsFocus = TRUE;
     m_needParent = TRUE;

-  
-    PreCreation( parent, id, pos, size, style, name );
-  
-    SetValidator( validator );
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxSlider creation failed") );
+       return FALSE;
+    }

 
     m_oldPos = 0.0;
 
 
     m_oldPos = 0.0;
 


@@ -108,11 +108,11 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
     else
         m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
         m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
     else
         m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );

-    
+

     if (style & wxSL_LABELS)
     {
         gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE );
     if (style & wxSL_LABELS)
     {
         gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE );

-        
+

         /* labels need more space and too small window will
            cause junk to appear on the dialog */
         if (style & wxSL_VERTICAL)
         /* labels need more space and too small window will
            cause junk to appear on the dialog */
         if (style & wxSL_VERTICAL)


@@ -138,23 +138,23 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         gtk_scale_set_draw_value( GTK_SCALE( m_widget ), FALSE );
 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
         gtk_scale_set_draw_value( GTK_SCALE( m_widget ), FALSE );
 
     m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );

-  
-    gtk_signal_connect( GTK_OBJECT(m_adjust), 
+
+    gtk_signal_connect( GTK_OBJECT(m_adjust),

                         "value_changed",
                         "value_changed",

-                        (GtkSignalFunc) gtk_slider_callback, 
+                        (GtkSignalFunc) gtk_slider_callback,

                         (gpointer) this );
                         (gpointer) this );

-        
+

     SetRange( minValue, maxValue );
     SetValue( value );
     SetRange( minValue, maxValue );
     SetValue( value );

-  
+

     m_parent->DoAddChild( this );
     m_parent->DoAddChild( this );

-  
+

     PostCreation();
     PostCreation();

-  
+

     SetBackgroundColour( parent->GetBackgroundColour() );
 
     Show( TRUE );
     SetBackgroundColour( parent->GetBackgroundColour() );
 
     Show( TRUE );

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -168,9 +168,9 @@ void wxSlider::SetValue( int value )
     float fpos = (float)value;
     m_oldPos = fpos;
     if (fabs(fpos-m_adjust->value) < 0.2) return;
     float fpos = (float)value;
     m_oldPos = fpos;
     if (fabs(fpos-m_adjust->value) < 0.2) return;

-    
+

     m_adjust->value = fpos;
     m_adjust->value = fpos;

-  
+

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


@@ -178,13 +178,13 @@ void wxSlider::SetRange( int minValue, int maxValue )
 {
     float fmin = (float)minValue;
     float fmax = (float)maxValue;
 {
     float fmin = (float)minValue;
     float fmax = (float)maxValue;

-      
+

     if ((fabs(fmin-m_adjust->lower) < 0.2) &&
         (fabs(fmax-m_adjust->upper) < 0.2))
     {
         return;
     }
     if ((fabs(fmin-m_adjust->lower) < 0.2) &&
         (fabs(fmax-m_adjust->upper) < 0.2))
     {
         return;
     }

-      
+

     m_adjust->lower = fmin;
     m_adjust->upper = fmax;
 
     m_adjust->lower = fmin;
     m_adjust->upper = fmax;
 


@@ -204,9 +204,9 @@ int wxSlider::GetMax(void) const
 void wxSlider::SetPageSize( int pageSize )
 {
     float fpage = (float)pageSize;
 void wxSlider::SetPageSize( int pageSize )
 {
     float fpage = (float)pageSize;

-      
+

     if (fabs(fpage-m_adjust->page_increment) < 0.2) return;
     if (fabs(fpage-m_adjust->page_increment) < 0.2) return;

-      
+

     m_adjust->page_increment = fpage;
 
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
     m_adjust->page_increment = fpage;
 
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );


@@ -220,9 +220,9 @@ int wxSlider::GetPageSize(void) const
 void wxSlider::SetThumbLength( int len )
 {
     float flen = (float)len;
 void wxSlider::SetThumbLength( int len )
 {
     float flen = (float)len;

-      
+

     if (fabs(flen-m_adjust->page_size) < 0.2) return;
     if (fabs(flen-m_adjust->page_size) < 0.2) return;

-      
+

     m_adjust->page_size = flen;
 
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
     m_adjust->page_size = flen;
 
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );