get rid of one of the extra slashes in the download URLs

[wxWidgets.git] / src / mac / carbon / slider.cpp

diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp
index a46467044f45906f6074149b8201e82ae98ed062..287bfe78abf4348a0e65cb878bdd826a34e0abd7 100644 (file)
--- a/src/mac/carbon/slider.cpp
+++ b/src/mac/carbon/slider.cpp
@@ -22,7 +22,6 @@ BEGIN_EVENT_TABLE(wxSlider, wxControl)
 END_EVENT_TABLE()
 
  // The dimensions of the different styles of sliders (from Aqua document)
 END_EVENT_TABLE()
 
  // The dimensions of the different styles of sliders (from Aqua document)

-#define wxSLIDER_DIMENSIONACROSS 15

 #define wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS 24
 #define wxSLIDER_DIMENSIONACROSS_ARROW 18
 
 #define wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS 24
 #define wxSLIDER_DIMENSIONACROSS_ARROW 18
 


@@ -346,9 +345,15 @@ void wxSlider::DoSetSizeHints( int minW, int minH,
     wxSize size = GetBestSize();
 
     if (GetWindowStyle() & wxSL_VERTICAL)
     wxSize size = GetBestSize();
 
     if (GetWindowStyle() & wxSL_VERTICAL)

-        wxWindow::DoSetSizeHints(size.x, minH, size.x, maxH, incW, incH);
+    {
+        SetMinSize( wxSize(size.x,minH) );
+        SetMaxSize( wxSize(size.x,maxH) );
+    }

     else
     else

-        wxWindow::DoSetSizeHints(minW, size.y, maxW, size.y, incW, incH);
+    {
+        SetMinSize( wxSize(minW,size.y) );
+        SetMaxSize( wxSize(maxW,size.y) );
+    }

 }
 
 wxSize wxSlider::DoGetBestSize() const
 }
 
 wxSize wxSlider::DoGetBestSize() const


@@ -416,13 +421,11 @@ wxSize wxSlider::DoGetBestSize() const
 
 void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
 {
 
 void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags)
 {

-    int xborder, yborder;
+    int yborder = 0;

     int minValWidth, maxValWidth, textheight;
     int sliderBreadth;
     int width = w;
 
     int minValWidth, maxValWidth, textheight;
     int sliderBreadth;
     int width = w;
 

-    xborder = yborder = 0;
-

     if (GetWindowStyle() & wxSL_LABELS)
     {
         wxString text;
     if (GetWindowStyle() & wxSL_LABELS)
     {
         wxString text;