From 9d2c19f1367399be8d3220fa1c0fcdcb0ff6b6ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 6 Jun 2006 22:02:01 +0000 Subject: [PATCH] Include wx/gauge.h according to precompiled headers of wx/wx.h (with other minor cleaning). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/gauge.mm | 9 +++-- src/gtk/gauge.cpp | 13 +++---- src/gtk1/gauge.cpp | 13 +++---- src/mac/classic/gauge.cpp | 36 +++++++++-------- src/msw/gauge95.cpp | 3 +- src/os2/gauge.cpp | 81 ++++++++++++++++++--------------------- src/palmos/gauge.cpp | 3 +- src/univ/ctrlrend.cpp | 5 +-- src/univ/gauge.cpp | 6 +-- src/xrc/xh_gauge.cpp | 7 +++- 10 files changed, 89 insertions(+), 87 deletions(-) diff --git a/src/cocoa/gauge.mm b/src/cocoa/gauge.mm index 7feb27ef6d..b28f423606 100644 --- a/src/cocoa/gauge.mm +++ b/src/cocoa/gauge.mm @@ -1,20 +1,22 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: cocoa/gauge.mm +// Name: src/cocoa/gauge.mm // Purpose: wxGauge // Author: David Elliott // Modified by: // Created: 2003/07/15 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + #if wxUSE_GAUGE +#include "wx/gauge.h" + #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/gauge.h" #include "wx/log.h" #endif //WX_PRECOMP @@ -26,6 +28,7 @@ #include IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) + BEGIN_EVENT_TABLE(wxGauge, wxGaugeBase) END_EVENT_TABLE() // WX_IMPLEMENT_COCOA_OWNER(wxGauge,NSProgressIndicator,NSView,NSView) diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp index 2bcebf39ac..25beb33bbe 100644 --- a/src/gtk/gauge.cpp +++ b/src/gtk/gauge.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gauge.cpp +// Name: src/gtk/gauge.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,10 +10,10 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/gauge.h" - #if wxUSE_GAUGE +#include "wx/gauge.h" + #include //----------------------------------------------------------------------------- @@ -31,13 +31,13 @@ bool wxGauge::Create( wxWindow *parent, const wxValidator& validator, const wxString& name ) { - m_needParent = TRUE; + m_needParent = true; if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxGauge creation failed") ); - return FALSE; + return false; } m_rangeMax = range; @@ -54,7 +54,7 @@ bool wxGauge::Create( wxWindow *parent, PostCreation(size); SetBestSize(size); - return TRUE; + return true; } void wxGauge::DoSetGauge() @@ -123,4 +123,3 @@ wxGauge::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) } #endif // wxUSE_GAUGE - diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp index 4ddfd61e67..f4f5e3196c 100644 --- a/src/gtk1/gauge.cpp +++ b/src/gtk1/gauge.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gauge.cpp +// Name: src/gtk1/gauge.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,10 +10,10 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/gauge.h" - #if wxUSE_GAUGE +#include "wx/gauge.h" + #include //----------------------------------------------------------------------------- @@ -31,13 +31,13 @@ bool wxGauge::Create( wxWindow *parent, const wxValidator& validator, const wxString& name ) { - m_needParent = TRUE; + m_needParent = true; if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxGauge creation failed") ); - return FALSE; + return false; } m_rangeMax = range; @@ -54,7 +54,7 @@ bool wxGauge::Create( wxWindow *parent, PostCreation(size); SetBestSize(size); - return TRUE; + return true; } void wxGauge::DoSetGauge() @@ -123,4 +123,3 @@ wxGauge::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) } #endif // wxUSE_GAUGE - diff --git a/src/mac/classic/gauge.cpp b/src/mac/classic/gauge.cpp index 85b66b9aaa..f821220971 100644 --- a/src/mac/classic/gauge.cpp +++ b/src/mac/classic/gauge.cpp @@ -1,14 +1,19 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gauge.cpp +// Name: src/mac/classic/gauge.cpp // Purpose: wxGauge class // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// + +#include "wx/wxprec.h" + +#if wxUSE_GAUGE + #include "wx/gauge.h" IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) @@ -16,12 +21,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) #include "wx/mac/uma.h" bool wxGauge::Create(wxWindow *parent, wxWindowID id, - int range, - const wxPoint& pos, - const wxSize& s, - long style, - const wxValidator& validator, - const wxString& name) + int range, + const wxPoint& pos, + const wxSize& s, + long style, + const wxValidator& validator, + const wxString& name) { if ( !wxGaugeBase::Create(parent, id, range, pos, s, style, validator, name) ) return false; @@ -31,20 +36,20 @@ bool wxGauge::Create(wxWindow *parent, wxWindowID id, Str255 title ; m_rangeMax = range ; m_gaugePos = 0 ; - + if ( size.x == wxDefaultCoord && size.y == wxDefaultCoord) { size = wxSize( 200 , 16 ) ; } - + MacPreControlCreate( parent , id , wxEmptyString , pos , size ,style & 0xE0FFFFFF /* no borders on mac */ , validator , name , &bounds , title ) ; - - m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , range, + + m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , range, kControlProgressBarProc , (long) this ) ; - + MacPostControlCreate() ; - - return TRUE; + + return true; } void wxGauge::SetShadowWidth(int w) @@ -87,3 +92,4 @@ int wxGauge::GetValue() const return m_gaugePos; } +#endif // wxUSE_GAUGE diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp index 20ca1b55f5..d3e137616b 100644 --- a/src/msw/gauge95.cpp +++ b/src/msw/gauge95.cpp @@ -26,10 +26,11 @@ #if wxUSE_GAUGE +#include "wx/gauge.h" + #ifndef WX_PRECOMP #endif -#include "wx/gauge.h" #include "wx/msw/private.h" // include "properly" diff --git a/src/os2/gauge.cpp b/src/os2/gauge.cpp index 2bf1c242eb..f0dda60e50 100644 --- a/src/os2/gauge.cpp +++ b/src/os2/gauge.cpp @@ -11,13 +11,16 @@ #include "wx/wxprec.h" +#if wxUSE_GAUGE + +#include "wx/gauge.h" + #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/scrolwin.h" #endif #include "wx/os2/private.h" -#include "wx/gauge.h" static WXFARPROC fnWndProcGauge = (WXFARPROC)NULL; extern void wxAssociateWinWithHandle( HWND hWnd @@ -26,22 +29,20 @@ extern void wxAssociateWinWithHandle( HWND hWnd IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) -MRESULT EXPENTRY wxGaugeWndProc( - HWND hWnd -, UINT uMessage -, MPARAM wParam -, MPARAM lParam -) +MRESULT EXPENTRY wxGaugeWndProc( HWND hWnd, + UINT uMessage, + MPARAM wParam, + MPARAM lParam ) { wxGauge* pGauge = (wxGauge *)::WinQueryWindowULong( hWnd ,QWL_USER ); - HPS hPS; - RECTL vRect; - RECTL vRect2; - RECTL vRect3; - double dPixelToRange = 0.0; - double dRange = 0.0; + HPS hPS; + RECTL vRect; + RECTL vRect2; + RECTL vRect3; + double dPixelToRange = 0.0; + double dRange = 0.0; switch (uMessage ) { @@ -129,23 +130,21 @@ MRESULT EXPENTRY wxGaugeWndProc( ); } // end of wxGaugeWndProc -bool wxGauge::Create( - wxWindowOS2* pParent -, wxWindowID vId -, int nRange -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -, const wxValidator& rValidator -, const wxString& rsName -) +bool wxGauge::Create( wxWindowOS2* pParent, + wxWindowID vId, + int nRange, + const wxPoint& rPos, + const wxSize& rSize, + long lStyle, + const wxValidator& rValidator, + const wxString& rsName ) { - int nX = rPos.x; - int nY = rPos.y; - int nWidth = rSize.x; - int nHeight = rSize.y; - long lMsStyle = 0L; - SWP vSwp; + int nX = rPos.x; + int nY = rPos.y; + int nWidth = rSize.x; + int nHeight = rSize.y; + long lMsStyle = 0L; + SWP vSwp; SetName(rsName); #if wxUSE_VALIDATORS @@ -160,7 +159,7 @@ bool wxGauge::Create( m_nGaugePos = 0; m_windowStyle = lStyle; - if (vId == -1) + if (vId == wxID_ANY) m_windowId = (int)NewControlId(); else m_windowId = vId; @@ -217,7 +216,7 @@ bool wxGauge::Create( m_nHeight = nHeight; ::WinShowWindow((HWND)GetHWND(), TRUE); delete pTextFont; - return TRUE; + return true; } // end of wxGauge::Create int wxGauge::GetBezelFace() const @@ -255,9 +254,7 @@ bool wxGauge::SetBackgroundColour( const wxColour& rColour ) return true; } // end of wxGauge::SetBackgroundColour -void wxGauge::SetBezelFace( - int WXUNUSED(nWidth) -) +void wxGauge::SetBezelFace( int WXUNUSED(nWidth) ) { } // end of wxGauge::SetBezelFace @@ -277,24 +274,18 @@ bool wxGauge::SetForegroundColour( const wxColour& rColour ) return true; } // end of wxGauge::SetForegroundColour -void wxGauge::SetRange( - int nRange -) +void wxGauge::SetRange( int nRange ) { m_nRangeMax = nRange; } // end of wxGauge::SetRange -void wxGauge::SetShadowWidth( - int WXUNUSED(nWidth) -) +void wxGauge::SetShadowWidth( int WXUNUSED(nWidth) ) { } // end of wxGauge::SetShadowWidth -void wxGauge::SetValue( - int nPos -) +void wxGauge::SetValue( int nPos ) { - RECT vRect; + RECT vRect; m_nGaugePos = nPos; ::WinQueryWindowRect(GetHwnd(), &vRect); @@ -305,3 +296,5 @@ wxSize wxGauge::DoGetBestSize() const { return wxSize(m_nWidth,m_nHeight); } + +#endif // wxUSE_GAUGE diff --git a/src/palmos/gauge.cpp b/src/palmos/gauge.cpp index f0c47e3878..fdc6df77f1 100644 --- a/src/palmos/gauge.cpp +++ b/src/palmos/gauge.cpp @@ -26,10 +26,11 @@ #if wxUSE_GAUGE +#include "wx/gauge.h" + #ifndef WX_PRECOMP #endif -#include "wx/gauge.h" #include "wx/palmos/private.h" // ---------------------------------------------------------------------------- diff --git a/src/univ/ctrlrend.cpp b/src/univ/ctrlrend.cpp index 5a803f20a0..f1c35bb27d 100644 --- a/src/univ/ctrlrend.cpp +++ b/src/univ/ctrlrend.cpp @@ -32,6 +32,7 @@ #include "wx/scrolbar.h" #include "wx/dc.h" #include "wx/log.h" + #include "wx/gauge.h" #endif // WX_PRECOMP #include "wx/image.h" @@ -40,10 +41,6 @@ #include "wx/univ/renderer.h" #include "wx/univ/colschem.h" -#if wxUSE_GAUGE - #include "wx/gauge.h" -#endif - // ============================================================================ // implementation // ============================================================================ diff --git a/src/univ/gauge.cpp b/src/univ/gauge.cpp index 898d4effa3..5043825c22 100644 --- a/src/univ/gauge.cpp +++ b/src/univ/gauge.cpp @@ -24,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" diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp index 2b8a9b9791..9d63af74d0 100644 --- a/src/xrc/xh_gauge.cpp +++ b/src/xrc/xh_gauge.cpp @@ -18,12 +18,15 @@ #if wxUSE_XRC && wxUSE_GAUGE #include "wx/xrc/xh_gauge.h" -#include "wx/gauge.h" + +#ifndef WX_PRECOMP + #include "wx/gauge.h" +#endif IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler) wxGaugeXmlHandler::wxGaugeXmlHandler() -: wxXmlResourceHandler() + :wxXmlResourceHandler() { XRC_ADD_STYLE(wxGA_HORIZONTAL); XRC_ADD_STYLE(wxGA_VERTICAL); -- 2.45.2