added AppleEvent Handler, somehow the standard event handler does not take care of...

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

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index e66312abaac9e5df9fb7f7c85cf5a0ad9f5b8f36..722ea20e7bc37c84a80c049d281920fe3a50747d 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "stattext.h"
 #endif
 
 #pragma implementation "stattext.h"
 #endif
 

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

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


@@ -21,6 +25,7 @@
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
 #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>


@@ -28,9 +33,9 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

-#if !USE_SHARED_LIBRARY
+#include "wx/motif/private.h"
+

 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,


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

 #if 0 // gcc 2.95 doesn't like this apparently    
     // Use XmStringCreateLtoR(), since XmStringCreateSimple
     // doesn't obey separators.
 #if 0 // gcc 2.95 doesn't like this apparently    
     // Use XmStringCreateLtoR(), since XmStringCreateSimple
     // doesn't obey separators.


@@ -70,9 +108,9 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     
     XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
 
     
     XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
 

-    m_mainWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name,
+    m_labelWidget = XtVaCreateManagedWidget ((char*) (const char*) name,

                                          xmLabelWidgetClass,
                                          xmLabelWidgetClass,

-                                         parentWidget,
+                                         borderWidget ? borderWidget : parentWidget,

                                          XmNfontList, fontList,
                                          XmNlabelString, text,
                                          XmNalignment,
                                          XmNfontList, fontList,
                                          XmNlabelString, text,
                                          XmNalignment,


@@ -83,6 +121,8 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
     XmStringFree (text);
 
 
     XmStringFree (text);
 

+    m_mainWidget = borderWidget ? borderWidget : m_labelWidget;
+

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


@@ -106,3 +146,36 @@ void wxStaticText::ChangeForegroundColour()
     wxWindow::ChangeForegroundColour();
 }
 
     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);
+    }
+}
+