Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

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

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 2b4166a75a4e7144498377a7b65f50faeae4f9bf..917c3bf34aeaae7ba0afabbe1ac8375d2f70a610 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        stattext.cpp
+// Name:        src/motif/stattext.cpp

 // Purpose:     wxStaticText
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxStaticText
 // Author:      Julian Smart
 // Modified by:


@@ -9,31 +9,22 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "stattext.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
+#if wxUSE_STATTEXT

 
 

-#include "wx/app.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"

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


@@ -42,105 +33,86 @@ 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;
+    m_labelWidget = (WXWidget) 0;
+    PreCreation();

 
 

-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
+    Widget parentWidget = (Widget) parent->GetClientWidget();

 
 

-    if ( id == -1 )
-              m_windowId = (int)NewControlId();
-    else
-            m_windowId = id;
+    Widget borderWidget =
+        (Widget) wxCreateBorderWidget( (WXWidget)parentWidget, style );

 
 

-    m_windowStyle = style;
-    m_font = parent->GetFont();
+    m_labelWidget =
+        XtVaCreateManagedWidget (name.mb_str(),
+            xmLabelWidgetClass,
+            borderWidget ? borderWidget : parentWidget,
+            wxFont::GetFontTag(), m_font.GetFontTypeC(XtDisplay(parentWidget)),
+            XmNalignment, ((style & wxALIGN_RIGHT)  ? XmALIGNMENT_END :
+                          ((style & wxALIGN_CENTRE) ? XmALIGNMENT_CENTER :
+                                                      XmALIGNMENT_BEGINNING)),
+            XmNrecomputeSize, ((style & wxST_NO_AUTORESIZE) ? TRUE : FALSE),
+            NULL);

 
 

-#if 0  // gcc 2.95 doesn't like this apparently    
-    char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
-#endif
-    
-    Widget parentWidget = (Widget) parent->GetClientWidget();
+    m_mainWidget = borderWidget ? borderWidget : m_labelWidget;

 
 

-    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);
-    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_labelWidget = XtVaCreateManagedWidget ((char*) (const char*) name,
-                                         xmLabelWidgetClass,
-                                         borderWidget ? borderWidget : parentWidget,
-                                         XmNfontList, fontList,
-                                         XmNlabelString, text,
-                                         XmNalignment,
-                     ((style & wxALIGN_RIGHT) ? XmALIGNMENT_END :
-                     ((style & wxALIGN_CENTRE) ? XmALIGNMENT_CENTER :
-                     XmALIGNMENT_BEGINNING)),
-                                         NULL);
-
-    XmStringFree (text);
+    SetLabel(label);

 
 

-    m_mainWidget = borderWidget ? borderWidget : m_labelWidget;
+    wxSize best = GetBestSize();
+    if( size.x != -1 ) best.x = size.x;
+    if( size.y != -1 ) best.y = size.y;

 
 

-    SetCanAddEventHandler(TRUE);
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
+    PostCreation();
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, best.x, best.y);

 
 

-    ChangeBackgroundColour ();
+    return true;
+}

 
 

-    return TRUE;
+void wxStaticText::SetLabel(const wxString& label)
+{
+    m_labelOrig = label;       // save original label
+
+    // Motif does not support ellipsized labels natively
+    DoSetLabel(GetEllipsizedLabel());

 }
 
 }
 

-void wxStaticText::ChangeFont(bool keepOriginalSize)
+// for wxST_ELLIPSIZE_* support:
+
+wxString wxStaticText::DoGetLabel() const

 {
 {

-    wxWindow::ChangeFont(keepOriginalSize);
+    XmString label = NULL;
+    XtVaGetValues((Widget)m_labelWidget, XmNlabelString, &label, NULL);
+
+    return wxXmStringToString(label);

 }
 
 }
 

-void wxStaticText::ChangeBackgroundColour()
+void wxStaticText::DoSetLabel(const wxString& str)

 {
 {

-    wxWindow::ChangeBackgroundColour();
+    // build our own cleaned label
+    wxXmString label_str(RemoveMnemonics(str));
+
+    // This variable means we don't need so many casts later.
+    Widget widget = (Widget) m_labelWidget;
+
+        XtVaSetValues(widget,
+            XmNlabelString, label_str(),
+            XmNlabelType, XmSTRING,
+            NULL);

 }
 
 }
 

-void wxStaticText::ChangeForegroundColour()
+/*
+   FIXME: UpdateLabel() should be called on size events to allow correct
+          dynamic ellipsizing of the label
+*/
+
+wxSize wxStaticText::DoGetBestSize() const

 {
 {

-    wxWindow::ChangeForegroundColour();
+    int w, h;
+    GetTextExtent(GetLabelText(), &w, &h, NULL, NULL, NULL);
+
+    return wxSize(w, h);

 }
 
 }
 

+#endif // wxUSE_STATTEXT