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

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

diff --git a/src/motif/gauge.cpp b/src/motif/gauge.cpp
index 4067322557df735ba6c3c4596474a0089b0ee695..d47c8d976a7b686323b176094b5aa9622d9a0172 100644 (file)
--- a/src/motif/gauge.cpp
+++ b/src/motif/gauge.cpp
@@ -123,10 +123,12 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id,
     if (height == -1)
         height = 80;
 
     if (height == -1)
         height = 80;
 

+    m_windowFont = parent->GetFont();
+    ChangeFont(FALSE);
+

     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, x, y, width, height);
 
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, x, y, width, height);
 

-    SetFont(* parent->GetFont());

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


@@ -188,19 +190,19 @@ int wxGauge::GetValue() const
 //    return m_gaugePos;
 }
 
 //    return m_gaugePos;
 }
 

-void wxGauge::ChangeFont()
+void wxGauge::ChangeFont(bool keepOriginalSize)

 {
 {

-    // TODO
+    wxWindow::ChangeFont(keepOriginalSize);

 }
 
 void wxGauge::ChangeBackgroundColour()
 {
 }
 
 void wxGauge::ChangeBackgroundColour()
 {

-    // TODO
+    wxWindow::ChangeBackgroundColour();

 }
 
 void wxGauge::ChangeForegroundColour()
 {
 }
 
 void wxGauge::ChangeForegroundColour()
 {

-    // TODO
+    wxWindow::ChangeForegroundColour();

 }
 
 //// PRIVATE DECLARATIONS FOR XMGAUGE
 }
 
 //// PRIVATE DECLARATIONS FOR XMGAUGE