Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't override GetSize(), this doesn't work (bug 732758)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-02-12 18:19:12 +00:00
parent 1c2d1459e9
commit 6819fb9bef
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/slider95.h
View File

@@ -46,8 +46,6 @@ public:
virtual int GetValue() const;
virtual void SetValue(int);
void GetSize(int *w, int *h) const;
void GetPosition(int *x, int *y) const;
bool Show(bool show = TRUE);

11
src/msw/slider95.cpp
View File

@@ -394,11 +394,6 @@ void wxSlider95::SetValue(int value)
}
void wxSlider95::DoGetSize(int *width, int *height) const
{
GetSize(width, height);
}
void wxSlider95::GetSize(int *width, int *height) const
{
RECT rect;
rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;
@@ -414,8 +409,10 @@ void wxSlider95::GetSize(int *width, int *height) const
if (m_staticValue)
wxFindMaxSize(m_staticValue, &rect);
*width = rect.right - rect.left;
*height = rect.bottom - rect.top;
if ( width )
*width = rect.right - rect.left;
if ( height )
*height = rect.bottom - rect.top;
}
void wxSlider95::GetPosition(int *x, int *y) const