X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/125ccda1967a6859ac11beec1a932dc967c22b65..1ae82ba9f23ee688bc4db2cd449eca5bf97cfdf0:/src/msw/gauge95.cpp diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp index d2a7b58b23..d3e137616b 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,19 +24,18 @@ #pragma hdrstop #endif -#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 +#ifndef WX_PRECOMP #endif +#include "wx/msw/private.h" + +// include "properly" +#include "wx/msw/wrapcctl.h" + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -78,7 +73,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 +94,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 +114,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 @@ -171,10 +168,10 @@ wxSize wxGauge95::DoGetBestSize() const { // VZ: no idea where does 28 come from, it was there before my changes and // as nobody ever complained I guess we can leave it... - if (HasFlag(wxGA_HORIZONTAL)) - return wxSize(100, 28); + if (HasFlag(wxGA_VERTICAL)) + return wxSize(28, 100); else - return wxSize(28,100); + return wxSize(100, 28); } // ---------------------------------------------------------------------------- @@ -221,4 +218,3 @@ bool wxGauge95::SetBackgroundColour(const wxColour& col) } #endif // wxUSE_GAUGE -