use one shot timers in wxAnimationCtrl (patch 1774535)

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

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index fce5aaf4f0f34d4ead3a667ff02d3cad051abe7f..3526a2bf2da3a9924c44b60436abdc035ba4d4e5 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -42,6 +42,8 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     if( !CreateControl( parent, id, pos, size, style,
                         wxDefaultValidator, name ) )
         return false;
+    m_labelWidget = (WXWidget) 0;
+    PreCreation();
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
@@ -49,7 +51,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
         (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );
 
     m_labelWidget =
-        XtVaCreateManagedWidget (wxConstCast(name.mb_str(), char),
+        XtVaCreateManagedWidget (name.mb_str(),
             xmLabelWidgetClass,
             borderWidget ? borderWidget : parentWidget,
             wxFont::GetFontTag(), m_font.GetFontTypeC(XtDisplay(parentWidget)),
@@ -61,12 +63,15 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
     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;
 
-    SetLabel(label);
+    PostCreation();
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, best.x, best.y);
 
     return true;
 }
@@ -108,4 +113,12 @@ void wxStaticText::DoSetLabel(const wxString& str)
           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