projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxITEM_FOO instead of wxItem_Foo, for the sake of consistency
[wxWidgets.git]
/
src
/
msw
/
gauge95.cpp
diff --git
a/src/msw/gauge95.cpp
b/src/msw/gauge95.cpp
index c1c2ac99affd5432b46059de760d4070b9c72c84..efcb6da2979c6d0a0a3370531bc80735a19a1337 100644
(file)
--- a/
src/msw/gauge95.cpp
+++ b/
src/msw/gauge95.cpp
@@
-37,7
+37,7
@@
#include "wx/msw/gauge95.h"
#include "wx/msw/private.h"
#include "wx/msw/gauge95.h"
#include "wx/msw/private.h"
-#if defined(__WIN95__) && !(
defined(__GNUWIN32_OLD__) || defined(__TWIN32
__))
+#if defined(__WIN95__) && !(
(defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10
__))
#include <commctrl.h>
#endif
#include <commctrl.h>
#endif
@@
-103,6
+103,10
@@
bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
long msFlags = WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */;
long msFlags = WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */;
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ msFlags |= WS_CLIPSIBLINGS;
+
+
if (m_windowStyle & wxGA_VERTICAL)
msFlags |= PBS_VERTICAL;
if (m_windowStyle & wxGA_VERTICAL)
msFlags |= PBS_VERTICAL;
@@
-137,11
+141,11
@@
bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
return TRUE;
}
return TRUE;
}
-void wxGauge95::SetShadowWidth(int
w
)
+void wxGauge95::SetShadowWidth(int
WXUNUSED(w)
)
{
}
{
}
-void wxGauge95::SetBezelFace(int
w
)
+void wxGauge95::SetBezelFace(int
WXUNUSED(w)
)
{
}
{
}