X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c208c5759da71a637f0f0f5b7d3dc3eda09c02..1fd8a4504da7215d889e3e6234476581b0ba7adf:/src/msw/gauge95.cpp diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp index 3f934a58c0..e5c09362e2 100644 --- a/src/msw/gauge95.cpp +++ b/src/msw/gauge95.cpp @@ -69,6 +69,20 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id, long msFlags = WS_CHILD | WS_VISIBLE | WS_TABSTOP; +#ifndef PBS_VERTICAL +#define PBS_VERTICAL 0x04 +#endif + + if (m_windowStyle & wxGA_VERTICAL) + msFlags |= PBS_VERTICAL; + +#ifndef PBS_SMOOTH +#define PBS_SMOOTH 0x01 +#endif + + if (m_windowStyle & wxGA_SMOOTH) + msFlags |= PBS_SMOOTH; + HWND wx_button = CreateWindowEx(MakeExtendedStyle(m_windowStyle), PROGRESS_CLASS, NULL, msFlags, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, @@ -94,7 +108,7 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id, return TRUE; } -void wxGauge95::SetSize(int x, int y, int width, int height, int sizeFlags) +void wxGauge95::DoSetSize(int x, int y, int width, int height, int sizeFlags) { int currentX, currentY; GetPosition(¤tX, ¤tY); @@ -168,14 +182,24 @@ int wxGauge95::GetValue(void) const return m_gaugePos; } -void wxGauge95::SetForegroundColour(const wxColour& col) +bool wxGauge95::SetForegroundColour(const wxColour& col) { - m_foregroundColour = col ; + if ( !wxControl::SetForegroundColour(col) ) + return FALSE; + + m_foregroundColour = col ; + + return TRUE; } -void wxGauge95::SetBackgroundColour(const wxColour& col) +bool wxGauge95::SetBackgroundColour(const wxColour& col) { - m_backgroundColour = col ; + if ( !wxControl::SetBackgroundColour(col) ) + return FALSE; + + m_backgroundColour = col ; + + return TRUE; } #endif // wxUSE_GAUGE