// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "gauge95.h"
#endif
#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(__CYGWIN10__))
#include <commctrl.h>
#endif
// wxWin macros
// ----------------------------------------------------------------------------
+#if wxUSE_EXTENDED_RTTI
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge, wxControl,"wx/gauge.h")
+
+WX_BEGIN_PROPERTIES_TABLE(wxGauge95)
+ WX_PROPERTY( Value , int , SetValue, GetValue, 0 )
+ WX_PROPERTY( Range , int , SetRange, GetRange, 0 )
+ WX_PROPERTY( ShadowWidth , int , SetShadowWidth, GetShadowWidth, 0 )
+ WX_PROPERTY( BezelFace , int , SetBezelFace, GetBezelFace, 0 )
+/*
+ TODO PROPERTIES
+ style wxGA_HORIZONTAL
+*/
+WX_END_PROPERTIES_TABLE()
+
+WX_BEGIN_HANDLERS_TABLE(wxGauge95)
+WX_END_HANDLERS_TABLE()
+
+WX_CONSTRUCTOR_6( wxGauge95 , wxWindow* , Parent , wxWindowID , Id , int , Range , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
IMPLEMENT_DYNAMIC_CLASS(wxGauge95, wxControl)
+#endif
// ============================================================================
// implementation
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;
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);