X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7bdfb981a826d29e292738a27700543fa10d2bfb..120678ee96cd38c8d10ead6e60135004b8e97f9e:/src/msw/gauge95.cpp diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp index 6e3a01a249..e06f66301c 100644 --- a/src/msw/gauge95.cpp +++ b/src/msw/gauge95.cpp @@ -78,7 +78,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) @@ -117,7 +117,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 @@ -145,9 +145,6 @@ bool wxGauge95::Create(wxWindow *parent, if ( !MSWCreateControl(PROGRESS_CLASS, wxEmptyString, pos, size) ) return false; - SetBackgroundColour(parent->GetBackgroundColour()); - SetForegroundColour(parent->GetForegroundColour()); - SetRange(range); return true; @@ -174,10 +171,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); } // ----------------------------------------------------------------------------