From e9fed11291a68a0f4adbbe5dc8ec22ed2429ac16 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sun, 8 Jul 2012 03:48:55 +0000 Subject: [PATCH] Revert r71595 for now, as the bug it fixed is the lesser of two evils with the potential bugs it causes. See #14453. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/statbox.h | 4 ---- src/msw/statbox.cpp | 22 ---------------------- 2 files changed, 26 deletions(-) diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h index 15b25cb4e2..27180f2c1e 100644 --- a/include/wx/msw/statbox.h +++ b/include/wx/msw/statbox.h @@ -43,10 +43,6 @@ public: // returns true if the platform should explicitly apply a theme border virtual bool CanApplyThemeBorder() const { return false; } - virtual wxPoint GetClientAreaOrigin() const; - virtual void DoGetClientSize(int *width, int *height) const; - - protected: virtual wxSize DoGetBestSize() const; diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index 3bd2e55081..6272f6396e 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -543,26 +543,4 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event)) #endif // !__WXWINCE__ - -wxPoint wxStaticBox::GetClientAreaOrigin() const -{ - // See: http://msdn.microsoft.com/en-us/library/aa511279.aspx - wxPoint pt = ConvertDialogToPixels(wxPoint(6,11)); - return pt; -} - - -void wxStaticBox::DoGetClientSize(int *width, int *height) const -{ - // See: http://msdn.microsoft.com/en-us/library/aa511279.aspx - wxPoint lr = ConvertDialogToPixels(wxPoint(6,7)); - wxPoint ul = GetClientAreaOrigin(); - wxSize sz = GetSize(); - - if (width) - *width = sz.x - ul.x - lr.x; - if (height) - *height = sz.y - ul.y - lr.x; -} - #endif // wxUSE_STATBOX -- 2.45.2