Added wxMenu::Delete() and fixed some menu deleted memory

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

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index fb6b989378e4ce4404e33ef5beccb3a5c226fdda..bdbc509ceb0e0ee9f61614f1b1417b265b06188c 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,6 +12,9 @@
 #endif
 
 #include "wx/slider.h"
 #endif
 
 #include "wx/slider.h"

+
+#if wxUSE_SLIDER
+

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


@@ -35,31 +38,27 @@ 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 (g_isIdle) wxapp_install_idle_handler();
 

-    if (!win->HasVMT()) return;
+    if (!win->m_hasVMT) return;

     if (g_blockEventsOnDrag) 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;
     if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
       
     int orient = wxHORIZONTAL;
     if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;


@@ -95,9 +94,12 @@ 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;
 


@@ -107,7 +109,30 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
         m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
     
     if (style & wxSL_LABELS)
         m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
     
     if (style & wxSL_LABELS)

+    {

         gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE );
         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 );
 
     else
         gtk_scale_set_draw_value( GTK_SCALE( m_widget ), FALSE );
 


@@ -115,15 +140,13 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
   
     gtk_signal_connect( GTK_OBJECT(m_adjust), 
                         "value_changed",
   
     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();
   


@@ -258,9 +281,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()


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

+
+#endif