From 918107037d46362702c0d0f5f5538c5525e97534 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 30 Jun 2004 15:45:24 +0000 Subject: [PATCH] don't use &this->GetFont(), this is _not_ valid C++ and GetTextExtent() should work correctly with the default value of font parameter anyhow git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/slider95.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp index da8c466e96..4903872857 100644 --- 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); - 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)