corrected dynamic class implementation

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

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index fbe223dd149428233ebd0b7572390601cfa5ba09..3b7b342e6b5164aa88ecd82fcc6b5b2fb15413de 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -6,25 +6,33 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "stattext.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
 #include "wx/app.h"
 #include "wx/stattext.h"
 
 #include <stdio.h>
 
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 #include <Xm/PushBG.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-#endif
 
 bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
@@ -33,28 +41,41 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
-  SetName(name);
-  if (parent) parent->AddChild(this);
-
-  SetBackgroundColour(parent->GetBackgroundColour()) ;
-  SetForegroundColour(parent->GetForegroundColour()) ;
-
-  if ( id == -1 )
-       m_windowId = (int)NewControlId();
-  else
-       m_windowId = id;
-
-  m_windowStyle = style;
+    SetName(name);
+    if (parent) parent->AddChild(this);
 
-  char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();
 
-  Widget parentWidget = (Widget) parent->GetClientWidget();
+    if ( id == -1 )
+              m_windowId = (int)NewControlId();
+    else
+            m_windowId = id;
 
-  XmString text = XmStringCreateSimple (label1);
+    m_windowStyle = style;
+    m_font = parent->GetFont();
 
-  m_mainWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name,
+#if 0  // gcc 2.95 doesn't like this apparently    
+    char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
+#endif
+    
+    Widget parentWidget = (Widget) parent->GetClientWidget();
+
+#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));
+
+    m_mainWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name,
                                          xmLabelWidgetClass,
                                          parentWidget,
+                                         XmNfontList, fontList,
                                          XmNlabelString, text,
                                          XmNalignment,
                      ((style & wxALIGN_RIGHT) ? XmALIGNMENT_END :
@@ -62,17 +83,28 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
                      XmALIGNMENT_BEGINNING)),
                                          NULL);
 
-  XmStringFree (text);
+    XmStringFree (text);
+
+    SetCanAddEventHandler(TRUE);
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
-  SetCanAddEventHandler(TRUE);
-  AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
+    ChangeBackgroundColour ();
 
-  SetFont(* parent->GetFont());
+    return TRUE;
+}
 
-  ChangeColour (m_mainWidget);
-  //  ChangeFont (m_mainWidget);
+void wxStaticText::ChangeFont(bool keepOriginalSize)
+{
+    wxWindow::ChangeFont(keepOriginalSize);
+}
 
-  return TRUE;
+void wxStaticText::ChangeBackgroundColour()
+{
+    wxWindow::ChangeBackgroundColour();
 }
 
+void wxStaticText::ChangeForegroundColour()
+{
+    wxWindow::ChangeForegroundColour();
+}