synthesize NM_RCLICK ourselves now that def window proc doesn't do it as we don't...

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

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 294f51036cb77dd8167cc23d4416fbcb4761812a..3f314856858bcad9592636cf0388059db5e477ef 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -6,21 +6,34 @@
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

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

-#include "wx/app.h"
-#include "wx/stattext.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif

 
 

-#include <stdio.h>
+#include "wx/defs.h"
+#include "wx/stattext.h"

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
+#ifdef __VMS__
+#pragma message disable nosimpint

 #endif
 #endif

+#include <Xm/Label.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
+
+#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,


@@ -29,32 +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);
+    if( !CreateControl( parent, id, pos, size, style,
+                        wxDefaultValidator, name ) )
+        return false;

 
 

-  SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-  SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+    Widget parentWidget = (Widget) parent->GetClientWidget();

 
 

-  if ( id == -1 )
-       m_windowId = (int)NewControlId();
-  else
-       m_windowId = id;
+    Widget borderWidget =
+        (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );
+    wxXmString text( wxStripMenuCodes( label ) );
+    WXFontType fontType = m_font.GetFontType(XtDisplay(parentWidget));

 
 

-  m_windowStyle = style;
+    m_labelWidget = XtVaCreateManagedWidget (wxConstCast(name.c_str(), char),
+                                         xmLabelWidgetClass,
+                                         borderWidget ? borderWidget : parentWidget,
+                                         wxFont::GetFontTag(), fontType,
+                                         XmNlabelString, text(),
+                                         XmNalignment,
+                     ((style & wxALIGN_RIGHT) ? XmALIGNMENT_END :
+                     ((style & wxALIGN_CENTRE) ? XmALIGNMENT_CENTER :
+                     XmALIGNMENT_BEGINNING)),
+                                         NULL);

 
 

-  SetFont(* parent->GetFont());
+    m_mainWidget = borderWidget ? borderWidget : m_labelWidget;

 
 

-  // TODO
-  return FALSE;
-}
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, size.x, size.y);

 
 

-void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // TODO
+    ChangeBackgroundColour ();
+
+    return true;

 }
 
 void wxStaticText::SetLabel(const wxString& label)
 {
 }
 
 void wxStaticText::SetLabel(const wxString& label)
 {

-    // TODO
-}
+    wxXmString label_str(wxStripMenuCodes(label));

 
 

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