X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfc6fde4b1dd5bfd8ae22839ff9a69cf24eb9120..aa57eeea83fac24e9d188fa800bdc96c95f5bbeb:/src/motif/statbox.cpp

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index c3cda9c6d5..0c3d210a5e 100644
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -6,39 +6,80 @@
 // Created:     17/09/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 "statbox.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
+#include "wx/defs.h"
+
 #include "wx/statbox.h"
 #include "wx/utils.h"
 
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #include <Xm/Frame.h>
-#include <Xm/Form.h>
 #include <Xm/Label.h>
-#include <Xm/LabelG.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
-#include <wx/motif/private.h>
+#include "wx/motif/private.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
-	EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
+//EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
 END_EVENT_TABLE()
 
-#endif
+// ----------------------------------------------------------------------------
+// wxXmSizeKeeper
+// ----------------------------------------------------------------------------
+
+// helper class to reduce code duplication
+class wxXmSizeKeeper
+{
+    Dimension m_x, m_y;
+    Widget m_widget;
+public:
+    wxXmSizeKeeper( Widget w )
+        : m_widget( w )
+    {
+        XtVaGetValues( m_widget,
+                       XmNwidth, &m_x,
+                       XmNheight, &m_y,
+                       NULL );
+    }
+
+    void Restore()
+    {
+        int x, y;
+
+        XtVaGetValues( m_widget,
+                       XmNwidth, &x,
+                       XmNheight, &y,
+                       NULL );
+        if( x != m_x || y != m_y )
+            XtVaSetValues( m_widget,
+                           XmNwidth, m_x,
+                           XmNheight, m_y,
+                           NULL );
+    }
+};
 
 /*
  * Static box
  */
- 
+
 wxStaticBox::wxStaticBox()
 {
-    m_formWidget = (WXWidget) 0;
     m_labelWidget = (WXWidget) 0;
 }
 
@@ -49,76 +90,38 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
            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);
-
-    if ( id == -1 )
-  	    m_windowId = (int)NewControlId();
-    else
-	    m_windowId = id;
-
-    m_windowStyle = style;
-
-    bool hasLabel = (!label.IsNull() && !label.IsEmpty()) ;
+    if( !CreateControl( parent, id, pos, size, style,
+                        wxDefaultValidator, name ) )
+        return false;
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
-    Widget formWidget = XtVaCreateManagedWidget ((char*) (const char*) name,
-					xmFormWidgetClass, parentWidget,
-					XmNmarginHeight, 0,
-					XmNmarginWidth, 0,
-					NULL);
-
+    m_mainWidget = XtVaCreateManagedWidget ("staticboxframe",
+            xmFrameWidgetClass, parentWidget,
+            // MBN: why override default?
+            // XmNshadowType, XmSHADOW_IN,
+            NULL);
 
+    bool hasLabel = (!label.IsNull() && !label.IsEmpty()) ;
     if (hasLabel)
     {
-        XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
-
+        WXFontType fontType = m_font.GetFontType( 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);
+        wxXmString text(label1);
+
+        m_labelWidget = (WXWidget) XtVaCreateManagedWidget ("staticboxlabel",
+                xmLabelWidgetClass, (Widget)m_mainWidget,
+                wxFont::GetFontTag(), fontType,                
+                XmNlabelString, text(),
+#if wxCHECK_MOTIF_VERSION( 2, 0 )
+                XmNframeChildType, XmFRAME_TITLE_CHILD,
+#else
+                XmNchildType, XmFRAME_TITLE_CHILD,          
+#endif
+                NULL);
     }
-
-    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 = (WXWidget) frameWidget;
-    m_formWidget = (WXWidget) formWidget;
-
-    SetCanAddEventHandler(TRUE);
-    AttachWidget (parent, (WXWidget) frameWidget, (WXWidget) formWidget, pos.x, pos.y, size.x, size.y);
+    
+    AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);
     ChangeBackgroundColour();
 
     return TRUE;
@@ -126,96 +129,18 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 
 wxStaticBox::~wxStaticBox()
 {
-   DetachWidget(m_formWidget);
    DetachWidget(m_mainWidget);
    XtDestroyWidget((Widget) m_mainWidget);
-   if (m_labelWidget)
-     XtDestroyWidget((Widget) m_labelWidget);
-   XtDestroyWidget((Widget) m_formWidget);
 
    m_mainWidget = (WXWidget) 0;
    m_labelWidget = (WXWidget) 0;
-   m_formWidget = (WXWidget) 0;
 }
 
-void wxStaticBox::SetLabel(const wxString& label)
+void wxStaticBox::SetLabel( const wxString& label )
 {
-    if (!m_labelWidget)
-        return;
+    wxXmSizeKeeper sk( (Widget)GetMainWidget() );
 
-    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;
-    }
-}
+    wxStaticBoxBase::SetLabel( label );
 
-void wxStaticBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    wxControl::DoSetSize (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);
+    sk.Restore();
 }
-
-void wxStaticBox::ChangeBackgroundColour()
-{
-    wxWindow::ChangeBackgroundColour();
-    if (m_labelWidget)
-        DoChangeBackgroundColour(m_labelWidget, m_backgroundColour);
-}
-
-void wxStaticBox::ChangeForegroundColour()
-{
-    wxWindow::ChangeForegroundColour();
-    if (m_labelWidget)
-        DoChangeForegroundColour(m_labelWidget, m_foregroundColour);
-}
-