X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da175b2ce4dc35cc4c0baa8bbdc16bf4de6c7684..a83ea9c15a7ac7bbdc6686164cfcbbc21ae5031a:/src/motif/stattext.cpp?ds=sidebyside diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp index ab21159392..2e0b136205 100644 --- a/src/motif/stattext.cpp +++ b/src/motif/stattext.cpp @@ -6,26 +6,35 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "stattext.h" #endif -#include "wx/app.h" -#include "wx/stattext.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#include +#ifdef __VMS +#define XtDisplay XTDISPLAY +#endif -#include -#include -#include +#include "wx/defs.h" +#include "wx/stattext.h" -#if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl) +#ifdef __VMS__ +#pragma message disable nosimpint +#endif +#include +#ifdef __VMS__ +#pragma message enable nosimpint #endif +#include "wx/motif/private.h" + +IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl); + bool wxStaticText::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, @@ -33,64 +42,66 @@ 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(); - - char* label1 = (label.IsNull() ? "" : (char*) (const char*) label); + if( !CreateControl( parent, id, pos, size, style, + wxDefaultValidator, name ) ) + return false; Widget parentWidget = (Widget) parent->GetClientWidget(); - // Use XmStringCreateLtoR(), since XmStringCreateSimple - // doesn't obey separators. -// XmString text = XmStringCreateSimple (label1); - XmString text = XmStringCreateLtoR (label1, XmSTRING_DEFAULT_CHARSET); - - XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget)); + Widget borderWidget = + (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style ); + wxXmString text( wxStripMenuCodes( label ) ); + WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget)); - m_mainWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name, + m_labelWidget = XtVaCreateManagedWidget (wxConstCast(name.c_str(), char), xmLabelWidgetClass, - parentWidget, - XmNfontList, fontList, - XmNlabelString, text, + borderWidget ? borderWidget : parentWidget, + wxFont::GetFontTag(), fontType, + XmNlabelString, text(), XmNalignment, ((style & wxALIGN_RIGHT) ? XmALIGNMENT_END : ((style & wxALIGN_CENTRE) ? XmALIGNMENT_CENTER : XmALIGNMENT_BEGINNING)), NULL); - XmStringFree (text); + m_mainWidget = borderWidget ? borderWidget : m_labelWidget; - SetCanAddEventHandler(TRUE); - 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() +void wxStaticText::SetLabel(const wxString& label) { - wxWindow::ChangeBackgroundColour(); -} - -void wxStaticText::ChangeForegroundColour() -{ - wxWindow::ChangeForegroundColour(); + 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); + } } -