X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae090fdb7f4be47466b5728ad37065923b48c8c3..b5435dccd098ae153c3b7b3b8fca8dd0d763986c:/src/msw/gauge95.cpp diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp index efcb6da297..7df84ca373 100644 --- a/src/msw/gauge95.cpp +++ b/src/msw/gauge95.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -37,7 +37,7 @@ #include "wx/msw/gauge95.h" #include "wx/msw/private.h" -#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) +#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) #include #endif @@ -101,11 +101,8 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id, int width = size.x; int height = size.y; - long msFlags = WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */; - - if ( m_windowStyle & wxCLIP_SIBLINGS ) - msFlags |= WS_CLIPSIBLINGS; - + WXDWORD exStyle = 0; + long msFlags = MSWGetStyle(style, & exStyle) ; if (m_windowStyle & wxGA_VERTICAL) msFlags |= PBS_VERTICAL; @@ -114,7 +111,7 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id, msFlags |= PBS_SMOOTH; HWND wx_button = - CreateWindowEx(MakeExtendedStyle(m_windowStyle), PROGRESS_CLASS, NULL, msFlags, + CreateWindowEx(exStyle, PROGRESS_CLASS, NULL, msFlags, 0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId, wxGetInstance(), NULL);