X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02e8b2f9fbdfcd25080c42082d637da257c20094..cd318cd31b8fd9876af7ba5f4878b90f446bd0f5:/src/motif/stattext.cpp

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index cc0aa547f0..b0cd4e5c74 100644
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -6,26 +6,32 @@
 // 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"
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
 
-#include <stdio.h>
+#include "wx/defs.h"
+#include "wx/stattext.h"
 
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #include <Xm/Label.h>
-#include <Xm/LabelG.h>
-#include <Xm/PushBG.h>
-
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
+#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,46 +39,66 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-  SetName(name);
-  if (parent) parent->AddChild(this);
-
-  SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-  SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+    if( !CreateControl( parent, id, pos, size, style,
+                        wxDefaultValidator, name ) )
+        return false;
 
-  if ( id == -1 )
-  	m_windowId = (int)NewControlId();
-  else
-	m_windowId = id;
+    Widget parentWidget = (Widget) parent->GetClientWidget();
 
-  m_windowStyle = style;
+    Widget borderWidget =
+        (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );
+    wxXmString text( label );
+    WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget));
 
-  char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
-
-  Widget parentWidget = (Widget) parent->GetClientWidget();
-
-  XmString text = XmStringCreateSimple (label1);
-
-  m_mainWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name,
+    m_labelWidget = XtVaCreateManagedWidget (wxConstCast(name.c_str(), char),
                                          xmLabelWidgetClass,
-                                         parentWidget,
-                                         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);
-
-  SetCanAddEventHandler(TRUE);
-  AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
+    m_mainWidget = borderWidget ? borderWidget : m_labelWidget;
 
-  SetFont(* parent->GetFont());
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, size.x, size.y);
 
-  ChangeColour (m_mainWidget);
-  //  ChangeFont (m_mainWidget);
+    ChangeBackgroundColour ();
 
-  return TRUE;
+    return TRUE;
 }
 
-
+void wxStaticText::SetLabel(const wxString& label)
+{
+    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);
+    }
+}