X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..df97a4ef79613ac2f73a62601a9fa738d79c77a4:/src/univ/gauge.cpp diff --git a/src/univ/gauge.cpp b/src/univ/gauge.cpp index 68057bda65..663a8ffe8e 100644 --- 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 Vadim Zeitlin -// License: wxWindows license +// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "gaugeuniv.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,17 +24,15 @@ #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" -IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) - // ============================================================================ // implementation // ============================================================================ @@ -65,12 +59,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 +98,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;