X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8680e3e0e5066d35a8f4fd43294ba4bfcaf4ba7..3f42c23971ccc3b5c944a946695e357c2925b8ad:/src/motif/stattext.cpp

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 4f9b14740c..917c3bf34a 100644
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stattext.cpp
+// Name:        src/motif/stattext.cpp
 // Purpose:     wxStaticText
 // Author:      Julian Smart
 // Modified by:
@@ -9,34 +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
+#if wxUSE_STATTEXT
 
-#include "wx/app.h"
 #include "wx/stattext.h"
 
-#include <stdio.h>
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
-#include <Xm/Frame.h>
 #include <Xm/Label.h>
-#include <Xm/LabelG.h>
-#include <Xm/PushBG.h>
 #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,
@@ -44,131 +33,86 @@ 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;
+    m_labelWidget = (WXWidget) 0;
+    PreCreation();
 
     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 );
+
+    m_labelWidget =
+        XtVaCreateManagedWidget (name.mb_str(),
+            xmLabelWidgetClass,
+            borderWidget ? borderWidget : parentWidget,
+            wxFont::GetFontTag(), m_font.GetFontTypeC(XtDisplay(parentWidget)),
+            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);
+    SetLabel(label);
 
-    ChangeBackgroundColour ();
+    wxSize best = GetBestSize();
+    if( size.x != -1 ) best.x = size.x;
+    if( size.y != -1 ) best.y = size.y;
 
-    return TRUE;
-}
+    PostCreation();
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, best.x, best.y);
 
-void wxStaticText::ChangeFont(bool keepOriginalSize)
-{
-    wxWindow::ChangeFont(keepOriginalSize);
+    return true;
 }
 
-void wxStaticText::ChangeBackgroundColour()
+void wxStaticText::SetLabel(const wxString& label)
 {
-    wxWindow::ChangeBackgroundColour();
+    m_labelOrig = label;       // save original label
+
+    // Motif does not support ellipsized labels natively
+    DoSetLabel(GetEllipsizedLabel());
 }
 
-void wxStaticText::ChangeForegroundColour()
+// for wxST_ELLIPSIZE_* support:
+
+wxString wxStaticText::DoGetLabel() const
 {
-    wxWindow::ChangeForegroundColour();
+    XmString label = NULL;
+    XtVaGetValues((Widget)m_labelWidget, XmNlabelString, &label, NULL);
+
+    return wxXmStringToString(label);
 }
 
-void wxStaticText::SetLabel(const wxString& label)
+void wxStaticText::DoSetLabel(const wxString& str)
 {
-    wxString buf(wxStripMenuCodes(label));
-    wxXmString label_str(buf);
+    // build our own cleaned label
+    wxXmString label_str(RemoveMnemonics(str));
 
     // 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);
-    }
 }
 
+/*
+   FIXME: UpdateLabel() should be called on size events to allow correct
+          dynamic ellipsizing of the label
+*/
+
+wxSize wxStaticText::DoGetBestSize() const
+{
+    int w, h;
+    GetTextExtent(GetLabelText(), &w, &h, NULL, NULL, NULL);
+
+    return wxSize(w, h);
+}
+
+#endif // wxUSE_STATTEXT