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

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

diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h
index d1efb04d8c96123d084eb4a7d6de7049a25f2d8d..928ec45a0387ad3ed45ed27621d4191bf1009131 100644 (file)
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -46,8 +46,6 @@ public:
     virtual int GetValue() const;
     virtual void SetValue(int);
 
     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);
     void GetPosition(int *x, int *y) const;
 
     bool Show(bool show = TRUE);

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 8485eb368ff6abd5841d61f33416252d5fe7a105..cca538bbff1913ddecfc57f5a8acd698eed650c8 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -394,11 +394,6 @@ void wxSlider95::SetValue(int value)
 }
 
 void wxSlider95::DoGetSize(int *width, int *height) const
 }
 
 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;
 {
     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);
 
     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
 }
 
 void wxSlider95::GetPosition(int *x, int *y) const