Only give capture to wxPopupTransientWindow child if it's the only one.

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

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index f233a510803ee7a9de3471474344374685a45d1f..9920a4c82d012afb5116f33715b765d735a1aa44 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,10 +11,6 @@
 // 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
-

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


@@ -30,8 +25,6 @@
 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-

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


@@ -51,7 +44,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
         (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );
 
     m_labelWidget =
         (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)),
             xmLabelWidgetClass,
             borderWidget ? borderWidget : parentWidget,
             wxFont::GetFontTag(), m_font.GetFontTypeC(XtDisplay(parentWidget)),


@@ -80,8 +73,8 @@ void wxStaticText::SetLabel(const wxString& label)
 {
     m_labelOrig = label;       // save original label
 
 {
     m_labelOrig = label;       // save original label
 

-    // Motif does not support neither ellipsize nor markup in static text:
-    DoSetLabel(GetEllipsizedLabelWithoutMarkup());
+    // Motif does not support ellipsized labels natively
+    DoSetLabel(GetEllipsizedLabel());

 }
 
 // for wxST_ELLIPSIZE_* support:
 }
 
 // for wxST_ELLIPSIZE_* support: