X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/483561c5684e0c21a0112dec59c9ca5c38718906..468c46935a53da994dd3a7ca8222277cae9ca851:/src/motif/statbox.cpp?ds=inline diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp index c7c8dd099a..f6d4fa2b5e 100644 --- a/src/motif/statbox.cpp +++ b/src/motif/statbox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbox.cpp +// Name: src/motif/statbox.cpp // Purpose: wxStaticBox // Author: Julian Smart // Modified by: @@ -9,18 +9,18 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "statbox.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #ifdef __VMS #define XtDisplay XTDISPLAY #endif -#include "wx/defs.h" - #include "wx/statbox.h" -#include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/utils.h" +#endif #ifdef __VMS__ #pragma message disable nosimpint @@ -102,30 +102,28 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id, // XmNshadowType, XmSHADOW_IN, NULL); - bool hasLabel = (!label.IsNull() && !label.IsEmpty()) ; - if (hasLabel) + if (!label.empty()) { - XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay( parentWidget ) ); wxString label1(wxStripMenuCodes(label)); wxXmString text(label1); + Display* dpy = XtDisplay( parentWidget ); m_labelWidget = (WXWidget) XtVaCreateManagedWidget ("staticboxlabel", xmLabelWidgetClass, (Widget)m_mainWidget, - XmNfontList, fontList, + wxFont::GetFontTag(), m_font.GetFontTypeC(dpy), XmNlabelString, text(), #if wxCHECK_MOTIF_VERSION( 2, 0 ) XmNframeChildType, XmFRAME_TITLE_CHILD, #else - XmNchildType, XmFRAME_TITLE_CHILD, + XmNchildType, XmFRAME_TITLE_CHILD, #endif NULL); } - - SetCanAddEventHandler(TRUE); + AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y); ChangeBackgroundColour(); - return TRUE; + return true; } wxStaticBox::~wxStaticBox() @@ -145,3 +143,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; + } +}