/////////////////////////////////////////////////////////////////////////////
-// Name: gauge95.cpp
+// Name: src/msw/gauge95.cpp
// Purpose: wxGauge95 class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
#ifdef __GNUG__
-#pragma implementation "gauge95.h"
+ #pragma implementation "gauge95.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#endif
#ifndef WX_PRECOMP
-#include "wx/defs.h"
+ #include "wx/defs.h"
#endif
#if wxUSE_GAUGE && defined(__WIN95__)
#include "wx/msw/gauge95.h"
#include "wx/msw/private.h"
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
-#include <commctrl.h>
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+ #include <commctrl.h>
#endif
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxGauge95, wxControl)
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// old commctrl.h (< 4.71) don't have those
+#ifndef PBS_SMOOTH
+ #define PBS_SMOOTH 0x01
+#endif
+
+#ifndef PBS_VERTICAL
+ #define PBS_VERTICAL 0x04
+#endif
+
+#ifndef PBM_SETBARCOLOR
+ #define PBM_SETBARCOLOR (WM_USER+9)
+#endif
+
+#ifndef PBM_SETBKCOLOR
+ #define PBM_SETBKCOLOR 0x2001
#endif
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxGauge95, wxControl)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
int range,
const wxPoint& pos,
const wxString& name)
{
SetName(name);
+#if wxUSE_VALIDATORS
SetValidator(validator);
+#endif // wxUSE_VALIDATORS
if (parent) parent->AddChild(this);
m_rangeMax = range;
m_gaugePos = 0;
- SetBackgroundColour(parent->GetBackgroundColour()) ;
- SetForegroundColour(parent->GetForegroundColour()) ;
-
m_windowStyle = style;
if ( id == -1 )
int width = size.x;
int height = size.y;
- long msFlags = WS_CHILD | WS_VISIBLE | WS_TABSTOP;
+ long msFlags = WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */;
+
+ if ( m_windowStyle & wxCLIP_SIBLINGS )
+ msFlags |= WS_CLIPSIBLINGS;
-#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;
m_hWnd = (WXHWND)wx_button;
+ SetBackgroundColour(parent->GetBackgroundColour());
+ SetForegroundColour(parent->GetForegroundColour());
+
// Subclass again for purposes of dialog editing mode
SubclassWin((WXHWND) wx_button);
return TRUE;
}
-void wxGauge95::SetShadowWidth(int w)
+void wxGauge95::SetShadowWidth(int WXUNUSED(w))
{
}
-void wxGauge95::SetBezelFace(int w)
+void wxGauge95::SetBezelFace(int WXUNUSED(w))
{
}
SendMessage((HWND) GetHWND(), PBM_SETPOS, pos, 0);
}
-int wxGauge95::GetShadowWidth(void) const
+int wxGauge95::GetShadowWidth() const
{
return 0;
}
-int wxGauge95::GetBezelFace(void) const
+int wxGauge95::GetBezelFace() const
{
return 0;
}
-int wxGauge95::GetRange(void) const
+int wxGauge95::GetRange() const
{
return m_rangeMax;
}
-int wxGauge95::GetValue(void) const
+int wxGauge95::GetValue() const
{
return m_gaugePos;
}
if ( !wxControl::SetForegroundColour(col) )
return FALSE;
- m_foregroundColour = col ;
+ SendMessage(GetHwnd(), PBM_SETBARCOLOR, 0, (LPARAM)wxColourToRGB(col));
return TRUE;
}
if ( !wxControl::SetBackgroundColour(col) )
return FALSE;
- m_backgroundColour = col ;
+ SendMessage(GetHwnd(), PBM_SETBKCOLOR, 0, (LPARAM)wxColourToRGB(col));
return TRUE;
}