Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support full 32bit range in wxGauge

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-09-22 11:36:48 +00:00
parent 624d506b58
commit 9a78988fed
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -61,6 +61,7 @@ wxMSW:
- changed wxCrashReport to generate minidumps instead of text files - changed wxCrashReport to generate minidumps instead of text files
- wxRadioButtons are now checked when they get focus (standard behaviour) - wxRadioButtons are now checked when they get focus (standard behaviour)
- several fixes to owner drawn menu items (Christian Sturmlechner) - several fixes to owner drawn menu items (Christian Sturmlechner)
- wxGauge now supports full 32 bit range (Miroslav Rajcic)
wxGTK: wxGTK:

14
src/msw/gauge95.cpp
View File

@@ -140,7 +140,6 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
#endif // wxUSE_VALIDATORS #endif // wxUSE_VALIDATORS
if (parent) parent->AddChild(this); if (parent) parent->AddChild(this);
m_rangeMax = range;
m_gaugePos = 0; m_gaugePos = 0;
m_windowStyle = style; m_windowStyle = style;
@@ -177,7 +176,7 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
// Subclass again for purposes of dialog editing mode // Subclass again for purposes of dialog editing mode
SubclassWin((WXHWND) wx_button); SubclassWin((WXHWND) wx_button);
SendMessage((HWND) GetHWND(), PBM_SETRANGE, 0, MAKELPARAM(0, range)); SetRange(range);
SetFont(parent->GetFont()); SetFont(parent->GetFont());
@@ -187,7 +186,7 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
height = 28; height = 28;
SetSize(x, y, width, height); SetSize(x, y, width, height);
ShowWindow((HWND) GetHWND(), SW_SHOW); ShowWindow(GetHwnd(), SW_SHOW);
return TRUE; return TRUE;
} }
@@ -204,14 +203,19 @@ void wxGauge95::SetRange(int r)
{ {
m_rangeMax = r; m_rangeMax = r;
SendMessage((HWND) GetHWND(), PBM_SETRANGE, 0, MAKELPARAM(0, r)); #ifdef PBM_SETRANGE32
SendMessage(GetHwnd(), PBM_SETRANGE32, 0, r);
#else // !PBM_SETRANGE32
// fall back to PBM_SETRANGE (limited to 16 bits)
SendMessage(GetHwnd(), PBM_SETRANGE, 0, MAKELPARAM(0, r));
#endif // PBM_SETRANGE32/!PBM_SETRANGE32
} }
void wxGauge95::SetValue(int pos) void wxGauge95::SetValue(int pos)
{ {
m_gaugePos = pos; m_gaugePos = pos;
SendMessage((HWND) GetHWND(), PBM_SETPOS, pos, 0); SendMessage(GetHwnd(), PBM_SETPOS, pos, 0);
} }
int wxGauge95::GetShadowWidth() const int wxGauge95::GetShadowWidth() const