Rework IE virtual file system support to use new syntax. Remove now unused code for...

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

diff --git a/src/univ/gauge.cpp b/src/univ/gauge.cpp
index e0d1d557d0d8f516c1381af1ae174fffcc55d122..663a8ffe8ef300f1b7c0c68fdead8555ca2d3f17 100644 (file)
--- a/src/univ/gauge.cpp
+++ b/src/univ/gauge.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        src/gauge/gaugecmn.cpp
+// Name:        src/gauge/gauge.cpp

 // Purpose:     wxGauge for wxUniversal
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Purpose:     wxGauge for wxUniversal
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     20.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

-// License:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -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,17 +24,15 @@
     #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"
 

-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -65,12 +59,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 +98,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;