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

Warning fixes, source cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-08-11 19:53:56 +00:00
parent 82c06b740e
commit 822e690b22
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/msw/slider95.cpp
View File

@@ -88,11 +88,11 @@ wxBEGIN_PROPERTIES_TABLE(wxSlider95)
wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SLIDER_UPDATED , wxCommandEvent ) wxEVENT_PROPERTY( Updated , wxEVT_COMMAND_SLIDER_UPDATED , wxCommandEvent )
wxPROPERTY( Value , int , SetValue, GetValue , 0, 0 /*flags*/ , wxT("Helpstring") , wxT("group")) 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( Minimum , int , SetMin, GetMin, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
wxPROPERTY( Maximum , int , SetMax, GetMax, 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( PageSize , int , SetPageSize, GetLineSize, 1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
wxPROPERTY( LineSize , int , SetLineSize, 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( 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 wxPROPERTY_FLAGS( WindowStyle , wxSliderStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
wxEND_PROPERTIES_TABLE() wxEND_PROPERTIES_TABLE()
@@ -129,7 +129,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
style |= wxBORDER_NONE; style |= wxBORDER_NONE;
if ( !CreateBase(parent, id, pos, size, style, validator, name) ) if ( !CreateBase(parent, id, pos, size, style, validator, name) )
return FALSE; return false;
if (parent) parent->AddChild(this); if (parent) parent->AddChild(this);
@@ -144,7 +144,6 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
m_tickFreq = 0; m_tickFreq = 0;
long msStyle = 0; long msStyle = 0;
long wstyle = 0;
if ( m_windowStyle & wxSL_LABELS ) if ( m_windowStyle & wxSL_LABELS )
{ {
@@ -166,7 +165,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
// Now create min static control // Now create min static control
wxString minLabel; wxString minLabel;
minLabel.Printf(wxT("%d"), minValue); minLabel.Printf(wxT("%d"), minValue);
wstyle = STATIC_FLAGS; long wstyle = STATIC_FLAGS;
if ( m_windowStyle & wxCLIP_SIBLINGS ) if ( m_windowStyle & wxCLIP_SIBLINGS )
wstyle |= WS_CLIPSIBLINGS; wstyle |= WS_CLIPSIBLINGS;
m_staticMin = (WXHWND) CreateWindowEx m_staticMin = (WXHWND) CreateWindowEx
@@ -180,7 +179,9 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
WXDWORD exStyle = 0; WXDWORD exStyle = 0;
msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ; msStyle = MSWGetStyle(GetWindowStyle(), & exStyle) ;
wxUnusedVar(msStyle);
if (m_windowStyle & wxSL_VERTICAL) if (m_windowStyle & wxSL_VERTICAL)
msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ; msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
@@ -234,7 +235,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
// Finally, create max value static item // Finally, create max value static item
wxString maxLabel; wxString maxLabel;
maxLabel.Printf(wxT("%d"), maxValue); maxLabel.Printf(wxT("%d"), maxValue);
wstyle = STATIC_FLAGS; long wstyle = STATIC_FLAGS;
if ( m_windowStyle & wxCLIP_SIBLINGS ) if ( m_windowStyle & wxCLIP_SIBLINGS )
wstyle |= WS_CLIPSIBLINGS; wstyle |= WS_CLIPSIBLINGS;
@@ -274,7 +275,7 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
// for this control, so call SetBestSize here instead. // for this control, so call SetBestSize here instead.
SetBestSize(size); SetBestSize(size);
return TRUE; return true;
} }
bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam, bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
@@ -321,14 +322,14 @@ bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
default: default:
// unknown scroll event? // unknown scroll event?
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
return TRUE; return true;
} }
SetValue(newPos); SetValue(newPos);
@@ -453,9 +454,9 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
int currentX, currentY; int currentX, currentY;
GetPosition(&currentX, &currentY); GetPosition(&currentX, &currentY);
if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (x == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
x1 = currentX; x1 = currentX;
if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (y == wxDefaultCoord && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
y1 = currentY; y1 = currentY;
AdjustForParentClientOrigin(x1, y1, sizeFlags); AdjustForParentClientOrigin(x1, y1, sizeFlags);
@@ -501,7 +502,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
x_offset += new_width + cx; 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); (int) min_len, cy, TRUE);
x_offset += (int)(min_len + cx); x_offset += (int)(min_len + cx);
@@ -521,7 +522,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
slider_length, slider_height, TRUE); slider_length, slider_height, TRUE);
x_offset += slider_length + cx; 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); (int) max_len, cy, TRUE);
} }
else else
@@ -530,8 +531,8 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
// If we're prepared to use the existing size, then... // If we're prepared to use the existing size, then...
if if
( (
width == -1 width == wxDefaultCoord
&& height == -1 && height == wxDefaultCoord
&& ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO) && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)
) )
{ {
@@ -602,7 +603,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
// If we're prepared to use the existing size, then... // If we're prepared to use the existing size, then...
if if
( (
width == -1 && height == -1 width == wxDefaultCoord && height == wxDefaultCoord
&& ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO) && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO)
) )
{ {
@@ -844,7 +845,7 @@ bool wxSlider95::Show(bool show)
if(m_staticMax) if(m_staticMax)
ShowWindow((HWND) m_staticMax, (BOOL)cshow); ShowWindow((HWND) m_staticMax, (BOOL)cshow);
return TRUE; return true;
} }
#endif #endif