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

Warning fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-15 07:49:43 +00:00
parent 9d655692b9
commit e95c145cc8
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
samples/drawing/drawing.cpp
View File

@@ -515,7 +515,7 @@ void MyCanvas::DrawDefault(wxDC& dc)
// mark the origin // mark the origin
dc.DrawCircle(0, 0, 10); dc.DrawCircle(0, 0, 10);
#if !wxMAC_USE_CORE_GRAPHICS #if !defined(wxMAC_USE_CORE_GRAPHICS) || !wxMAC_USE_CORE_GRAPHICS
// GetPixel and FloodFill not supported by Mac OS X CoreGraphics // GetPixel and FloodFill not supported by Mac OS X CoreGraphics
// (FloodFill uses Blit from a non-wxMemoryDC) // (FloodFill uses Blit from a non-wxMemoryDC)
//flood fill using brush, starting at 1,1 and replacing whatever colour we find there //flood fill using brush, starting at 1,1 and replacing whatever colour we find there
@@ -1143,6 +1143,9 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
case Show_Gradient: case Show_Gradient:
DrawGradients(dc); DrawGradients(dc);
break; break;
default:
break;
} }
} }

2
samples/widgets/combobox.cpp
View File

@@ -491,7 +491,7 @@ void ComboboxWidgetsPage::OnUpdateUICurText(wxUpdateUIEvent& event)
void ComboboxWidgetsPage::OnUpdateUIInsertionPointText(wxUpdateUIEvent& event) void ComboboxWidgetsPage::OnUpdateUIInsertionPointText(wxUpdateUIEvent& event)
{ {
if (m_combobox) if (m_combobox)
event.SetText( wxString::Format(_T("%d"), m_combobox->GetInsertionPoint()) ); event.SetText( wxString::Format(_T("%ld"), m_combobox->GetInsertionPoint()) );
} }
void ComboboxWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event) void ComboboxWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)

6
src/univ/checklst.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: univ/checklst.cpp // Name: src/univ/checklst.cpp
// Purpose: wxCheckListBox implementation // Purpose: wxCheckListBox implementation
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
@@ -132,7 +132,7 @@ void wxCheckListBox::Check(size_t item, bool check)
void wxCheckListBox::Delete(int n) void wxCheckListBox::Delete(int n)
{ {
wxCHECK_RET( n < GetCount(), _T("invalid index in wxListBox::Delete") ); wxCHECK_RET( IsValid(n), _T("invalid index in wxListBox::Delete") );
wxListBox::Delete(n); wxListBox::Delete(n);
@@ -265,7 +265,7 @@ bool wxStdCheckListboxInputHandler::HandleMouse(wxInputConsumer *consumer,
if ( x >= 0 && if ( x >= 0 &&
x < renderer->GetCheckBitmapSize().x && x < renderer->GetCheckBitmapSize().x &&
item >= 0 && item >= 0 &&
item < lbox->GetCount() ) (size_t)item < lbox->GetCount() )
{ {
lbox->PerformAction(wxACTION_CHECKLISTBOX_TOGGLE, item); lbox->PerformAction(wxACTION_CHECKLISTBOX_TOGGLE, item);

10
src/univ/listbox.cpp
View File

@@ -461,10 +461,10 @@ void wxListBox::DoSetSelection(int n, bool select)
int wxListBox::GetSelection() const int wxListBox::GetSelection() const
{ {
wxCHECK_MSG( !HasMultipleSelection(), -1, wxCHECK_MSG( !HasMultipleSelection(), wxNOT_FOUND,
_T("use wxListBox::GetSelections for ths listbox") ); _T("use wxListBox::GetSelections for ths listbox") );
return m_selections.IsEmpty() ? -1 : m_selections[0]; return m_selections.IsEmpty() ? wxNOT_FOUND : m_selections[0];
} }
int wxCMPFUNC_CONV wxCompareInts(int *n, int *m) int wxCMPFUNC_CONV wxCompareInts(int *n, int *m)
@@ -576,7 +576,7 @@ void wxListBox::UpdateScrollbars()
// is our height enough to show all items? // is our height enough to show all items?
size_t nLines = GetCount(); size_t nLines = GetCount();
wxCoord lineHeight = GetLineHeight(); wxCoord lineHeight = GetLineHeight();
bool showScrollbarY = nLines*lineHeight > size.y; bool showScrollbarY = (int)nLines*lineHeight > size.y;
// check the width too if required // check the width too if required
wxCoord charWidth, maxWidth; wxCoord charWidth, maxWidth;
@@ -927,7 +927,7 @@ bool wxListBox::FindItem(const wxString& prefix, bool strictlyAfter)
{ {
// the following line will set first correctly to 0 if there is no // the following line will set first correctly to 0 if there is no
// selection (m_current == -1) // selection (m_current == -1)
first = m_current == count - 1 ? 0 : m_current + 1; first = m_current == (int)(count - 1) ? 0 : m_current + 1;
} }
else // start with the current else // start with the current
{ {
@@ -943,7 +943,7 @@ bool wxListBox::FindItem(const wxString& prefix, bool strictlyAfter)
size_t len = prefix.length(); size_t len = prefix.length();
// loop over all items in the listbox // loop over all items in the listbox
for ( int item = first; item != (int)last; item < count - 1 ? item++ : item = 0 ) for ( int item = first; item != (int)last; item < (int)(count - 1) ? item++ : item = 0 )
{ {
if ( wxStrnicmp(this->GetString(item).c_str(), prefix, len) == 0 ) if ( wxStrnicmp(this->GetString(item).c_str(), prefix, len) == 0 )
{ {