X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bcd055ae108a30299fa278f3fe774f52414eb3df..68a2e005a51a87df6cc445345f27443e57ab3608:/src/motif/stattext.cpp

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 3b7b342e6b..bbfd843ca0 100644
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -17,22 +17,20 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-#include "wx/app.h"
+#include "wx/defs.h"
 #include "wx/stattext.h"
 
-#include <stdio.h>
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
 #include <Xm/Label.h>
-#include <Xm/LabelG.h>
-#include <Xm/PushBG.h>
 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
+#include "wx/motif/private.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl);
 
 bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
@@ -41,70 +39,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();
+    if( !CreateControl( parent, id, pos, size, style,
+                        wxDefaultValidator, name ) )
+        return false;
 
-#if 0  // gcc 2.95 doesn't like this apparently    
-    char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
-#endif
-    
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
-#if 0 // gcc 2.95 doesn't like this apparently    
-    // Use XmStringCreateLtoR(), since XmStringCreateSimple
-    // doesn't obey separators.
-//    XmString text = XmStringCreateSimple (label1);
-    XmString text = XmStringCreateLtoR (label1, XmSTRING_DEFAULT_CHARSET);
-#endif // 0
-    
-    XmString text = XmStringCreateLtoR ((char *)(const char*)label, XmSTRING_DEFAULT_CHARSET);
-    
-    XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
-
-    m_mainWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name,
+    Widget borderWidget =
+        (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );
+    wxXmString text( label );
+    WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget));
+
+    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)
+void wxStaticText::SetLabel(const wxString& label)
 {
-    wxWindow::ChangeFont(keepOriginalSize);
-}
-
-void wxStaticText::ChangeBackgroundColour()
-{
-    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);
+    }
 }
-