SetLabel() adjusts the label size

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

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 08a4da1d1956fc0c097177709d6f533452f6afdd..a9a4e9a7d33c859d4f67fc9a912c2b4bd1e008b0 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -50,7 +50,7 @@ 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;
       
     int orient = wxHORIZONTAL;
     if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;


@@ -157,12 +157,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 )


@@ -178,7 +178,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 )


@@ -194,7 +194,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) )