Added script to help make wxMotif via configure; nativdlg sample works again;

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

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index 9b46697f96b0415ec125a9717c9caa6d842e2762..487d56710bf19a02b876697431a024c27a0a83eb 100644 (file)
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -14,6 +14,14 @@
 #endif
 
 #include "wx/statbox.h"
 #endif
 
 #include "wx/statbox.h"

+#include "wx/utils.h"
+
+#include <Xm/Frame.h>
+#include <Xm/Form.h>
+#include <Xm/Label.h>
+#include <Xm/LabelG.h>
+
+#include <wx/motif/private.h>

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)


@@ -28,6 +36,12 @@ END_EVENT_TABLE()
  * Static box
  */
  
  * Static box
  */
  

+wxStaticBox::wxStaticBox()
+{
+    m_formWidget = (WXWidget) 0;
+    m_labelWidget = (WXWidget) 0;
+}
+

 bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
            const wxPoint& pos,
 bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& label,
            const wxPoint& pos,


@@ -35,6 +49,12 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

+    m_formWidget = (WXWidget) 0;
+    m_labelWidget = (WXWidget) 0;
+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();
+    m_windowFont = parent->GetFont();
+

     SetName(name);
 
     if (parent) parent->AddChild(this);
     SetName(name);
 
     if (parent) parent->AddChild(this);


@@ -46,17 +66,137 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 
     m_windowStyle = style;
 
 
     m_windowStyle = style;
 

-    // TODO: create static box
-    return FALSE;
+    bool hasLabel = (!label.IsNull() && !label.IsEmpty()) ;
+
+    Widget parentWidget = (Widget) parent->GetClientWidget();
+
+    Widget formWidget = XtVaCreateManagedWidget ((char*) (const char*) name,
+                                       xmFormWidgetClass, parentWidget,
+                                       XmNmarginHeight, 0,
+                                       XmNmarginWidth, 0,
+                                       NULL);
+
+
+    if (hasLabel)
+    {
+        XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
+
+        wxString label1(wxStripMenuCodes(label));
+        XmString text = XmStringCreateSimple ((char*) (const char*) label1);
+        m_labelWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) label1,
+                                            xmLabelWidgetClass, formWidget,
+                                             XmNfontList, fontList,
+                                            XmNlabelString, text,
+                                            NULL);
+        XmStringFree (text);
+    }
+
+    Widget frameWidget = XtVaCreateManagedWidget ("frame",
+                                       xmFrameWidgetClass, formWidget,
+                                        XmNshadowType, XmSHADOW_IN,
+//                                     XmNmarginHeight, 0,
+//                                     XmNmarginWidth, 0,
+                                       NULL);
+
+    if (hasLabel)
+        XtVaSetValues ((Widget) m_labelWidget,
+                      XmNtopAttachment, XmATTACH_FORM,
+                      XmNleftAttachment, XmATTACH_FORM,
+                      XmNrightAttachment, XmATTACH_FORM,
+                      XmNalignment, XmALIGNMENT_BEGINNING,
+                      NULL);
+
+    XtVaSetValues (frameWidget,
+           XmNtopAttachment, hasLabel ? XmATTACH_WIDGET : XmATTACH_FORM,
+                    XmNtopWidget, hasLabel ? (Widget) m_labelWidget : formWidget,
+                    XmNbottomAttachment, XmATTACH_FORM,
+                    XmNleftAttachment, XmATTACH_FORM,
+                    XmNrightAttachment, XmATTACH_FORM,
+                    NULL);
+
+    m_mainWidget = (Widget) formWidget;
+
+    SetCanAddEventHandler(TRUE);
+    AttachWidget (parent, m_mainWidget, (WXWidget) frameWidget, pos.x, pos.y, size.x, size.y);
+    ChangeBackgroundColour();
+
+    return TRUE;

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

-    // TODO
+    if (!m_labelWidget)
+        return;
+
+    if (!label.IsNull())
+    {
+        wxString label1(wxStripMenuCodes(label));
+
+        XmString text = XmStringCreateSimple ((char*) (const char*) label1);
+        XtVaSetValues ((Widget) m_labelWidget,
+                    XmNlabelString, text,
+                    XmNlabelType, XmSTRING,
+                    NULL);
+        XmStringFree (text);
+    }
+}
+
+wxString wxStaticBox::GetLabel() const
+{
+    if (!m_labelWidget)
+        return wxEmptyString;
+
+    XmString text = 0;
+    char *s;
+    XtVaGetValues ((Widget) m_labelWidget,
+                XmNlabelString, &text,
+                NULL);
+
+    if (!text)
+        return wxEmptyString;
+
+    if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
+    {
+        wxString str(s);
+        XtFree (s);
+        return str;
+    }
+    else
+    {
+        return wxEmptyString;
+    }

 }
 
 void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
 {
 }
 
 void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
 {

-    // TODO
+    wxControl::SetSize (x, y, width, height, sizeFlags);
+
+    if (m_labelWidget)
+    {
+        Dimension xx, yy;
+        XtVaGetValues ((Widget) m_labelWidget, XmNwidth, &xx, XmNheight, &yy, NULL);
+
+        if (width > -1)
+            XtVaSetValues ((Widget) m_mainWidget, XmNwidth, width,
+                   NULL);
+        if (height > -1)
+            XtVaSetValues ((Widget) m_mainWidget, XmNheight, height - yy,
+                   NULL);
+    }
+}
+
+void wxStaticBox::ChangeFont(bool keepOriginalSize)
+{
+    wxWindow::ChangeFont(keepOriginalSize);
+}
+
+void wxStaticBox::ChangeBackgroundColour()
+{
+    wxWindow::ChangeBackgroundColour();
+}
+
+void wxStaticBox::ChangeForegroundColour()
+{
+    wxWindow::ChangeForegroundColour();

 }
 
 }