Warning fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index d13547939514f4375ad340c27f918fb8b93d7f82..61df8bf9130b82bc84f418006ffc7acf262c8bd1 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -515,7 +515,7 @@ void MyCanvas::DrawDefault(wxDC& dc)
     // mark the origin
     dc.DrawCircle(0, 0, 10);
 
     // mark the origin
     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
     // (FloodFill uses Blit from a non-wxMemoryDC)
     //flood fill using brush, starting at 1,1 and replacing whatever colour we find there
     // GetPixel and FloodFill not supported by Mac OS X CoreGraphics
     // (FloodFill uses Blit from a non-wxMemoryDC)
     //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:
             DrawGradients(dc);
             break;
         case Show_Gradient:
             DrawGradients(dc);
             break;

+
+        default:
+            break;

     }
 }
 
     }
 }
 

diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp
index c14d2ff6332af18d737fb403f3732e4e61146c1f..9f7046a89bd62212c1b4583981aa91f80328bff6 100644 (file)
--- a/samples/widgets/combobox.cpp
+++ b/samples/widgets/combobox.cpp
@@ -491,7 +491,7 @@ void ComboboxWidgetsPage::OnUpdateUICurText(wxUpdateUIEvent& event)
 void ComboboxWidgetsPage::OnUpdateUIInsertionPointText(wxUpdateUIEvent& event)
 {
     if (m_combobox)
 void ComboboxWidgetsPage::OnUpdateUIInsertionPointText(wxUpdateUIEvent& event)
 {
     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)

diff --git a/src/univ/checklst.cpp b/src/univ/checklst.cpp
index cfb181734351248a02b4b9457613c2a97d2c32ea..384d39359c10620a3f253a29dcda387b6b4e7035 100644 (file)
--- a/src/univ/checklst.cpp
+++ b/src/univ/checklst.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        univ/checklst.cpp
+// Name:        src/univ/checklst.cpp

 // Purpose:     wxCheckListBox implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxCheckListBox implementation
 // Author:      Vadim Zeitlin
 // 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 &&
              x < renderer->GetCheckBitmapSize().x &&
              item >= 0 &&
         if ( x >= 0 &&
              x < renderer->GetCheckBitmapSize().x &&
              item >= 0 &&

-             item < lbox->GetCount() )
+             (size_t)item < lbox->GetCount() )

         {
             lbox->PerformAction(wxACTION_CHECKLISTBOX_TOGGLE, item);
 
         {
             lbox->PerformAction(wxACTION_CHECKLISTBOX_TOGGLE, item);
 

diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp
index 9b26f6c6144f717ccbfd7ad0504f9dbfe486f883..663611a6c76d521a8f01232bfe1acc616266224f 100644 (file)
--- a/src/univ/listbox.cpp
+++ b/src/univ/listbox.cpp
@@ -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?
     size_t nLines = GetCount();
     wxCoord lineHeight = GetLineHeight();
     // is our height enough to show all items?
     size_t nLines = GetCount();
     wxCoord lineHeight = GetLineHeight();

-    bool showScrollbarY = nLines*lineHeight > size.y;
+    bool showScrollbarY = (int)nLines*lineHeight > size.y;

 
     // check the width too if required
     wxCoord charWidth, maxWidth;
 
     // check the width too if required
     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
         // selection (m_current == -1)
     {
         // the following line will set first correctly to 0 if there is no
         // 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();
 
     // loop over all items in the listbox
     size_t len = prefix.length();
 
     // 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 )
         {