Couple more Unicode fixes.

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

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index 5d8bf67b59e57c306d3909ff40b6b960d7b1b85a..872d120417c2e1fe81848a5644df0fca9719af69 100644 (file)
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -27,7 +27,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxStaticBox, wxControl)
-       EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
+//     EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground)
 END_EVENT_TABLE()
 
 #endif
@@ -53,7 +53,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
     m_labelWidget = (WXWidget) 0;
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
-    m_windowFont = parent->GetFont();
+    m_font = parent->GetFont();
 
     SetName(name);
 
@@ -79,7 +79,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 
     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);
@@ -127,6 +127,15 @@ 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)
@@ -173,9 +182,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)
     {