Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

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

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index 46f69f11896231d00cdaff3bac70d08ee146c89e..2ea22aee4dc3cb3c0d1902ac93d188a7d06dfaff 100644 (file)
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -9,38 +9,64 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "statbox.h"
-#endif
-
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/statbox.h"
 
 #include "wx/statbox.h"

-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
 #include <Xm/Frame.h>
 
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
 #include <Xm/Frame.h>

-#include <Xm/Form.h>

 #include <Xm/Label.h>
 #include <Xm/Label.h>

-#include <Xm/LabelG.h>

 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif
 
 #include "wx/motif/private.h"
 
 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif
 
 #include "wx/motif/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-

 BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
 //EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
 //EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
 END_EVENT_TABLE()
 

+// ----------------------------------------------------------------------------
+// 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
 
 /*
  * Static box


@@ -58,53 +84,42 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
-    m_font = parent->GetFont();
-
-    SetName(name);
-
-    if (parent) parent->AddChild(this);
-
-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
-
-    m_windowStyle = style;
+    if( !CreateControl( parent, id, pos, size, style,
+                        wxDefaultValidator, name ) )
+        return false;
+    m_labelWidget = (WXWidget) 0;
+    PreCreation();

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     m_mainWidget = XtVaCreateManagedWidget ("staticboxframe",
             xmFrameWidgetClass, parentWidget,
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     m_mainWidget = XtVaCreateManagedWidget ("staticboxframe",
             xmFrameWidgetClass, parentWidget,

-            XmNshadowType, XmSHADOW_IN,
-            //XmNmarginHeight, 0,
-            //XmNmarginWidth, 0,
+            // MBN: why override default?
+            // XmNshadowType, XmSHADOW_IN,

             NULL);
 
             NULL);
 

-    bool hasLabel = (!label.IsNull() && !label.IsEmpty()) ;
-    if (hasLabel)
+    if (!label.empty())

     {
     {

-        XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
-        wxString label1(wxStripMenuCodes(label));
+        wxString label1(GetLabelText(label));

         wxXmString text(label1);
         wxXmString text(label1);

-        m_labelWidget = (WXWidget) XtVaCreateManagedWidget (label1.c_str(),
+        Display* dpy = XtDisplay( parentWidget );
+
+        m_labelWidget = (WXWidget) XtVaCreateManagedWidget ("staticboxlabel",

                 xmLabelWidgetClass, (Widget)m_mainWidget,
                 xmLabelWidgetClass, (Widget)m_mainWidget,

-                XmNfontList, fontList,
+                wxFont::GetFontTag(), m_font.GetFontTypeC(dpy),

                 XmNlabelString, text(),
                 XmNlabelString, text(),

-#if (XmVersion > 1200)
+#if wxCHECK_MOTIF_VERSION( 2, 0 )

                 XmNframeChildType, XmFRAME_TITLE_CHILD,
 #else
                 XmNframeChildType, XmFRAME_TITLE_CHILD,
 #else

-                XmNchildType, XmFRAME_TITLE_CHILD,          
+                XmNchildType, XmFRAME_TITLE_CHILD,

 #endif
                 NULL);
     }
 #endif
                 NULL);
     }

-    
-    SetCanAddEventHandler(TRUE);
+
+    PostCreation();

     AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);
     AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);

-    ChangeBackgroundColour();

 
 

-    return TRUE;
+    return true;

 }
 
 wxStaticBox::~wxStaticBox()
 }
 
 wxStaticBox::~wxStaticBox()


@@ -116,52 +131,35 @@ wxStaticBox::~wxStaticBox()
    m_labelWidget = (WXWidget) 0;
 }
 
    m_labelWidget = (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));
+    wxStaticBoxBase::SetLabel( label );

 
 

-        wxXmString text(label1);
-        XtVaSetValues ((Widget) m_labelWidget,
-                XmNlabelString, text(),
-                XmNlabelType, XmSTRING,
-                NULL);
-    }
+    sk.Restore();

 }
 
 }
 

-wxString wxStaticBox::GetLabel() const
+void wxStaticBox::GetBordersForSizer(int *borderTop, int *borderOther) const

 {
 {

-    if (!m_labelWidget)
-        return wxEmptyString;
+    Dimension shadow, border;

 
 

-    XmString text = 0;
-    char *s;
-    XtVaGetValues ((Widget) m_labelWidget,
-            XmNlabelString, &text,
-            NULL);
+    XtVaGetValues( (Widget) GetMainWidget(),
+                   XmNshadowThickness, &shadow,
+                   XmNborderWidth, &border,
+                   NULL);

 
 

-    if (!text)
-        return wxEmptyString;
+    *borderOther = shadow + border;

 
 

-    if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
+    if( GetLabelWidget() )

     {
     {

-        wxString str(s);
-        XtFree (s);
-        return str;
+        XtWidgetGeometry preferred;
+        XtQueryGeometry( (Widget) GetLabelWidget(), NULL, &preferred );
+
+        *borderTop = preferred.height;

     }
     else
     {
     }
     else
     {

-        return wxEmptyString;
+        *borderTop = shadow;

     }
 }
     }
 }

-
-void wxStaticBox::ChangeFont(bool keepOriginalSize)
-{
-    wxWindow::ChangeFont(keepOriginalSize);
-}
-
-