X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..491b5be8305968871bc289453ed088a70c3de044:/src/msw/gaugemsw.cpp diff --git a/src/msw/gaugemsw.cpp b/src/msw/gaugemsw.cpp index 5a86380c51..ee41a2ac0e 100644 --- a/src/msw/gaugemsw.cpp +++ b/src/msw/gaugemsw.cpp @@ -60,9 +60,7 @@ /* public function prototypes */ BOOL FAR PASCAL gaugeInit(HINSTANCE hInstance); -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxGaugeMSW, wxControl) -#endif bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id, int range, @@ -82,7 +80,9 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id, } SetName(name); +#if wxUSE_VALIDATORS SetValidator(validator); +#endif // wxUSE_VALIDATORS if (parent) parent->AddChild(this); m_rangeMax = range; @@ -104,7 +104,13 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id, int height = size.y; long msFlags = WS_CHILD | WS_VISIBLE | WS_TABSTOP; - msFlags |= ZYZGS_3D; + bool want3D; + WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D); + if (want3D) + msFlags |= ZYZGS_3D; + + if ( m_windowStyle & wxCLIP_SIBLINGS ) + msFlags |= WS_CLIPSIBLINGS; HWND wx_button = CreateWindowEx(MakeExtendedStyle(m_windowStyle), wxT("zYzGauge"), NULL, msFlags, @@ -129,6 +135,9 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id, SendMessage(GetHwnd(), ZYZG_SETFGCOLOR, 0, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue())); SendMessage(GetHwnd(), ZYZG_SETBKCOLOR, 0, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue())); + //SetBezelFace(1); + //SetShadowWidth(1); + SetFont(parent->GetFont()); if (width == -1)