Changes to WXDLLEXPORT keyword position for VC++ 6.0; changed

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

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 57da5bfdeba339266a44752979a6bf0f40a38da9..ed8ee2a9e626beb2b15e6b09ccb7d0dab4192085 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -36,8 +36,8 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     SetName(name);
     if (parent) parent->AddChild(this);
 
     SetName(name);
     if (parent) parent->AddChild(this);
 

-    SetBackgroundColour(parent->GetBackgroundColour()) ;
-    SetForegroundColour(parent->GetForegroundColour()) ;
+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();

 
     if ( id == -1 )
            m_windowId = (int)NewControlId();
 
     if ( id == -1 )
            m_windowId = (int)NewControlId();


@@ -45,6 +45,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
            m_windowId = id;
 
     m_windowStyle = style;
            m_windowId = id;
 
     m_windowStyle = style;

+    m_windowFont = parent->GetFont();

 
     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
 
 
     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
 


@@ -52,9 +53,12 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
 
     XmString text = XmStringCreateSimple (label1);
 
 
     XmString text = XmStringCreateSimple (label1);
 

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

     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name,
                                          xmLabelWidgetClass,
                                          parentWidget,
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name,
                                          xmLabelWidgetClass,
                                          parentWidget,

+                                         XmNfontList, fontList,

                                          XmNlabelString, text,
                                          XmNalignment,
                      ((style & wxALIGN_RIGHT) ? XmALIGNMENT_END :
                                          XmNlabelString, text,
                                          XmNalignment,
                      ((style & wxALIGN_RIGHT) ? XmALIGNMENT_END :


@@ -67,10 +71,23 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 

-    SetFont(* parent->GetFont());
-
-    ChangeColour (m_mainWidget);
+    ChangeBackgroundColour ();

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

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