check default library directories in WX_PATH_FIND_LIBRARIES; do *not* add default...

[wxWidgets.git] / src / motif / statbox.cpp

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index fe2c52163cdb7f6617add66aeb9cb30de84b23c6..76f381afc65b29611a5ba0f2dc24c068e879ab42 100644 (file)
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -108,13 +108,13 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
     bool hasLabel = (!label.IsNull() && !label.IsEmpty()) ;
     if (hasLabel)
     {
-        WXFontType fontType = m_font.GetFontType( XtDisplay( parentWidget ) );
         wxString label1(wxStripMenuCodes(label));
         wxXmString text(label1);
+        Display* dpy = XtDisplay( parentWidget );
 
         m_labelWidget = (WXWidget) XtVaCreateManagedWidget ("staticboxlabel",
                 xmLabelWidgetClass, (Widget)m_mainWidget,
-                wxFont::GetFontTag(), fontType,                
+                wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),
                 XmNlabelString, text(),
 #if wxCHECK_MOTIF_VERSION( 2, 0 )
                 XmNframeChildType, XmFRAME_TITLE_CHILD,
@@ -147,3 +147,27 @@ void wxStaticBox::SetLabel( const wxString& label )
 
     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;
+    }
+}