X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..2028c33ab5a39a12bd410ac953731a56ad6377ba:/src/univ/gauge.cpp diff --git a/src/univ/gauge.cpp b/src/univ/gauge.cpp index e0d1d557d0..c887c2cf17 100644 --- a/src/univ/gauge.cpp +++ b/src/univ/gauge.cpp @@ -6,7 +6,7 @@ // Created: 20.02.01 // RCS-ID: $Id$ // Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) -// License: wxWidgets licence +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // 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" @@ -28,12 +24,12 @@ #pragma hdrstop #endif -#ifndef WX_PRECOMP -#endif //WX_PRECOMP +#if wxUSE_GAUGE #include "wx/gauge.h" -#if wxUSE_GAUGE +#ifndef WX_PRECOMP +#endif //WX_PRECOMP #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) ) { - 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; - size.y = -1; + size.y = wxDefaultCoord; } else { size.y = (3*size.x) / 2 + 2; - size.x = -1; + size.x = wxDefaultCoord; } return size;