Fix wxSortedArray::Index() when wxUSE_STL == 1, with tests.

[wxWidgets.git] / samples / image / image.cpp

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index dd69ad6a455da93f8522b50825fc7d827d84f052..4d8d51e527eacb461ea55232b4174f2d12647c83 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -203,7 +203,7 @@ public:
         {
             unsigned char *cmap = new unsigned char [256];
             for ( int i = 0; i < 256; i++ )
-                cmap[i] = i;
+                cmap[i] = (unsigned char)i;
             image.SetPalette(wxPalette(256, cmap, cmap, cmap));
 
             delete cmap;
@@ -538,7 +538,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
             tmp << i ;
             wxLogError(tmp);
         }
-        else    
+        else
             my_horse_ani [i] = wxBitmap( image );
     }
 #endif // wxUSE_ICO_CUR
@@ -549,13 +549,14 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     wxFile file(dir + _T("horse.bmp"));
     if ( file.IsOpened() )
     {
-        off_t len = file.Length();
-        void *data = malloc(len);
-        if ( file.Read(data, len) != len )
+        wxFileOffset len = file.Length();
+        size_t dataSize = (size_t)len;
+        void *data = malloc(dataSize);
+        if ( file.Read(data, dataSize) != len )
             wxLogError(_T("Reading bitmap file failed"));
         else
         {
-            wxMemoryInputStream mis(data, len);
+            wxMemoryInputStream mis(data, dataSize);
             if ( !image.LoadFile(mis) )
                 wxLogError(wxT("Can't load BMP image from stream"));
             else
@@ -713,7 +714,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     // For testing transparency
     dc.SetBrush( *wxRED_BRUSH );
     dc.DrawRectangle( 20, 2220, 560, 68 );
-    
+
     dc.DrawText(_T("XPM bitmap"), 30, 2230 );
     if ( m_bmpSmileXpm.Ok() )
         dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, true);
@@ -721,8 +722,8 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     dc.DrawText(_T("XPM icon"), 110, 2230 );
     if ( m_iconSmileXpm.Ok() )
         dc.DrawIcon(m_iconSmileXpm, 110, 2250);
-    
-    // testing icon -> bitmap conversion    
+
+    // testing icon -> bitmap conversion
     wxBitmap to_blit( m_iconSmileXpm );
     if (to_blit.Ok())
     {
@@ -737,7 +738,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
         dc.SetUserScale( 2, 2 );
         dc.DrawBitmap( to_blit, (int)(300/2), (int)(2250/2), true );
         dc.SetUserScale( 1.0, 1.0 );
-        
+
         dc.DrawText( _T("Blit"), 400, 2230);
         wxMemoryDC blit_dc;
         blit_dc.SelectObject( to_blit );
@@ -822,7 +823,7 @@ void MyCanvas::CreateAntiAliasedBitmap()
                   original.GetBlue( x*2, y*2+1 ) +
                   original.GetBlue( x*2+1, y*2+1 );
        blue = blue/4;
-       anti.SetRGB( x, y, red, green, blue );
+       anti.SetRGB( x, y, (unsigned char)red, (unsigned char)green, (unsigned char)blue );
     }
   my_anti = new wxBitmap(anti);
 }
@@ -880,9 +881,11 @@ MyFrame::MyFrame()
 
   SetMenuBar( menu_bar );
 
+#if wxUSE_STATUSBAR
   CreateStatusBar(2);
   int widths[] = { -1, 100 };
   SetStatusWidths( 2, widths );
+#endif // wxUSE_STATUSBAR
 
   m_canvas = new MyCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) );