X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..3e0630be8a5757147a0b2cc3bfa44109c5e4c9cb:/src/msw/gauge95.cpp diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp index 6b176c92ec..20ca1b55f5 100644 --- a/src/msw/gauge95.cpp +++ b/src/msw/gauge95.cpp @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "gauge95.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,18 +24,16 @@ #pragma hdrstop #endif +#if wxUSE_GAUGE + #ifndef WX_PRECOMP - #include "wx/defs.h" #endif -#if wxUSE_GAUGE - #include "wx/gauge.h" #include "wx/msw/private.h" -#if !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) - #include <commctrl.h> -#endif +// include <commctrl.h> "properly" +#include "wx/msw/wrapcctl.h" // ---------------------------------------------------------------------------- // constants @@ -78,7 +72,7 @@ wxBEGIN_FLAGS( wxGaugeStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -99,7 +93,9 @@ wxBEGIN_FLAGS( wxGaugeStyle ) wxFLAGS_MEMBER(wxGA_HORIZONTAL) wxFLAGS_MEMBER(wxGA_VERTICAL) +#if WXWIN_COMPATIBILITY_2_6 wxFLAGS_MEMBER(wxGA_PROGRESSBAR) +#endif // WXWIN_COMPATIBILITY_2_6 wxFLAGS_MEMBER(wxGA_SMOOTH) wxEND_FLAGS( wxGaugeStyle ) @@ -117,7 +113,7 @@ wxEND_PROPERTIES_TABLE() wxBEGIN_HANDLERS_TABLE(wxGauge95) wxEND_HANDLERS_TABLE() -wxCONSTRUCTOR_6( wxGauge95 , wxWindow* , Parent , wxWindowID , Id , int , Range , wxPoint , Position , wxSize , Size , long , WindowStyle ) +wxCONSTRUCTOR_6( wxGauge95 , wxWindow* , Parent , wxWindowID , Id , int , Range , wxPoint , Position , wxSize , Size , long , WindowStyle ) #else IMPLEMENT_DYNAMIC_CLASS(wxGauge95, wxControl) #endif @@ -221,4 +217,3 @@ bool wxGauge95::SetBackgroundColour(const wxColour& col) } #endif // wxUSE_GAUGE -