transparent xpm bitmaps added, thread support finished

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

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index 5d8bf67b59e57c306d3909ff40b6b960d7b1b85a..d0af7ee303c4a1c3b6601c1e23a39bdc9e1e5ca6 100644 (file)
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -16,26 +16,30 @@
 #include "wx/statbox.h"
 #include "wx/utils.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>
 #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)
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxStaticBox, wxControl)

-       EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
+//EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-#endif

 
 /*
  * Static box
  */
 
 /*
  * Static box
  */

- 
+

 wxStaticBox::wxStaticBox()
 {
     m_formWidget = (WXWidget) 0;
 wxStaticBox::wxStaticBox()
 {
     m_formWidget = (WXWidget) 0;


@@ -53,16 +57,16 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
     m_labelWidget = (WXWidget) 0;
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
     m_labelWidget = (WXWidget) 0;
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();

-    m_windowFont = parent->GetFont();
+    m_font = parent->GetFont();

 
     SetName(name);
 
     if (parent) parent->AddChild(this);
 
     if ( id == -1 )
 
     SetName(name);
 
     if (parent) parent->AddChild(this);
 
     if ( id == -1 )

-           m_windowId = (int)NewControlId();
+        m_windowId = (int)NewControlId();

     else
     else

-           m_windowId = id;
+        m_windowId = id;

 
     m_windowStyle = style;
 
 
     m_windowStyle = style;
 


@@ -71,48 +75,48 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     Widget formWidget = XtVaCreateManagedWidget ((char*) (const char*) name,
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     Widget formWidget = XtVaCreateManagedWidget ((char*) (const char*) name,

-                                       xmFormWidgetClass, parentWidget,
-                                       XmNmarginHeight, 0,
-                                       XmNmarginWidth, 0,
-                                       NULL);
+            xmFormWidgetClass, parentWidget,
+            XmNmarginHeight, 0,
+            XmNmarginWidth, 0,
+            NULL);

 
 
     if (hasLabel)
     {
 
 
     if (hasLabel)
     {

-        XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
+        XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));

 
         wxString label1(wxStripMenuCodes(label));
         XmString text = XmStringCreateSimple ((char*) (const char*) label1);
         m_labelWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) label1,
 
         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);
+                xmLabelWidgetClass, formWidget,
+                XmNfontList, fontList,
+                XmNlabelString, text,
+                NULL);

         XmStringFree (text);
     }
 
     Widget frameWidget = XtVaCreateManagedWidget ("frame",
         XmStringFree (text);
     }
 
     Widget frameWidget = XtVaCreateManagedWidget ("frame",

-                                       xmFrameWidgetClass, formWidget,
-                                        XmNshadowType, XmSHADOW_IN,
-//                                     XmNmarginHeight, 0,
-//                                     XmNmarginWidth, 0,
-                                       NULL);
+            xmFrameWidgetClass, formWidget,
+            XmNshadowType, XmSHADOW_IN,
+            //XmNmarginHeight, 0,
+            //XmNmarginWidth, 0,
+            NULL);

 
     if (hasLabel)
         XtVaSetValues ((Widget) m_labelWidget,
 
     if (hasLabel)
         XtVaSetValues ((Widget) m_labelWidget,

-                      XmNtopAttachment, XmATTACH_FORM,
-                      XmNleftAttachment, XmATTACH_FORM,
-                      XmNrightAttachment, XmATTACH_FORM,
-                      XmNalignment, XmALIGNMENT_BEGINNING,
-                      NULL);
+                XmNtopAttachment, XmATTACH_FORM,
+                XmNleftAttachment, XmATTACH_FORM,
+                XmNrightAttachment, XmATTACH_FORM,
+                XmNalignment, XmALIGNMENT_BEGINNING,
+                NULL);

 
     XtVaSetValues (frameWidget,
 
     XtVaSetValues (frameWidget,

-           XmNtopAttachment, hasLabel ? XmATTACH_WIDGET : XmATTACH_FORM,
-                    XmNtopWidget, hasLabel ? (Widget) m_labelWidget : formWidget,
-                    XmNbottomAttachment, XmATTACH_FORM,
-                    XmNleftAttachment, XmATTACH_FORM,
-                    XmNrightAttachment, XmATTACH_FORM,
-                    NULL);
+            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;
 
     m_mainWidget = (WXWidget) frameWidget;
     m_formWidget = (WXWidget) formWidget;


@@ -127,6 +131,15 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 wxStaticBox::~wxStaticBox()
 {
    DetachWidget(m_formWidget);
 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)


@@ -140,9 +153,9 @@ void wxStaticBox::SetLabel(const wxString& label)
 
         XmString text = XmStringCreateSimple ((char*) (const char*) label1);
         XtVaSetValues ((Widget) m_labelWidget,
 
         XmString text = XmStringCreateSimple ((char*) (const char*) label1);
         XtVaSetValues ((Widget) m_labelWidget,

-                    XmNlabelString, text,
-                    XmNlabelType, XmSTRING,
-                    NULL);
+                XmNlabelString, text,
+                XmNlabelType, XmSTRING,
+                NULL);

         XmStringFree (text);
     }
 }
         XmStringFree (text);
     }
 }


@@ -155,8 +168,8 @@ wxString wxStaticBox::GetLabel() const
     XmString text = 0;
     char *s;
     XtVaGetValues ((Widget) m_labelWidget,
     XmString text = 0;
     char *s;
     XtVaGetValues ((Widget) m_labelWidget,

-                XmNlabelString, &text,
-                NULL);
+            XmNlabelString, &text,
+            NULL);

 
     if (!text)
         return wxEmptyString;
 
     if (!text)
         return wxEmptyString;


@@ -173,9 +186,9 @@ wxString wxStaticBox::GetLabel() const
     }
 }
 
     }
 }
 

-void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxStaticBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
 {

-    wxControl::SetSize (x, y, width, height, sizeFlags);
+    wxControl::DoSetSize (x, y, width, height, sizeFlags);

 
     if (m_labelWidget)
     {
 
     if (m_labelWidget)
     {


@@ -184,10 +197,10 @@ void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
 
         if (width > -1)
             XtVaSetValues ((Widget) m_mainWidget, XmNwidth, width,
 
         if (width > -1)
             XtVaSetValues ((Widget) m_mainWidget, XmNwidth, width,

-                   NULL);
+                    NULL);

         if (height > -1)
             XtVaSetValues ((Widget) m_mainWidget, XmNheight, height - yy,
         if (height > -1)
             XtVaSetValues ((Widget) m_mainWidget, XmNheight, height - yy,

-                   NULL);
+                    NULL);

     }
 }
 
     }
 }