SetMenuBar potential memory leak fixed; added wxTAB_TRAVERSAL as dummy (0) style

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

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index 5f9c8915b66b13acfc924024aafeab4e7e2a8924..5d115ba3b87651642e5bc06a620f8110a31d909a 100644 (file)
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -12,12 +12,22 @@
 #endif
 
 #include "wx/slider.h"
 #endif
 
 #include "wx/slider.h"

+
+#if wxUSE_SLIDER
+

 #include "wx/utils.h"
 #include <math.h>
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "wx/utils.h"
 #include <math.h>
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 

+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -30,11 +40,14 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
 { 
 
 static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
 { 

-    if (!win->HasVMT()) 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;
     if (fabs(diff) < 0.2) return;
     if (g_blockEventsOnDrag) return;
     
     float diff = win->m_adjust->value - win->m_oldPos;
     if (fabs(diff) < 0.2) return;

+    win->m_oldPos = win->m_adjust->value;

   
     wxEventType command = wxEVT_NULL;
   
   
     wxEventType command = wxEVT_NULL;
   


@@ -49,18 +62,18 @@ static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
     else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
     else command = wxEVT_SCROLL_THUMBTRACK;
 
     else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
     else command = wxEVT_SCROLL_THUMBTRACK;
 

-    int value = (int)(win->m_adjust->value+0.5);
+    int value = (int)ceil(win->m_adjust->value);

       
     int orient = wxHORIZONTAL;
     if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
   
     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );
       
     int orient = wxHORIZONTAL;
     if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
   
     wxScrollEvent event( command, win->GetId(), value, orient );
     event.SetEventObject( win );

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

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

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

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


@@ -85,32 +98,59 @@ 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( _T("wxSlider creation failed") );
+       return FALSE;
+    }

 
     m_oldPos = 0.0;
 
 
     m_oldPos = 0.0;
 

-    if (style & wxSL_VERTICAL == wxSL_VERTICAL)
-        m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
-    else
+    if (style & wxSL_VERTICAL)

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

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

     
     

-    gtk_scale_set_draw_value( GTK_SCALE( m_widget ), FALSE );
-  
+    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)
+        {
+            wxSize sz( size );
+            if (sz.x < 35)
+            {
+                sz.x = 35;
+                SetSize( sz );
+            }
+        }
+        else
+        {
+            wxSize sz( size );
+            if (sz.y < 35)
+            {
+                sz.y = 35;
+                SetSize( sz );
+            }
+        }
+    }
+    else
+        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), 
                         "value_changed",
     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 );
-       
+                        (GtkSignalFunc) gtk_slider_callback, 
+                        (gpointer) this );
+        

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

-    m_parent->AddChild( this );
-
-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );

   
     PostCreation();
   
   
     PostCreation();
   


@@ -156,12 +196,12 @@ void wxSlider::SetRange( int minValue, int maxValue )
 
 int wxSlider::GetMin(void) const
 {
 
 int wxSlider::GetMin(void) const
 {

-    return (int)(m_adjust->lower+0.5);
+    return (int)ceil(m_adjust->lower);

 }
 
 int wxSlider::GetMax(void) const
 {
 }
 
 int wxSlider::GetMax(void) const
 {

-    return (int)(m_adjust->upper+0.5);
+    return (int)ceil(m_adjust->upper);

 }
 
 void wxSlider::SetPageSize( int pageSize )
 }
 
 void wxSlider::SetPageSize( int pageSize )


@@ -177,7 +217,7 @@ void wxSlider::SetPageSize( int pageSize )
 
 int wxSlider::GetPageSize(void) const
 {
 
 int wxSlider::GetPageSize(void) const
 {

-    return (int)(m_adjust->page_increment+0.5);
+    return (int)ceil(m_adjust->page_increment);

 }
 
 void wxSlider::SetThumbLength( int len )
 }
 
 void wxSlider::SetThumbLength( int len )


@@ -193,7 +233,7 @@ void wxSlider::SetThumbLength( int len )
 
 int wxSlider::GetThumbLength(void) const
 {
 
 int wxSlider::GetThumbLength(void) const
 {

-    return (int)(m_adjust->page_size+0.5);
+    return (int)ceil(m_adjust->page_size);

 }
 
 void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
 }
 
 void wxSlider::SetLineSize( int WXUNUSED(lineSize) )


@@ -245,9 +285,9 @@ bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
     GtkRange *range = GTK_RANGE(m_widget);
     return ( (window == GTK_WIDGET(range)->window) ||
              (window == range->trough) ||
     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) );
+             (window == range->slider) ||
+             (window == range->step_forw) ||
+             (window == range->step_back) );

 }
 
 void wxSlider::ApplyWidgetStyle()
 }
 
 void wxSlider::ApplyWidgetStyle()


@@ -255,3 +295,5 @@ void wxSlider::ApplyWidgetStyle()
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }

+
+#endif