// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "slidrmsw.h"
#endif
const wxValidator& validator,
const wxString& name)
{
+ if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
+ style |= wxBORDER_NONE;
+
SetName(name);
#if wxUSE_VALIDATORS
SetValidator(validator);
m_lineSize = 1;
m_windowStyle = style;
- if ( id == -1 )
+ if ( id == wxID_ANY )
m_windowId = (int)NewControlId();
else
m_windowId = id;
int height = size.y;
// non-Win95 implementation
-
- long msStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
- if ( m_windowStyle & wxCLIP_SIBLINGS )
- msStyle |= WS_CLIPSIBLINGS;
+ long msStyle = SS_CENTER;
- bool want3D;
- WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+ WXDWORD exStyle = 0;
+ msStyle |= MSWGetStyle(GetWindowStyle(), & exStyle) ;
m_staticValue = (WXHWND) CreateWindowEx(exStyle, wxT("STATIC"), NULL,
msStyle,
else
msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
- HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(m_windowStyle), wxT("SCROLLBAR"), wxT(""),
+ HWND scroll_bar = CreateWindowEx(exStyle, wxT("SCROLLBAR"), wxEmptyString,
msStyle,
0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
wxGetInstance(), NULL);
SetSize(x, y, width, height);
SetValue(value);
- return TRUE;
+ return true;
}
bool wxSliderMSW::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
if (nScrollInc == 0)
{
// no event...
- return FALSE;
+ return false;
}
int newPos = position + nScrollInc;
if ( (newPos < GetMin()) || (newPos > GetMax()) )
{
// out of range - but we did process it
- return TRUE;
+ return true;
}
SetValue(newPos);
int currentX, currentY;
GetPosition(¤tX, ¤tY);
- if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ if (x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
x1 = currentX;
- if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
y1 = currentY;
AdjustForParentClientOrigin(x1, y1, sizeFlags);
int cy;
int cyf;
- wxGetCharSize(GetHWND(), &cx, &cy,& this->GetFont());
+ wxGetCharSize(GetHWND(), &cx, &cy, this->GetFont());
if ((m_windowStyle & wxSL_VERTICAL) != wxSL_VERTICAL)
{
// a lot of space before the first character
new_width += 3*cx;
#endif
- MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE);
+ ::MoveWindow((HWND) m_staticValue, x_offset, y_offset, 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, (int)min_len, cy, TRUE);
x_offset += (int)(min_len + cx);
int slider_length = (int)(w1 - x_offset - max_len - cx);
if (slider_length < 100)
slider_length = 100;
- MoveWindow(GetHwnd(), x_offset, y_offset, slider_length, slider_height, TRUE);
+ ::MoveWindow(GetHwnd(), x_offset, y_offset, 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
{
w1 = 200;
if ( h1 < 0 )
h1 = 20;
- MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
+ ::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
}
}
else
... and replace with following line: */
new_width += cx;
- MoveWindow((HWND) m_staticValue, x_offset, y_offset, new_width, valueHeight, TRUE);
+ ::MoveWindow((HWND) m_staticValue, x_offset, y_offset, 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, (int)min_len, cy, TRUE);
y_offset += cy;
int slider_length = (int)(h1 - y_offset - cy - cy);
if (slider_length < 100)
slider_length = 100;
- MoveWindow(GetHwnd(), x_offset, y_offset, slider_width, slider_length, TRUE);
+ ::MoveWindow(GetHwnd(), x_offset, y_offset, 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
{
w1 = 20;
if ( h1 < 0 )
h1 = 200;
- MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
+ ::MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);
}
}
}
ShowWindow((HWND) m_staticMin, (BOOL)cshow);
if(m_staticMax)
ShowWindow((HWND) m_staticMax, (BOOL)cshow);
- return TRUE;
+ return true;
}