wxFLAGS_MEMBER(wxBORDER_RAISED)
wxFLAGS_MEMBER(wxBORDER_STATIC)
wxFLAGS_MEMBER(wxBORDER_NONE)
-
+
// old style border flags
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SLIDER_UPDATED , wxCommandEvent )
wxPROPERTY( Value , int , SetValue, GetValue , 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( Minimum , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( Maximum , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( PageSize , int , SetPageSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( LineSize , int , SetLineSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY( ThumbLength , int , SetThumbLength, GetThumbLength, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY( Minimum , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY( Maximum , int , SetMax, GetMax, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY( PageSize , int , SetPageSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY( LineSize , int , SetLineSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY( ThumbLength , int , SetThumbLength, GetThumbLength, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
wxPROPERTY_FLAGS( WindowStyle , wxSliderStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
wxEND_PROPERTIES_TABLE()
style |= wxBORDER_NONE;
if ( !CreateBase(parent, id, pos, size, style, validator, name) )
- return FALSE;
+ return false;
if (parent) parent->AddChild(this);
m_tickFreq = 0;
long msStyle = 0;
- long wstyle = 0;
if ( m_windowStyle & wxSL_LABELS )
{
// Now create min static control
wxString minLabel;
minLabel.Printf(wxT("%d"), minValue);
- wstyle = STATIC_FLAGS;
+ long wstyle = STATIC_FLAGS;
if ( m_windowStyle & wxCLIP_SIBLINGS )
- msStyle |= WS_CLIPSIBLINGS;
+ wstyle |= WS_CLIPSIBLINGS;
m_staticMin = (WXHWND) CreateWindowEx
(
0, wxT("STATIC"), minLabel,
WXDWORD exStyle = 0;
- msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ;
+ msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ;
+
+ wxUnusedVar(msStyle);
if (m_windowStyle & wxSL_VERTICAL)
msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
// Finally, create max value static item
wxString maxLabel;
maxLabel.Printf(wxT("%d"), maxValue);
- wstyle = STATIC_FLAGS;
+ long wstyle = STATIC_FLAGS;
if ( m_windowStyle & wxCLIP_SIBLINGS )
- msStyle |= WS_CLIPSIBLINGS;
+ wstyle |= WS_CLIPSIBLINGS;
m_staticMax = (WXHWND) CreateWindowEx
(
// for this control, so call SetBestSize here instead.
SetBestSize(size);
- return TRUE;
+ return true;
}
bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
default:
// unknown scroll event?
- return FALSE;
+ return false;
}
int newPos = (int) ::SendMessage((HWND) control, TBM_GETPOS, 0, 0);
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 min_len = 0;
::GetWindowText((HWND) m_staticMin, buf, 300);
- GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
+ GetTextExtent(buf, &min_len, &cyf);
int max_len = 0;
::GetWindowText((HWND) m_staticMax, buf, 300);
- GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
+ GetTextExtent(buf, &max_len, &cyf);
if (m_staticValue)
{
int new_width = (int)(wxMax(min_len, max_len));
x_offset += new_width + cx;
}
- MoveWindow((HWND) m_staticMin, x_offset, y_offset,
+ ::MoveWindow((HWND) m_staticMin, x_offset, y_offset,
(int) min_len, cy, TRUE);
x_offset += (int)(min_len + cx);
slider_length, slider_height, TRUE);
x_offset += slider_length + cx;
- MoveWindow((HWND) m_staticMax, x_offset, y_offset,
+ ::MoveWindow((HWND) m_staticMax, x_offset, y_offset,
(int) max_len, cy, TRUE);
}
else
// If we're prepared to use the existing size, then...
if
(
- width == -1
- && height == -1
+ width == wxDefaultCoord
+ && height == wxDefaultCoord
&& ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)
)
{
{
int min_len;
::GetWindowText((HWND) m_staticMin, buf, 300);
- GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
+ GetTextExtent(buf, &min_len, &cyf);
int max_len;
::GetWindowText((HWND) m_staticMax, buf, 300);
- GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
+ GetTextExtent(buf, &max_len, &cyf);
if (m_staticValue)
{
(int) min_len, cy, TRUE);
y_offset += cy;
- // slider_length = (total height available) - (height used so far)
+ // slider_length = (total height available) - (height used so far)
// - (height of max label) - (border)
int slider_length = (int)(h1 - (y_offset-y) - cy - cy);
// If we're prepared to use the existing size, then...
if
(
- width == -1 && height == -1
+ width == wxDefaultCoord && height == wxDefaultCoord
&& ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)
)
{
{
wxSize rv;
wxChar buf[300];
- int cx;
+ int cx;
int cy;
int cyf;
int min_len = 0;
int max_len = 0;
-
+
wxGetCharSize(GetHWND(), &cx, &cy, this->GetFont());
-
+
if ( !HasFlag(wxSL_VERTICAL))
{
rv = wxSize(100, 20); // default size for the slider itself
-
+
if (HasFlag(wxSL_LABELS)) // do we need to add more for the labels?
{
::GetWindowText((HWND) m_staticMin, buf, 300);
- GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
+ GetTextExtent(buf, &min_len, &cyf);
rv.x += min_len + cx;
::GetWindowText((HWND) m_staticMax, buf, 300);
- GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
+ GetTextExtent(buf, &max_len, &cyf);
rv.x += max_len + cx;
if (m_staticValue)
{
int new_width = (int)(wxMax(min_len, max_len));
int valueHeight = (int)cyf;
-
+
#ifdef __WIN32__
// For some reason, under Win95, the text edit control has
// a lot of space before the first character
if (HasFlag(wxSL_LABELS)) // do we need to add more for the labels?
{
::GetWindowText((HWND) m_staticMin, buf, 300);
- GetTextExtent(buf, &min_len, &cyf,NULL,NULL, & this->GetFont());
+ GetTextExtent(buf, &min_len, &cyf);
rv.y += cy;
::GetWindowText((HWND) m_staticMax, buf, 300);
- GetTextExtent(buf, &max_len, &cyf,NULL,NULL, & this->GetFont());
+ GetTextExtent(buf, &max_len, &cyf);
rv.y += cy;
-
+
if (m_staticValue)
{
int new_width = (int)(wxMax(min_len, max_len));
valueHeight = (int) (valueHeight * 1.5) ;
rv.y += valueHeight;
rv.x = wxMax(new_width, rv.x);
- }
+ }
}
}
return rv;
if(m_staticMax)
ShowWindow((HWND) m_staticMax, (BOOL)cshow);
- return TRUE;
+ return true;
}
#endif