Adjust the client area origin and the client size of the MSW wxStaticBox according...

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 27180f2c1eeba7d1b396dcffd8748b9cff83facd..15b25cb4e2b1ba0ec159b65f02b4e8f41f25cb3f 100644 (file)
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -43,6 +43,10 @@ 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 75306978e01fd8d987e3245d23ded74ed416cda0..213ac65d6af11a6bbb04f08cfd5f648bc7daefb2 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -528,4 +528,26 @@ 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