From: Robert Roebling <robert@roebling.de>
Date: Thu, 21 Oct 1999 14:53:42 +0000 (+0000)
Subject:   wxSlider should now display int values,
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/572c6194d35ad2791c71aee05d6996da2761b07a

  wxSlider should now display int values,
  Corrected garbage deletion in dnd sample.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index f0fe76f904..eee1decc30 100644
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -1185,8 +1185,6 @@ DnDShapeFrame::DnDShapeFrame(wxFrame *parent)
              : wxFrame(parent, -1, "Shape Frame",
                        wxDefaultPosition, wxSize(250, 150))
 {
-    SetBackgroundColour(*wxWHITE);
-
     CreateStatusBar();
 
     wxMenu *menuShape = new wxMenu;
@@ -1210,16 +1208,20 @@ DnDShapeFrame::DnDShapeFrame(wxFrame *parent)
     SetDropTarget(new DnDShapeDropTarget(this));
 
     m_shape = NULL;
+    
+    SetBackgroundColour(*wxWHITE);
 }
 
 DnDShapeFrame::~DnDShapeFrame()
 {
-    delete m_shape;
+    if (m_shape) 
+        delete m_shape;
 }
 
 void DnDShapeFrame::SetShape(DnDShape *shape)
 {
-    delete m_shape;
+    if (m_shape) 
+        delete m_shape;
     m_shape = shape;
     Refresh();
 }
diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index c611e0e480..996c428eaa 100644
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -112,6 +112,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     if (style & wxSL_LABELS)
     {
         gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE );
+	gtk_scale_set_digits( GTK_SCALE( m_widget ), 0 );
 
         /* labels need more space and too small window will
            cause junk to appear on the dialog */
diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index c611e0e480..996c428eaa 100644
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -112,6 +112,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id,
     if (style & wxSL_LABELS)
     {
         gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE );
+	gtk_scale_set_digits( GTK_SCALE( m_widget ), 0 );
 
         /* labels need more space and too small window will
            cause junk to appear on the dialog */