Improved wxStaticBox border calculation for wxMotif.

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

diff --git a/include/wx/motif/statbox.h b/include/wx/motif/statbox.h
index c26d7ba69dc3010c4d76057b2973299d85c1d4fa..e7882f19c29328226183d1297b951611ab23ebe9 100644 (file)
--- a/include/wx/motif/statbox.h
+++ b/include/wx/motif/statbox.h
@@ -50,6 +50,7 @@ public:
     virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
 
     virtual void SetLabel(const wxString& label);
     virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
 
     virtual void SetLabel(const wxString& label);

+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;

 
 private:
     WXWidget  m_labelWidget;
 
 private:
     WXWidget  m_labelWidget;

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index 0b9ddc67ed801dfc462990ec3128ff2daf97cfad..76f381afc65b29611a5ba0f2dc24c068e879ab42 100644 (file)
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -147,3 +147,27 @@ void wxStaticBox::SetLabel( const wxString& label )
 
     sk.Restore();
 }
 
     sk.Restore();
 }

+
+void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const
+{
+    Dimension shadow, border;
+
+    XtVaGetValues( (Widget) GetMainWidget(),
+                   XmNshadowThickness, &shadow,
+                   XmNborderWidth, &border,
+                   NULL);
+
+    *borderOther = shadow + border;
+
+    if( GetLabelWidget() )
+    {
+        XtWidgetGeometry preferred;
+        XtQueryGeometry( (Widget) GetLabelWidget(), NULL, &preferred );
+
+        *borderTop = preferred.height;
+    }
+    else
+    {
+        *borderTop = shadow;
+    }
+}