Crash fix under VC++

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

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 742fa52c7612a3dd8994607dd217e98b4ff5f173..2e0b1362052caa1cf275af48dbacdc71bfe7a72b 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -9,31 +9,31 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "stattext.h"
 #endif
 
 #pragma implementation "stattext.h"
 #endif
 

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

 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #endif
 
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #endif
 

-#include "wx/app.h"
+#include "wx/defs.h"

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

-#include <stdio.h>
-

 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

-#include <Xm/Frame.h>

 #include <Xm/Label.h>
 #include <Xm/Label.h>

-#include <Xm/LabelG.h>
-#include <Xm/PushBG.h>

 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif
 
 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
+#include "wx/motif/private.h"
+
+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,


@@ -42,105 +42,66 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            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;
+    if( !CreateControl( parent, id, pos, size, style,
+                        wxDefaultValidator, name ) )
+        return false;

 
 

-    m_windowStyle = style;
-    m_font = parent->GetFont();
-
-#if 0  // gcc 2.95 doesn't like this apparently    
-    char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
-#endif
-    

     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     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
-                                   );
-    }
+    Widget borderWidget =
+        (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );
+    wxXmString text( wxStripMenuCodes( label ) );
+    WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget));

 
 

-#if 0 // gcc 2.95 doesn't like this apparently    
-    // Use XmStringCreateLtoR(), since XmStringCreateSimple
-    // doesn't obey separators.
-//    XmString text = XmStringCreateSimple (label1);
-    XmString text = XmStringCreateLtoR (label1, XmSTRING_DEFAULT_CHARSET);
-#endif // 0
-    
-    XmString text = XmStringCreateLtoR ((char *)(const char*)label, XmSTRING_DEFAULT_CHARSET);
-    
-    XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
-
-    Widget labelWidget = XtVaCreateManagedWidget ((char*) (const char*) name,
+    m_labelWidget = XtVaCreateManagedWidget (wxConstCast(name.c_str(), char),

                                          xmLabelWidgetClass,
                                          borderWidget ? borderWidget : parentWidget,
                                          xmLabelWidgetClass,
                                          borderWidget ? borderWidget : parentWidget,

-                                         XmNfontList, fontList,
-                                         XmNlabelString, text,
+                                         wxFont::GetFontTag(), fontType,
+                                         XmNlabelString, text(),

                                          XmNalignment,
                      ((style & wxALIGN_RIGHT) ? XmALIGNMENT_END :
                      ((style & wxALIGN_CENTRE) ? XmALIGNMENT_CENTER :
                      XmALIGNMENT_BEGINNING)),
                                          NULL);
 
                                          XmNalignment,
                      ((style & wxALIGN_RIGHT) ? XmALIGNMENT_END :
                      ((style & wxALIGN_CENTRE) ? XmALIGNMENT_CENTER :
                      XmALIGNMENT_BEGINNING)),
                                          NULL);
 

-    XmStringFree (text);
+    m_mainWidget = borderWidget ? borderWidget : m_labelWidget;

 
 

-    m_mainWidget = borderWidget ? borderWidget : labelWidget;
-
-    SetCanAddEventHandler(TRUE);
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, size.x, size.y);

 
     ChangeBackgroundColour ();
 
     return TRUE;
 }
 
 
     ChangeBackgroundColour ();
 
     return TRUE;
 }
 

-void wxStaticText::ChangeFont(bool keepOriginalSize)
+void wxStaticText::SetLabel(const wxString& label)

 {
 {

-    wxWindow::ChangeFont(keepOriginalSize);
-}
+    wxXmString label_str(wxStripMenuCodes(label));

 
 

-void wxStaticText::ChangeBackgroundColour()
-{
-    wxWindow::ChangeBackgroundColour();
-}
+    // This variable means we don't need so many casts later.
+    Widget widget = (Widget) m_labelWidget;

 
 

-void wxStaticText::ChangeForegroundColour()
-{
-    wxWindow::ChangeForegroundColour();
+    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);
+    }

 }
 }

-