don't use &this->GetFont(), this is _not_ valid C++ and GetTextExtent() should work...

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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index da8c466e9632f0ac9339b789922c957e107c4727..49038728576b4b2b0412c30a6bca8e1ff122cfdb 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -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);
             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);
 
             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));
             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);
         {
             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);
 
             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)
             {
 
             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);
         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);
             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)
             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);
         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);
             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)
             rv.y += cy;
             
             if (m_staticValue)