X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/483561c5684e0c21a0112dec59c9ca5c38718906..2b9a7d4cc2f5f55df3d83f7cf2160cf9a509a4f2:/src/motif/statbox.cpp diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp index c7c8dd099a..fe2c52163c 100644 --- a/src/motif/statbox.cpp +++ b/src/motif/statbox.cpp @@ -9,10 +9,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "statbox.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #ifdef __VMS #define XtDisplay XTDISPLAY #endif @@ -105,13 +108,13 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id, bool hasLabel = (!label.IsNull() && !label.IsEmpty()) ; if (hasLabel) { - XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay( parentWidget ) ); + WXFontType fontType = m_font.GetFontType( XtDisplay( parentWidget ) ); wxString label1(wxStripMenuCodes(label)); wxXmString text(label1); m_labelWidget = (WXWidget) XtVaCreateManagedWidget ("staticboxlabel", xmLabelWidgetClass, (Widget)m_mainWidget, - XmNfontList, fontList, + wxFont::GetFontTag(), fontType, XmNlabelString, text(), #if wxCHECK_MOTIF_VERSION( 2, 0 ) XmNframeChildType, XmFRAME_TITLE_CHILD, @@ -121,11 +124,10 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id, NULL); } - SetCanAddEventHandler(TRUE); AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y); ChangeBackgroundColour(); - return TRUE; + return true; } wxStaticBox::~wxStaticBox()