X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7a5e53abb3f9ea13eba2880972306446e4e21e83..8f6819d7634498b53ef2cbee3423114a7b79b06a:/src/msw/slider95.cpp?ds=sidebyside

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index da8c466e96..9cbb71978c 100644
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -168,7 +168,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
         minLabel.Printf(wxT("%d"), minValue);
         wstyle = STATIC_FLAGS;
         if ( m_windowStyle & wxCLIP_SIBLINGS )
-            msStyle |= WS_CLIPSIBLINGS;
+            wstyle |= WS_CLIPSIBLINGS;
         m_staticMin = (WXHWND) CreateWindowEx
             (
                 0, wxT("STATIC"), minLabel,
@@ -237,7 +237,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
         wstyle = STATIC_FLAGS;
 
         if ( m_windowStyle & wxCLIP_SIBLINGS )
-            msStyle |= WS_CLIPSIBLINGS;
+            wstyle |= WS_CLIPSIBLINGS;
 
         m_staticMax = (WXHWND) CreateWindowEx
             (
@@ -478,12 +478,12 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             int min_len = 0;
 
             ::GetWindowText((HWND) m_staticMin, buf, 300);
-            GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &min_len, &cyf);
 
             int max_len = 0;
 
             ::GetWindowText((HWND) m_staticMax, buf, 300);
-            GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &max_len, &cyf);
             if (m_staticValue)
             {
                 int new_width = (int)(wxMax(min_len, max_len));
@@ -552,11 +552,11 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         {
             int min_len;
             ::GetWindowText((HWND) m_staticMin, buf, 300);
-            GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &min_len, &cyf);
 
             int max_len;
             ::GetWindowText((HWND) m_staticMax, buf, 300);
-            GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &max_len, &cyf);
 
             if (m_staticValue)
             {
@@ -642,11 +642,11 @@ wxSize wxSlider95::DoGetBestSize() const
         if (HasFlag(wxSL_LABELS))  // do we need to add more for the labels?
         {
             ::GetWindowText((HWND) m_staticMin, buf, 300);
-            GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &min_len, &cyf);
             rv.x += min_len + cx;
 
             ::GetWindowText((HWND) m_staticMax, buf, 300);
-            GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &max_len, &cyf);
             rv.x += max_len + cx;
 
             if (m_staticValue)
@@ -675,11 +675,11 @@ wxSize wxSlider95::DoGetBestSize() const
         if (HasFlag(wxSL_LABELS)) // do we need to add more for the labels?
         {
             ::GetWindowText((HWND) m_staticMin, buf, 300);
-            GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &min_len, &cyf);
             rv.y += cy;
 
             ::GetWindowText((HWND) m_staticMax, buf, 300);
-            GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
+            GetTextExtent(buf, &max_len, &cyf);
             rv.y += cy;
             
             if (m_staticValue)