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

implemented DoGetSize() for wxSlider (patch from Dimitri)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-04-20 09:57:28 +00:00
parent 93c4157c6c
commit 5f605ccf3f
2 changed files with 392 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/msw/slider95.h
View File

@@ -46,8 +46,11 @@ public:
virtual int GetValue() const ; virtual int GetValue() const ;
virtual void SetValue(int); virtual void SetValue(int);
void GetSize(int *x, int *y) const ; virtual void DoGetSize(int *width, int *height) const;
void GetPosition(int *x, int *y) const ;
void GetSize(int *w, int *h) const;
void GetPosition(int *x, int *y) const;
bool Show(bool show); bool Show(bool show);

703
src/msw/slider95.cpp
View File

@@ -42,14 +42,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
// Slider // Slider
wxSlider95::wxSlider95() wxSlider95::wxSlider95()
{ {
m_staticValue = 0; m_staticValue = (WXHWND) NULL;
m_staticMin = 0; m_staticMin = (WXHWND) NULL;
m_staticMax = 0; m_staticMax = (WXHWND) NULL;
m_pageSize = 1; m_pageSize = 1;
m_lineSize = 1; m_lineSize = 1;
m_rangeMax = 0; m_rangeMax = 0;
m_rangeMin = 0; m_rangeMin = 0;
m_tickFreq = 0; m_tickFreq = 0;
} }
bool wxSlider95::Create(wxWindow *parent, wxWindowID id, bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
@@ -59,147 +59,164 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
const wxValidator& validator, const wxValidator& validator,
const wxString& name) const wxString& name)
{ {
SetName(name); SetName(name);
#if wxUSE_VALIDATORS #if wxUSE_VALIDATORS
SetValidator(validator); SetValidator(validator);
#endif // wxUSE_VALIDATORS #endif // wxUSE_VALIDATORS
if (parent) parent->AddChild(this); if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetBackgroundColour()) ;
SetForegroundColour(parent->GetForegroundColour()) ;
m_staticValue = 0; SetBackgroundColour(parent->GetBackgroundColour()) ;
m_staticMin = 0; SetForegroundColour(parent->GetForegroundColour()) ;
m_staticMax = 0;
m_pageSize = 1;
m_lineSize = 1;
m_windowStyle = style;
m_tickFreq = 0;
if ( id == -1 ) m_staticValue = (WXHWND) NULL;;
m_windowId = (int)NewControlId(); m_staticMin = (WXHWND) NULL;;
else m_staticMax = (WXHWND) NULL;;
m_windowId = id; m_pageSize = 1;
m_lineSize = 1;
m_windowStyle = style;
m_tickFreq = 0;
int x = pos.x; if ( id == -1 )
int y = pos.y; m_windowId = (int)NewControlId();
int width = size.x; else
int height = size.y; m_windowId = id;
long msStyle=0 ; int x = pos.x;
long wstyle=0 ; int y = pos.y;
int width = size.x;
int height = size.y;
if ( m_windowStyle & wxCLIP_SIBLINGS ) long msStyle = 0;
msStyle |= WS_CLIPSIBLINGS; long wstyle = 0;
if ( m_windowStyle & wxSL_LABELS ) if ( m_windowStyle & wxCLIP_SIBLINGS )
{
msStyle |= WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
bool want3D;
WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
m_staticValue = (WXHWND) CreateWindowEx(exStyle, wxT("STATIC"), NULL,
msStyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
wxGetInstance(), NULL);
// Now create min static control
wxSprintf(wxBuffer, wxT("%d"), minValue);
wstyle = STATIC_FLAGS;
if ( m_windowStyle & wxCLIP_SIBLINGS )
msStyle |= WS_CLIPSIBLINGS; msStyle |= WS_CLIPSIBLINGS;
m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,
wstyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
wxGetInstance(), NULL);
}
msStyle = 0; if ( m_windowStyle & wxSL_LABELS )
{
msStyle |= WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
if ( m_windowStyle & wxCLIP_SIBLINGS ) bool want3D;
msStyle |= WS_CLIPSIBLINGS; WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
if (m_windowStyle & wxSL_VERTICAL) m_staticValue = (WXHWND) CreateWindowEx
msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ; (
else exStyle, wxT("STATIC"), NULL,
msStyle = TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ; msStyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
wxGetInstance(), NULL
);
if ( m_windowStyle & wxSL_AUTOTICKS ) // Now create min static control
msStyle |= TBS_AUTOTICKS ; wxSprintf(wxBuffer, wxT("%d"), minValue);
wstyle = STATIC_FLAGS;
if ( m_windowStyle & wxCLIP_SIBLINGS )
msStyle |= WS_CLIPSIBLINGS;
m_staticMin = (WXHWND) CreateWindowEx
(
0, wxT("STATIC"), wxBuffer,
wstyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
wxGetInstance(), NULL
);
}
if ( m_windowStyle & wxSL_LEFT ) msStyle = 0;
msStyle |= TBS_LEFT;
else if ( m_windowStyle & wxSL_RIGHT )
msStyle |= TBS_RIGHT;
else if ( m_windowStyle & wxSL_TOP )
msStyle |= TBS_TOP;
else if ( m_windowStyle & wxSL_BOTTOM )
msStyle |= TBS_BOTTOM;
else if ( m_windowStyle & wxSL_BOTH )
msStyle |= TBS_BOTH;
else if ( ! (m_windowStyle & wxSL_AUTOTICKS) )
msStyle |= TBS_NOTICKS;
if ( m_windowStyle & wxSL_SELRANGE ) if ( m_windowStyle & wxCLIP_SIBLINGS )
msStyle |= TBS_ENABLESELRANGE ;
HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(m_windowStyle), TRACKBAR_CLASS, wxBuffer,
msStyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
wxGetInstance(), NULL);
m_rangeMax = maxValue;
m_rangeMin = minValue;
m_pageSize = (int)((maxValue-minValue)/10);
::SendMessage(scroll_bar, TBM_SETRANGE, TRUE, MAKELONG(minValue, maxValue));
::SendMessage(scroll_bar, TBM_SETPOS, TRUE, (LPARAM)value);
::SendMessage(scroll_bar, TBM_SETPAGESIZE, 0, (LPARAM)m_pageSize);
m_hWnd = (WXHWND)scroll_bar;
SubclassWin(GetHWND());
SetWindowText((HWND) m_hWnd, wxT(""));
SetFont(parent->GetFont());
if ( m_windowStyle & wxSL_LABELS )
{
// Finally, create max value static item
wxSprintf(wxBuffer, wxT("%d"), maxValue);
wstyle = STATIC_FLAGS;
if ( m_windowStyle & wxCLIP_SIBLINGS )
msStyle |= WS_CLIPSIBLINGS; msStyle |= WS_CLIPSIBLINGS;
m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,
wstyle, if (m_windowStyle & wxSL_VERTICAL)
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(), msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
wxGetInstance(), NULL); else
msStyle = TBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
if ( m_windowStyle & wxSL_AUTOTICKS )
msStyle |= TBS_AUTOTICKS ;
if ( m_windowStyle & wxSL_LEFT )
msStyle |= TBS_LEFT;
else if ( m_windowStyle & wxSL_RIGHT )
msStyle |= TBS_RIGHT;
else if ( m_windowStyle & wxSL_TOP )
msStyle |= TBS_TOP;
else if ( m_windowStyle & wxSL_BOTTOM )
msStyle |= TBS_BOTTOM;
else if ( m_windowStyle & wxSL_BOTH )
msStyle |= TBS_BOTH;
else if ( ! (m_windowStyle & wxSL_AUTOTICKS) )
msStyle |= TBS_NOTICKS;
if ( m_windowStyle & wxSL_SELRANGE )
msStyle |= TBS_ENABLESELRANGE;
HWND scroll_bar = CreateWindowEx
(
MakeExtendedStyle(m_windowStyle), TRACKBAR_CLASS, wxBuffer,
msStyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
wxGetInstance(), NULL
);
m_rangeMax = maxValue;
m_rangeMin = minValue;
m_pageSize = (int)((maxValue-minValue)/10);
::SendMessage(scroll_bar, TBM_SETRANGE, TRUE, MAKELONG(minValue, maxValue));
::SendMessage(scroll_bar, TBM_SETPOS, TRUE, (LPARAM)value);
::SendMessage(scroll_bar, TBM_SETPAGESIZE, 0, (LPARAM)m_pageSize);
m_hWnd = (WXHWND)scroll_bar;
SubclassWin(GetHWND());
::SetWindowText((HWND) m_hWnd, wxT(""));
SetFont(parent->GetFont());
if ( m_windowStyle & wxSL_LABELS )
{
// Finally, create max value static item
wxSprintf(wxBuffer, wxT("%d"), maxValue);
wstyle = STATIC_FLAGS;
if ( m_windowStyle & wxCLIP_SIBLINGS )
msStyle |= WS_CLIPSIBLINGS;
m_staticMax = (WXHWND) CreateWindowEx
(
0, wxT("STATIC"), wxBuffer,
wstyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
wxGetInstance(), NULL
);
if (GetFont().Ok()) if (GetFont().Ok())
{
if (GetFont().GetResourceHandle())
{ {
if ( m_staticMin ) if (GetFont().GetResourceHandle())
SendMessage((HWND)m_staticMin,WM_SETFONT, {
(WPARAM)GetFont().GetResourceHandle(),0L); if ( m_staticMin )
if ( m_staticMax ) ::SendMessage((HWND) m_staticMin, WM_SETFONT,
SendMessage((HWND)m_staticMax,WM_SETFONT, (WPARAM) GetFont().GetResourceHandle(), 0L);
(WPARAM)GetFont().GetResourceHandle(),0L);
if (m_staticValue) if ( m_staticMax )
SendMessage((HWND)m_staticValue,WM_SETFONT, ::SendMessage((HWND) m_staticMax, WM_SETFONT,
(WPARAM)GetFont().GetResourceHandle(),0L); (WPARAM) GetFont().GetResourceHandle(), 0L);
if (m_staticValue)
::SendMessage((HWND) m_staticValue, WM_SETFONT,
(WPARAM) GetFont().GetResourceHandle(), 0L);
}
} }
} }
}
SetSize(x, y, width, height); SetSize(x, y, width, height);
SetValue(value); SetValue(value);
return TRUE; return TRUE;
} }
bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
@@ -242,7 +259,7 @@ bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
return FALSE; return FALSE;
} }
int newPos = (int)::SendMessage((HWND) control, TBM_GETPOS, 0, 0); int newPos = (int) ::SendMessage((HWND) control, TBM_GETPOS, 0, 0);
if ( (newPos < GetMin()) || (newPos > GetMax()) ) if ( (newPos < GetMin()) || (newPos > GetMax()) )
{ {
// out of range - but we did process it // out of range - but we did process it
@@ -266,189 +283,220 @@ bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
wxSlider95::~wxSlider95() wxSlider95::~wxSlider95()
{ {
if (m_staticMin) if (m_staticMin)
DestroyWindow((HWND) m_staticMin); {
::DestroyWindow((HWND) m_staticMin);
m_staticMin = (WXHWND) NULL;
}
if (m_staticMax) if (m_staticMax)
DestroyWindow((HWND) m_staticMax); {
::DestroyWindow((HWND) m_staticMax);
m_staticMax = (WXHWND) NULL;
}
if (m_staticValue) if (m_staticValue)
DestroyWindow((HWND) m_staticValue); {
::DestroyWindow((HWND) m_staticValue);
m_staticValue = (WXHWND) NULL;
}
} }
int wxSlider95::GetValue() const int wxSlider95::GetValue() const
{ {
return ::SendMessage(GetHwnd(), TBM_GETPOS, 0, 0); return ::SendMessage(GetHwnd(), TBM_GETPOS, 0, 0);
} }
void wxSlider95::SetValue(int value) void wxSlider95::SetValue(int value)
{ {
::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)value); ::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)value);
if (m_staticValue)
{ if (m_staticValue)
wxSprintf(wxBuffer, wxT("%d"), value); {
SetWindowText((HWND) m_staticValue, wxBuffer); wxSprintf(wxBuffer, wxT("%d"), value);
} ::SetWindowText((HWND) m_staticValue, wxBuffer);
}
}
void wxSlider95::DoGetSize(int *width, int *height) const
{
GetSize(width, height);
} }
void wxSlider95::GetSize(int *width, int *height) const void wxSlider95::GetSize(int *width, int *height) const
{ {
RECT rect; RECT rect;
rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1; rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;
wxFindMaxSize(GetHWND(), &rect); wxFindMaxSize(GetHWND(), &rect);
if (m_staticMin) if (m_staticMin)
wxFindMaxSize(m_staticMin, &rect); wxFindMaxSize(m_staticMin, &rect);
if (m_staticMax)
wxFindMaxSize(m_staticMax, &rect);
if (m_staticValue)
wxFindMaxSize(m_staticValue, &rect);
*width = rect.right - rect.left; if (m_staticMax)
*height = rect.bottom - rect.top; wxFindMaxSize(m_staticMax, &rect);
if (m_staticValue)
wxFindMaxSize(m_staticValue, &rect);
*width = rect.right - rect.left;
*height = rect.bottom - rect.top;
} }
void wxSlider95::GetPosition(int *x, int *y) const void wxSlider95::GetPosition(int *x, int *y) const
{ {
wxWindow *parent = GetParent(); wxWindow *parent = GetParent();
RECT rect; RECT rect;
rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1; rect.left = -1; rect.right = -1; rect.top = -1; rect.bottom = -1;
wxFindMaxSize(GetHWND(), &rect); wxFindMaxSize(GetHWND(), &rect);
if (m_staticMin) if (m_staticMin)
wxFindMaxSize(m_staticMin, &rect); wxFindMaxSize(m_staticMin, &rect);
if (m_staticMax) if (m_staticMax)
wxFindMaxSize(m_staticMax, &rect); wxFindMaxSize(m_staticMax, &rect);
if (m_staticValue) if (m_staticValue)
wxFindMaxSize(m_staticValue, &rect); wxFindMaxSize(m_staticValue, &rect);
// Since we now have the absolute screen coords, // Since we now have the absolute screen coords,
// if there's a parent we must subtract its top left corner // if there's a parent we must subtract its top left corner
POINT point; POINT point;
point.x = rect.left; point.x = rect.left;
point.y = rect.top; point.y = rect.top;
if (parent) if (parent)
::ScreenToClient((HWND) parent->GetHWND(), &point); ::ScreenToClient((HWND) parent->GetHWND(), &point);
// We may be faking the client origin. // We may be faking the client origin.
// So a window that's really at (0, 30) may appear // So a window that's really at (0, 30) may appear
// (to wxWin apps) to be at (0, 0). // (to wxWin apps) to be at (0, 0).
if (GetParent()) if (GetParent())
{ {
wxPoint pt(GetParent()->GetClientAreaOrigin()); wxPoint pt(GetParent()->GetClientAreaOrigin());
point.x -= pt.x; point.x -= pt.x;
point.y -= pt.y; point.y -= pt.y;
} }
*x = point.x;
*y = point.y; *x = point.x;
*y = point.y;
} }
// TODO one day, make sense of all this horros and replace it with a readable // TODO one day, make sense of all this horros and replace it with a readable
// DoGetBestSize() // DoGetBestSize()
void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags) void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{ {
int x1 = x; int x1 = x;
int y1 = y; int y1 = y;
int w1 = width; int w1 = width;
int h1 = height; int h1 = height;
int currentX, currentY; int currentX, currentY;
GetPosition(&currentX, &currentY); GetPosition(&currentX, &currentY);
if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
x1 = currentX; x1 = currentX;
if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
y1 = currentY; y1 = currentY;
AdjustForParentClientOrigin(x1, y1, sizeFlags); AdjustForParentClientOrigin(x1, y1, sizeFlags);
wxChar buf[300]; wxChar buf[300];
int x_offset = x; int x_offset = x;
int y_offset = y; int y_offset = y;
int cx; // slider,min,max sizes int cx; // slider,min,max sizes
int cy; int cy;
int cyf; int cyf;
wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont()); wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL) if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
{
if ( m_windowStyle & wxSL_LABELS )
{ {
int min_len = 0; if ( m_windowStyle & wxSL_LABELS )
{
int min_len = 0;
GetWindowText((HWND) m_staticMin, buf, 300); ::GetWindowText((HWND) m_staticMin, buf, 300);
GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont()); GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
int max_len = 0; int max_len = 0;
GetWindowText((HWND) m_staticMax, buf, 300); ::GetWindowText((HWND) m_staticMax, buf, 300);
GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont()); GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
if (m_staticValue) if (m_staticValue)
{ {
int new_width = (int)(wxMax(min_len, max_len)); int new_width = (int)(wxMax(min_len, max_len));
int valueHeight = (int)cyf; int valueHeight = (int)cyf;
#ifdef __WIN32__ #ifdef __WIN32__
// For some reason, under Win95, the text edit control has // For some reason, under Win95, the text edit control has
// a lot of space before the first character // a lot of space before the first character
new_width += 3*cx; new_width += 3*cx;
#endif #endif
// The height needs to be a bit bigger under Win95 if using native // The height needs to be a bit bigger under Win95 if
// 3D effects. // using native 3D effects.
valueHeight = (int) (valueHeight * 1.5) ; valueHeight = (int) (valueHeight * 1.5) ;
MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE); ::MoveWindow((HWND) m_staticValue, x_offset, y_offset,
x_offset += new_width + cx; new_width, valueHeight, TRUE);
} x_offset += new_width + cx;
}
MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE); MoveWindow((HWND) m_staticMin, x_offset, y_offset,
x_offset += (int)(min_len + cx); (int) min_len, cy, TRUE);
x_offset += (int)(min_len + cx);
int slider_length = (int)(w1 - x_offset - max_len - cx); int slider_length = (int)(w1 - x_offset - max_len - cx);
int slider_height = h1; int slider_height = h1;
if (slider_height < 0 ) if (slider_height < 0 )
slider_height = 20; slider_height = 20;
// Slider must have a minimum/default length/height // Slider must have a minimum/default length/height
if (slider_length < 100) if (slider_length < 100)
slider_length = 100; slider_length = 100;
MoveWindow(GetHwnd(), x_offset, y_offset, slider_length, slider_height, TRUE); ::MoveWindow(GetHwnd(), x_offset, y_offset,
x_offset += slider_length + cx; slider_length, slider_height, TRUE);
x_offset += slider_length + cx;
MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE); MoveWindow((HWND) m_staticMax, x_offset, y_offset,
(int) max_len, cy, TRUE);
}
else
{
// No labels
// If we're prepared to use the existing size, then...
if
(
width == -1
&& height == -1
&& ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)
)
{
GetSize(&w1, &h1);
}
if ( w1 < 0 )
w1 = 200;
if ( h1 < 0 )
h1 = 20;
::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
}
} }
else else
{ {
// No labels if ( m_windowStyle & wxSL_LABELS )
// If we're prepared to use the existing size, then...
if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
{ {
GetSize(&w1, &h1); int min_len;
} ::GetWindowText((HWND) m_staticMin, buf, 300);
if ( w1 < 0 ) GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
w1 = 200;
if ( h1 < 0 )
h1 = 20;
MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
}
}
else
{
if ( m_windowStyle & wxSL_LABELS )
{
int min_len;
GetWindowText((HWND) m_staticMin, buf, 300);
GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
int max_len; int max_len;
GetWindowText((HWND) m_staticMax, buf, 300); ::GetWindowText((HWND) m_staticMax, buf, 300);
GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont()); GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
if (m_staticValue) if (m_staticValue)
{ {
int new_width = (int)(wxMax(min_len, max_len)); int new_width = (int)(wxMax(min_len, max_len));
int valueHeight = (int)cyf; int valueHeight = (int)cyf;
/*** Suggested change by George Tasker - remove this block... /*** Suggested change by George Tasker - remove this block...
#ifdef __WIN32__ #ifdef __WIN32__
// For some reason, under Win95, the text edit control has // For some reason, under Win95, the text edit control has
@@ -456,80 +504,90 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
new_width += 3*cx; new_width += 3*cx;
#endif #endif
... and replace with following line: */ ... and replace with following line: */
new_width += cx; new_width += cx;
// The height needs to be a bit bigger under Win95 if using native // The height needs to be a bit bigger under Win95 if
// 3D effects. // using native 3D effects.
valueHeight = (int) (valueHeight * 1.5) ; valueHeight = (int) (valueHeight * 1.5) ;
MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE); ::MoveWindow((HWND) m_staticValue, x_offset, y_offset,
y_offset += valueHeight; new_width, valueHeight, TRUE);
} y_offset += valueHeight;
}
MoveWindow((HWND) m_staticMin, x_offset, y_offset, (int)min_len, cy, TRUE); ::MoveWindow((HWND) m_staticMin, x_offset, y_offset,
y_offset += cy; (int) min_len, cy, TRUE);
y_offset += cy;
int slider_length = (int)(h1 - y_offset - cy - cy); int slider_length = (int)(h1 - y_offset - cy - cy);
int slider_width = w1; int slider_width = w1;
if (slider_width < 0 ) if (slider_width < 0 )
slider_width = 20; slider_width = 20;
// Slider must have a minimum/default length // Slider must have a minimum/default length
if (slider_length < 100) if (slider_length < 100)
slider_length = 100; slider_length = 100;
MoveWindow(GetHwnd(), x_offset, y_offset, slider_width, slider_length, TRUE); ::MoveWindow(GetHwnd(), x_offset, y_offset,
y_offset += slider_length; slider_width, slider_length, TRUE);
y_offset += slider_length;
MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE); ::MoveWindow((HWND) m_staticMax, x_offset, y_offset,
} (int)max_len, cy, TRUE);
else }
{ else
// No labels {
// If we're prepared to use the existing size, then... // No labels
if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)) // If we're prepared to use the existing size, then...
{ if
GetSize(&w1, &h1); (
width == -1 && height == -1
&& ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)
)
{
GetSize(&w1, &h1);
}
if ( w1 < 0 )
w1 = 20;
if ( h1 < 0 )
h1 = 200;
::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
} }
if ( w1 < 0 )
w1 = 20;
if ( h1 < 0 )
h1 = 200;
MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
} }
}
} }
void wxSlider95::SetRange(int minValue, int maxValue) void wxSlider95::SetRange(int minValue, int maxValue)
{ {
m_rangeMin = minValue; m_rangeMin = minValue;
m_rangeMax = maxValue; m_rangeMax = maxValue;
::SendMessage(GetHwnd(), TBM_SETRANGE, TRUE, MAKELONG(minValue, maxValue)); ::SendMessage(GetHwnd(), TBM_SETRANGE, TRUE, MAKELONG(minValue, maxValue));
wxChar buf[40]; wxChar buf[40];
if ( m_staticMin ) if ( m_staticMin )
{ {
wxSprintf(buf, wxT("%d"), m_rangeMin); wxSprintf(buf, wxT("%d"), m_rangeMin);
SetWindowText((HWND) m_staticMin, buf); ::SetWindowText((HWND) m_staticMin, buf);
} }
if ( m_staticMax ) if ( m_staticMax )
{ {
wxSprintf(buf, wxT("%d"), m_rangeMax); wxSprintf(buf, wxT("%d"), m_rangeMax);
SetWindowText((HWND) m_staticMax, buf); ::SetWindowText((HWND) m_staticMax, buf);
} }
} }
WXHBRUSH wxSlider95::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, WXHBRUSH wxSlider95::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam) WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{ {
if ( nCtlColor == CTLCOLOR_SCROLLBAR ) if ( nCtlColor == CTLCOLOR_SCROLLBAR )
return 0; return 0;
// Otherwise, it's a static // Otherwise, it's a static
return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam); return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
} }
// For trackbars only // For trackbars only
@@ -562,38 +620,43 @@ void wxSlider95::ClearTicks()
void wxSlider95::SetLineSize(int lineSize) void wxSlider95::SetLineSize(int lineSize)
{ {
m_lineSize = lineSize; m_lineSize = lineSize;
::SendMessage( GetHwnd(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize ); ::SendMessage( GetHwnd(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize );
} }
int wxSlider95::GetLineSize() const int wxSlider95::GetLineSize() const
{ {
return (int) ::SendMessage( GetHwnd(), TBM_GETLINESIZE, (WPARAM) 0, (LPARAM) 0 ); return (int) ::SendMessage( GetHwnd(), TBM_GETLINESIZE,
(WPARAM) 0, (LPARAM) 0 );
} }
int wxSlider95::GetSelEnd() const int wxSlider95::GetSelEnd() const
{ {
return (int) ::SendMessage( GetHwnd(), TBM_SETSELEND, (WPARAM) 0, (LPARAM) 0 ); return (int) ::SendMessage( GetHwnd(), TBM_SETSELEND,
(WPARAM) 0, (LPARAM) 0 );
} }
int wxSlider95::GetSelStart() const int wxSlider95::GetSelStart() const
{ {
return (int) ::SendMessage( GetHwnd(), TBM_GETSELSTART, (WPARAM) 0, (LPARAM) 0 ); return (int) ::SendMessage( GetHwnd(), TBM_GETSELSTART,
(WPARAM) 0, (LPARAM) 0 );
} }
void wxSlider95::SetSelection(int minPos, int maxPos) void wxSlider95::SetSelection(int minPos, int maxPos)
{ {
::SendMessage( GetHwnd(), TBM_SETSEL, (WPARAM) TRUE, (LPARAM) MAKELONG( minPos, maxPos) ); ::SendMessage(GetHwnd(), TBM_SETSEL,
(WPARAM) TRUE, (LPARAM) MAKELONG( minPos, maxPos) );
} }
void wxSlider95::SetThumbLength(int len) void wxSlider95::SetThumbLength(int len)
{ {
::SendMessage( GetHwnd(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0 ); ::SendMessage( GetHwnd(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0 );
} }
int wxSlider95::GetThumbLength() const int wxSlider95::GetThumbLength() const
{ {
return (int) ::SendMessage( GetHwnd(), TBM_GETTHUMBLENGTH, (WPARAM) 0, (LPARAM) 0 ); return (int) ::SendMessage( GetHwnd(), TBM_GETTHUMBLENGTH,
(WPARAM) 0, (LPARAM) 0 );
} }
void wxSlider95::SetTick(int tickPos) void wxSlider95::SetTick(int tickPos)
@@ -603,13 +666,18 @@ void wxSlider95::SetTick(int tickPos)
bool wxSlider95::ContainsHWND(WXHWND hWnd) const bool wxSlider95::ContainsHWND(WXHWND hWnd) const
{ {
return ( hWnd == GetStaticMin() || hWnd == GetStaticMax() || hWnd == GetEditValue() ); return
(
hWnd == GetStaticMin()
|| hWnd == GetStaticMax()
|| hWnd == GetEditValue()
);
} }
void wxSlider95::Command (wxCommandEvent & event) void wxSlider95::Command (wxCommandEvent & event)
{ {
SetValue (event.GetInt()); SetValue (event.GetInt());
ProcessCommand (event); ProcessCommand (event);
} }
bool wxSlider95::Show(bool show) bool wxSlider95::Show(bool show)
@@ -624,10 +692,13 @@ bool wxSlider95::Show(bool show)
if(m_staticValue) if(m_staticValue)
ShowWindow((HWND) m_staticValue, (BOOL)cshow); ShowWindow((HWND) m_staticValue, (BOOL)cshow);
if(m_staticMin) if(m_staticMin)
ShowWindow((HWND) m_staticMin, (BOOL)cshow); ShowWindow((HWND) m_staticMin, (BOOL)cshow);
if(m_staticMax) if(m_staticMax)
ShowWindow((HWND) m_staticMax, (BOOL)cshow); ShowWindow((HWND) m_staticMax, (BOOL)cshow);
return TRUE; return TRUE;
} }