#ifdefed out Ole... functions for Cygwin.

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

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index b695120c8f4a4c8015ab40a1178be5ffad6c31d2..487d56710bf19a02b876697431a024c27a0a83eb 100644 (file)
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -51,6 +51,9 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 {
     m_formWidget = (WXWidget) 0;
     m_labelWidget = (WXWidget) 0;
 {
     m_formWidget = (WXWidget) 0;
     m_labelWidget = (WXWidget) 0;

+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();
+    m_windowFont = parent->GetFont();

 
     SetName(name);
 
 
     SetName(name);
 


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

+        XmFontList fontList = (XmFontList) m_windowFont.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);


@@ -112,7 +118,7 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id,
 
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) frameWidget, pos.x, pos.y, size.x, size.y);
 
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) frameWidget, pos.x, pos.y, size.x, size.y);

-    ChangeColour(m_mainWidget);
+    ChangeBackgroundColour();

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -179,3 +185,18 @@ void wxStaticBox::SetSize(int x, int y, int width, int height, int sizeFlags)
     }
 }
 
     }
 }
 

+void wxStaticBox::ChangeFont(bool keepOriginalSize)
+{
+    wxWindow::ChangeFont(keepOriginalSize);
+}
+
+void wxStaticBox::ChangeBackgroundColour()
+{
+    wxWindow::ChangeBackgroundColour();
+}
+
+void wxStaticBox::ChangeForegroundColour()
+{
+    wxWindow::ChangeForegroundColour();
+}
+