Minor header cleaning.

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

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index b0e9dcf79f99b0dff5adbc32076bd0ff0b8bdac3..e109caae2da5cfc1ca32b67d19d5cb508fbec9a7 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,10 +9,6 @@
 // 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"
 


@@ -20,8 +16,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
 #define XtDisplay XTDISPLAY
 #endif
 

-#include "wx/defs.h"
-

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


@@ -36,7 +30,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,


@@ -53,7 +47,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
     Widget borderWidget =
         (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );
 
     Widget borderWidget =
         (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );

-    wxXmString text( wxStripMenuCodes( label ) );
+    wxXmString text( GetLabelText( label ) );

 
     m_labelWidget =
         XtVaCreateManagedWidget (wxConstCast(name.c_str(), char),
 
     m_labelWidget =
         XtVaCreateManagedWidget (wxConstCast(name.c_str(), char),


@@ -64,6 +58,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
             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;


@@ -78,34 +73,15 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
 void wxStaticText::SetLabel(const wxString& label)
 {
 
 void wxStaticText::SetLabel(const wxString& label)
 {

-    wxXmString label_str(wxStripMenuCodes(label));
+    wxXmString label_str(GetLabelText(label));

 
     // 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);

-    }

 }
 
 #endif // wxUSE_STATTEXT
 }
 
 #endif // wxUSE_STATTEXT