Upported fix to mouse capture event handling.

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

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 947d81c39d98a3a0381e1e94c470c3badbf030a5..4f9b14740c5452424caf4d99363cbd2e29dc22e0 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -6,25 +6,36 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // 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 __GNUG__
 #pragma implementation "stattext.h"
 #endif
 

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

 #include "wx/app.h"
 #include "wx/stattext.h"
 
 #include <stdio.h>
 
 #include "wx/app.h"
 #include "wx/stattext.h"
 
 #include <stdio.h>
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
+#include <Xm/Frame.h>

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

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
+
+#include "wx/motif/private.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)

-#endif

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


@@ -40,52 +51,124 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     m_foregroundColour = parent->GetForegroundColour();
 
     if ( id == -1 )
     m_foregroundColour = parent->GetForegroundColour();
 
     if ( id == -1 )

-           m_windowId = (int)NewControlId();
+              m_windowId = (int)NewControlId();

     else
     else

-           m_windowId = id;
+            m_windowId = id;

 
     m_windowStyle = style;
 
     m_windowStyle = style;

-
-    char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
+    m_font = parent->GetFont();

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 

-    XmString text = XmStringCreateSimple (label1);
-
-    m_mainWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name,
+    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
+                                   );
+    }
+
+#if 0 // gcc 2.95 doesn't like this apparently    
+    // Use XmStringCreateLtoR(), since XmStringCreateSimple
+    // doesn't obey separators.
+//    XmString text = XmStringCreateSimple (label1);
+    wxXmString text( label1 );
+#endif // 0
+    
+    wxXmString text( label );
+    
+    WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget));
+
+    m_labelWidget = XtVaCreateManagedWidget (wxConstCast(name.c_str(), char),

                                          xmLabelWidgetClass,
                                          xmLabelWidgetClass,

-                                         parentWidget,
-                                         XmNlabelString, text,
+                                         borderWidget ? borderWidget : parentWidget,
+                                         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;

 
 

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

-    SetFont(* parent->GetFont());
-

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

-void wxStaticText::ChangeFont()
+void wxStaticText::ChangeFont(bool keepOriginalSize)

 {
 {

-    // TODO
+    wxWindow::ChangeFont(keepOriginalSize);

 }
 
 void wxStaticText::ChangeBackgroundColour()
 {
 }
 
 void wxStaticText::ChangeBackgroundColour()
 {

-    // TODO
+    wxWindow::ChangeBackgroundColour();

 }
 
 void wxStaticText::ChangeForegroundColour()
 {
 }
 
 void wxStaticText::ChangeForegroundColour()
 {

-    // TODO
+    wxWindow::ChangeForegroundColour();
+}
+
+void wxStaticText::SetLabel(const wxString& label)
+{
+    wxString buf(wxStripMenuCodes(label));
+    wxXmString label_str(buf);
+
+    // 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);
+    }

 }
 
 }