Declare strptime when using MSL headers on OS X.

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

diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp
index f180206c79e4f136fa745f4fada77190f5958dbe..985c42bcc3dcd148f6cb3ca79fd30fcf38773eea 100644 (file)
--- a/src/gtk1/gauge.cpp
+++ b/src/gtk1/gauge.cpp
@@ -7,10 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "gauge.h"
 #endif
 
 #pragma implementation "gauge.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/gauge.h"
 
 #if wxUSE_GAUGE
 #include "wx/gauge.h"
 
 #if wxUSE_GAUGE


@@ -52,10 +55,9 @@ bool wxGauge::Create( wxWindow *parent,
 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 

-    PostCreation();
-
-    Show( TRUE );
-
+    PostCreation(size);
+    SetBestSize(size);
+    

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -68,6 +70,17 @@ void wxGauge::DoSetGauge()
                              m_rangeMax ? ((float)m_gaugePos)/m_rangeMax : 0.);
 }
 
                              m_rangeMax ? ((float)m_gaugePos)/m_rangeMax : 0.);
 }
 

+wxSize wxGauge::DoGetBestSize() const
+{
+    wxSize best;
+    if (HasFlag(wxGA_VERTICAL))
+        best = wxSize(28, 100);
+    else
+        best = wxSize(100, 28);
+    CacheBestSize(best);
+    return best;
+}
+

 void wxGauge::SetRange( int range )
 {
     m_rangeMax = range;
 void wxGauge::SetRange( int range )
 {
     m_rangeMax = range;


@@ -96,10 +109,21 @@ int wxGauge::GetValue() const
     return m_gaugePos;
 }
 
     return m_gaugePos;
 }
 

-void wxGauge::ApplyWidgetStyle()
+wxVisualAttributes wxGauge::GetDefaultAttributes() const
+{
+    // Visible gauge colours use a different colour state
+    return GetDefaultAttributesFromGTKWidget(m_widget,
+                                             UseGTKStyleBase(),
+                                             GTK_STATE_ACTIVE);
+
+}
+
+// static
+wxVisualAttributes
+wxGauge::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    return GetDefaultAttributesFromGTKWidget(gtk_progress_bar_new,
+                                             false, GTK_STATE_ACTIVE);

 }
 
 #endif // wxUSE_GAUGE
 }
 
 #endif // wxUSE_GAUGE