Improved wxDataViewSpinCtrlRenderer under OS X

[wxWidgets.git] / src / motif / stattext.cpp

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index b0e9dcf79f99b0dff5adbc32076bd0ff0b8bdac3..5ddee743906ae752bb88abe5ce82c1bcdb24abea 100644 (file)
--- 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:
 // Purpose:     wxStaticText
 // Author:      Julian Smart
 // Modified by:


@@ -9,19 +9,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "stattext.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
-#include "wx/defs.h"
-

 #if wxUSE_STATTEXT
 
 #include "wx/stattext.h"
 #if wxUSE_STATTEXT
 
 #include "wx/stattext.h"


@@ -36,7 +26,7 @@
 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl);
+IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)

 
 bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
 
 bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,


@@ -48,64 +38,83 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     if( !CreateControl( parent, id, pos, size, style,
                         wxDefaultValidator, name ) )
         return false;
     if( !CreateControl( parent, id, pos, size, style,
                         wxDefaultValidator, name ) )
         return false;

+    m_labelWidget = (WXWidget) 0;
+    PreCreation();

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     Widget borderWidget =
         (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     Widget borderWidget =
         (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );

-    wxXmString text( wxStripMenuCodes( label ) );

 
     m_labelWidget =
 
     m_labelWidget =

-        XtVaCreateManagedWidget (wxConstCast(name.c_str(), char),
+        XtVaCreateManagedWidget (name.mb_str(),

             xmLabelWidgetClass,
             borderWidget ? borderWidget : parentWidget,
             wxFont::GetFontTag(), m_font.GetFontTypeC(XtDisplay(parentWidget)),
             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)),
             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;
 
             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;
+
+    PostCreation();
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, best.x, best.y);

 
     return true;
 }
 
 void wxStaticText::SetLabel(const wxString& label)
 {
 
     return true;
 }
 
 void wxStaticText::SetLabel(const wxString& label)
 {

-    wxXmString label_str(wxStripMenuCodes(label));
+    m_labelOrig = label;       // save original label
+
+    // Motif does not support neither ellipsize nor markup in static text:
+    DoSetLabel(GetEllipsizedLabelWithoutMarkup());
+}
+
+// for wxST_ELLIPSIZE_* support:
+
+wxString wxStaticText::DoGetLabel() const
+{
+    XmString label = NULL;
+    XtVaGetValues((Widget)m_labelWidget, XmNlabelString, &label, NULL);
+
+    return wxXmStringToString(label);
+}
+
+void wxStaticText::DoSetLabel(const wxString& str)
+{
+    // 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;
 
 
     // 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);
         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
 }
 
 #endif // wxUSE_STATTEXT