Changed a few true -> TRUE

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

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index 7d9cbd0c8eb0c165cbd6b4577e87071a6e2e9fce..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)
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxStaticBox, wxControl)

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

 END_EVENT_TABLE()
 
 #endif
 END_EVENT_TABLE()
 
 #endif


@@ -53,6 +53,7 @@ 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_font = parent->GetFont();

 
     SetName(name);
 
 
     SetName(name);
 


@@ -78,10 +79,13 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 
     if (hasLabel)
     {
 
     if (hasLabel)
     {

+        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,
                                             xmLabelWidgetClass, formWidget,
         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);
                                             XmNlabelString, text,
                                             NULL);
         XmStringFree (text);


@@ -110,15 +114,30 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
                     XmNrightAttachment, XmATTACH_FORM,
                     NULL);
 
                     XmNrightAttachment, XmATTACH_FORM,
                     NULL);
 

-    m_mainWidget = (Widget) formWidget;
+    m_mainWidget = (WXWidget) frameWidget;
+    m_formWidget = (WXWidget) formWidget;

 
     SetCanAddEventHandler(TRUE);
 
     SetCanAddEventHandler(TRUE);

-    AttachWidget (parent, m_mainWidget, (WXWidget) frameWidget, pos.x, pos.y, size.x, size.y);
+    AttachWidget (parent, (WXWidget) frameWidget, (WXWidget) formWidget, pos.x, pos.y, size.x, size.y);

     ChangeBackgroundColour();
 
     return TRUE;
 }
 
     ChangeBackgroundColour();
 
     return TRUE;
 }
 

+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)
 {
     if (!m_labelWidget)
 void wxStaticBox::SetLabel(const wxString& label)
 {
     if (!m_labelWidget)


@@ -163,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)
     {
 
     if (m_labelWidget)
     {


@@ -189,10 +208,14 @@ void wxStaticBox::ChangeFont(bool keepOriginalSize)
 void wxStaticBox::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
 void wxStaticBox::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();

+    if (m_labelWidget)
+        DoChangeBackgroundColour(m_labelWidget, m_backgroundColour);

 }
 
 void wxStaticBox::ChangeForegroundColour()
 {
     wxWindow::ChangeForegroundColour();
 }
 
 void wxStaticBox::ChangeForegroundColour()
 {
     wxWindow::ChangeForegroundColour();

+    if (m_labelWidget)
+        DoChangeForegroundColour(m_labelWidget, m_foregroundColour);

 }
 
 }