define {first,second}_type in the struct declared by _WX_DECLARE_PAIR too for compati...

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

diff --git a/src/univ/gauge.cpp b/src/univ/gauge.cpp
index c8ebbb2289d05a94aa64ecde5cef47649d0b2833..c887c2cf176cced1e02e0a87080eba4db5d683d0 100644 (file)
--- a/src/univ/gauge.cpp
+++ b/src/univ/gauge.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "gaugeuniv.h"
-#endif
-

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


@@ -28,12 +24,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-#endif //WX_PRECOMP
+#if wxUSE_GAUGE

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

-#if wxUSE_GAUGE
+#ifndef WX_PRECOMP
+#endif //WX_PRECOMP

 
 #include "wx/univ/renderer.h"
 
 
 #include "wx/univ/renderer.h"
 


@@ -65,12 +61,12 @@ bool wxGauge::Create(wxWindow *parent,
     if ( !wxGaugeBase::Create(parent, id, range, pos, size, style,
                               validator, name) )
     {
     if ( !wxGaugeBase::Create(parent, id, range, pos, size, style,
                               validator, name) )
     {

-        return FALSE;
+        return false;

     }
 
     }
 

-    SetBestSize(size);
+    SetInitialSize(size);

 
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -104,12 +100,12 @@ wxSize wxGauge::DoGetBestClientSize() const
     if ( IsVertical() )
     {
         size.x = (3*size.y) / 2 + 2;
     if ( IsVertical() )
     {
         size.x = (3*size.y) / 2 + 2;

-        size.y = -1;
+        size.y = wxDefaultCoord;

     }
     else
     {
         size.y = (3*size.x) / 2 + 2;
     }
     else
     {
         size.y = (3*size.x) / 2 + 2;

-        size.x = -1;
+        size.x = wxDefaultCoord;

     }
 
     return size;
     }
 
     return size;