X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8680e3e0e5066d35a8f4fd43294ba4bfcaf4ba7..926ce9e3ac32e1a33cc43420f76876fac8868436:/src/motif/stattext.cpp?ds=inline diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp index 4f9b14740c..79d3ea330d 100644 --- a/src/motif/stattext.cpp +++ b/src/motif/stattext.cpp @@ -9,26 +9,23 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "stattext.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #ifdef __VMS #define XtDisplay XTDISPLAY #endif -#include "wx/app.h" -#include "wx/stattext.h" +#include "wx/defs.h" + +#if wxUSE_STATTEXT -#include +#include "wx/stattext.h" #ifdef __VMS__ #pragma message disable nosimpint #endif -#include #include -#include -#include #ifdef __VMS__ #pragma message enable nosimpint #endif @@ -44,131 +41,49 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id, long style, const wxString& name) { - SetName(name); - if (parent) parent->AddChild(this); - - m_backgroundColour = parent->GetBackgroundColour(); - m_foregroundColour = parent->GetForegroundColour(); - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - m_windowStyle = style; - m_font = parent->GetFont(); + if( !CreateControl( parent, id, pos, size, style, + wxDefaultValidator, name ) ) + return false; Widget parentWidget = (Widget) parent->GetClientWidget(); - Widget borderWidget = NULL; - - // Decorate the label widget if a border style is specified. - if (style & wxSIMPLE_BORDER) - { - borderWidget = XtVaCreateManagedWidget - ( - "simpleBorder", - xmFrameWidgetClass, parentWidget, - XmNshadowType, XmSHADOW_ETCHED_IN, - XmNshadowThickness, 1, - NULL - ); - } else if (style & wxSUNKEN_BORDER) - { - borderWidget = XtVaCreateManagedWidget - ( - "sunkenBorder", - xmFrameWidgetClass, parentWidget, - XmNshadowType, XmSHADOW_IN, - NULL - ); - } else if (style & wxRAISED_BORDER) - { - borderWidget = XtVaCreateManagedWidget - ( - "raisedBorder", - xmFrameWidgetClass, parentWidget, - XmNshadowType, XmSHADOW_OUT, - NULL - ); - } - -#if 0 // gcc 2.95 doesn't like this apparently - // Use XmStringCreateLtoR(), since XmStringCreateSimple - // doesn't obey separators. -// XmString text = XmStringCreateSimple (label1); - wxXmString text( label1 ); -#endif // 0 - - wxXmString text( label ); - - WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget)); - - m_labelWidget = XtVaCreateManagedWidget (wxConstCast(name.c_str(), char), - xmLabelWidgetClass, - borderWidget ? borderWidget : parentWidget, - wxFont::GetFontTag(), fontType, - XmNlabelString, text(), - XmNalignment, - ((style & wxALIGN_RIGHT) ? XmALIGNMENT_END : - ((style & wxALIGN_CENTRE) ? XmALIGNMENT_CENTER : - XmALIGNMENT_BEGINNING)), - NULL); + Widget borderWidget = + (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style ); + wxXmString text( wxStripMenuCodes( label ) ); + + m_labelWidget = + XtVaCreateManagedWidget (wxConstCast(name.c_str(), char), + xmLabelWidgetClass, + borderWidget ? borderWidget : parentWidget, + wxFont::GetFontTag(), m_font.GetFontTypeC(XtDisplay(parentWidget)), + XmNlabelString, text(), + XmNalignment, ((style & wxALIGN_RIGHT) ? XmALIGNMENT_END : + ((style & wxALIGN_CENTRE) ? XmALIGNMENT_CENTER : + XmALIGNMENT_BEGINNING)), + XmNrecomputeSize, ((style & wxST_NO_AUTORESIZE) ? TRUE : FALSE), + NULL); m_mainWidget = borderWidget ? borderWidget : m_labelWidget; - AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y); + AttachWidget (parent, m_mainWidget, (WXWidget) NULL, + pos.x, pos.y, size.x, size.y); ChangeBackgroundColour (); - return TRUE; -} - -void wxStaticText::ChangeFont(bool keepOriginalSize) -{ - wxWindow::ChangeFont(keepOriginalSize); -} - -void wxStaticText::ChangeBackgroundColour() -{ - wxWindow::ChangeBackgroundColour(); -} - -void wxStaticText::ChangeForegroundColour() -{ - wxWindow::ChangeForegroundColour(); + return true; } void wxStaticText::SetLabel(const wxString& label) { - wxString buf(wxStripMenuCodes(label)); - wxXmString label_str(buf); + wxXmString label_str(wxStripMenuCodes(label)); // This variable means we don't need so many casts later. Widget widget = (Widget) m_labelWidget; - if (GetWindowStyle() & wxST_NO_AUTORESIZE) - { - XtUnmanageChild(widget); - Dimension width, height; - XtVaGetValues(widget, XmNwidth, &width, XmNheight, &height, NULL); - - XtVaSetValues(widget, - XmNlabelString, label_str(), - XmNlabelType, XmSTRING, - NULL); - XtVaSetValues(widget, - XmNwidth, width, - XmNheight, height, - NULL); - XtManageChild(widget); - } - else - { XtVaSetValues(widget, XmNlabelString, label_str(), XmNlabelType, XmSTRING, NULL); - } } +#endif // wxUSE_STATTEXT