Missing semicolon

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 60dac7ff8d43ab43504cafc6d14a2427c334b8d5..9fa7e32efe89c4460a7c9d86a2f5f61f8decc9bc 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -25,7 +25,10 @@
 #include "wx/quantize.h"
 
 #include "smile.xbm"
 #include "wx/quantize.h"
 
 #include "smile.xbm"

-#include "smile.xpm"
+
+#if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
+    #include "smile.xpm"
+#endif

 
 
 // derived classes
 
 
 // derived classes


@@ -38,7 +41,7 @@ class MyApp;
 class MyCanvas: public wxScrolledWindow
 {
 public:
 class MyCanvas: public wxScrolledWindow
 {
 public:

-    MyCanvas() {};
+    MyCanvas() {}

     MyCanvas( wxWindow *parent, wxWindowID, const wxPoint &pos, const wxSize &size );
     ~MyCanvas();
     void OnPaint( wxPaintEvent &event );
     MyCanvas( wxWindow *parent, wxWindowID, const wxPoint &pos, const wxSize &size );
     ~MyCanvas();
     void OnPaint( wxPaintEvent &event );


@@ -48,6 +51,7 @@ public:
     wxBitmap  *my_horse_jpeg;
     wxBitmap  *my_horse_gif;
     wxBitmap  *my_horse_bmp;
     wxBitmap  *my_horse_jpeg;
     wxBitmap  *my_horse_gif;
     wxBitmap  *my_horse_bmp;

+    wxBitmap  *my_horse_bmp2;

     wxBitmap  *my_horse_pcx;
     wxBitmap  *my_horse_pnm;
     wxBitmap  *my_horse_tiff;
     wxBitmap  *my_horse_pcx;
     wxBitmap  *my_horse_pnm;
     wxBitmap  *my_horse_tiff;


@@ -56,12 +60,14 @@ public:
     wxBitmap  *my_horse_ico16;
     wxBitmap  *my_horse_ico;
     wxBitmap  *my_horse_cur;
     wxBitmap  *my_horse_ico16;
     wxBitmap  *my_horse_ico;
     wxBitmap  *my_horse_cur;

-    
+    wxBitmap  *my_horse_ani;
+

     wxBitmap  *my_smile_xbm;
     wxBitmap  *my_square;
     wxBitmap  *my_anti;
 
     int xH, yH ;
     wxBitmap  *my_smile_xbm;
     wxBitmap  *my_square;
     wxBitmap  *my_anti;
 
     int xH, yH ;

+    int m_ani_images ;

 
 protected:
     wxBitmap m_bmpSmileXpm;
 
 protected:
     wxBitmap m_bmpSmileXpm;


@@ -76,14 +82,14 @@ private:
 const int nChoices = 8 ;
 static const wxString bppchoices[nChoices] =
 {
 const int nChoices = 8 ;
 static const wxString bppchoices[nChoices] =
 {

-    "1 bpp color",
-    "1 bpp B&W",
-    "4 bpp color",
-    "8 bpp color",
-    "8 bpp greyscale",
-    "8 bpp red",
-    "8 bpp own palette",
-    "24 bpp"
+    _T("1 bpp color"),
+    _T("1 bpp B&W"),
+    _T("4 bpp color"),
+    _T("8 bpp color"),
+    _T("8 bpp greyscale"),
+    _T("8 bpp red"),
+    _T("8 bpp own palette"),
+    _T("24 bpp")

 };
 
 static const int bppvalues[nChoices] =
 };
 
 static const int bppvalues[nChoices] =


@@ -138,10 +144,10 @@ public:
 
     void OnSave(wxCommandEvent& WXUNUSED(event))
     {
 
     void OnSave(wxCommandEvent& WXUNUSED(event))
     {

-        wxImage image(m_bitmap);
+        wxImage image = m_bitmap.ConvertToImage();

 
 

-        int bppselection = wxGetSingleChoiceIndex("Set BMP BPP",
-                                                  "Set BMP BPP",
+        int bppselection = wxGetSingleChoiceIndex(_T("Set BMP BPP"),
+                                                  _T("Set BMP BPP"),

                                                   nChoices,
                                                   bppchoices,
                                                   this);
                                                   nChoices,
                                                   bppchoices,
                                                   this);


@@ -186,25 +192,25 @@ public:
         bool loaded;
         wxString extension = savefilename.AfterLast('.').Lower();
 
         bool loaded;
         wxString extension = savefilename.AfterLast('.').Lower();
 

-        if (extension == "cur")
+        if (extension == _T("cur"))

         {
         {

-            image.Rescale(32,32);    
-            image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, 0);    
+            image.Rescale(32,32);
+            image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, 0);

             image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, 0);
             // This shows how you can save an image with explicitly
             // specified image format:
             loaded = image.SaveFile(savefilename, wxBITMAP_TYPE_CUR);
         }
             image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, 0);
             // This shows how you can save an image with explicitly
             // specified image format:
             loaded = image.SaveFile(savefilename, wxBITMAP_TYPE_CUR);
         }

-        else 
+        else

         {
             // This one guesses image format from filename extension
             // (it may fail if the extension is not recognized):
             loaded = image.SaveFile(savefilename);
         }
         {
             // This one guesses image format from filename extension
             // (it may fail if the extension is not recognized):
             loaded = image.SaveFile(savefilename);
         }

-        
+

         if ( !loaded )
         if ( !loaded )

-            wxMessageBox("No handler for this file type.",
-                         "File was not saved",
+            wxMessageBox(_T("No handler for this file type."),
+                         _T("File was not saved"),

                          wxOK|wxCENTRE, this);
     }
 
                          wxOK|wxCENTRE, this);
     }
 


@@ -251,6 +257,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     my_horse_jpeg = (wxBitmap*) NULL;
     my_horse_gif = (wxBitmap*) NULL;
     my_horse_bmp = (wxBitmap*) NULL;
     my_horse_jpeg = (wxBitmap*) NULL;
     my_horse_gif = (wxBitmap*) NULL;
     my_horse_bmp = (wxBitmap*) NULL;

+    my_horse_bmp2 = (wxBitmap*) NULL;

     my_horse_pcx = (wxBitmap*) NULL;
     my_horse_pnm = (wxBitmap*) NULL;
     my_horse_tiff = (wxBitmap*) NULL;
     my_horse_pcx = (wxBitmap*) NULL;
     my_horse_pnm = (wxBitmap*) NULL;
     my_horse_tiff = (wxBitmap*) NULL;


@@ -259,11 +266,14 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     my_horse_ico16 = (wxBitmap*) NULL;
     my_horse_ico = (wxBitmap*) NULL;
     my_horse_cur = (wxBitmap*) NULL;
     my_horse_ico16 = (wxBitmap*) NULL;
     my_horse_ico = (wxBitmap*) NULL;
     my_horse_cur = (wxBitmap*) NULL;

+    my_horse_ani = (wxBitmap*) NULL;

 
     my_smile_xbm = (wxBitmap*) NULL;
     my_square = (wxBitmap*) NULL;
     my_anti = (wxBitmap*) NULL;
 
 
     my_smile_xbm = (wxBitmap*) NULL;
     my_square = (wxBitmap*) NULL;
     my_anti = (wxBitmap*) NULL;
 

+    m_ani_images = 0 ;
+

     SetBackgroundColour(* wxWHITE);
 
     wxBitmap bitmap( 100, 100 );
     SetBackgroundColour(* wxWHITE);
 
     wxBitmap bitmap( 100, 100 );


@@ -280,26 +290,26 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     // try to find the directory with our images
     wxString dir;
     if ( wxFile::Exists(wxT("./horse.png")) )
     // try to find the directory with our images
     wxString dir;
     if ( wxFile::Exists(wxT("./horse.png")) )

-        dir = "./";
+        dir = wxT("./");

     else if ( wxFile::Exists(wxT("../horse.png")) )
     else if ( wxFile::Exists(wxT("../horse.png")) )

-        dir = "../";
+        dir = wxT("../");

     else
         wxLogWarning(wxT("Can't find image files in either '.' or '..'!"));
 
     wxImage image = bitmap.ConvertToImage();
 
 #if wxUSE_LIBPNG
     else
         wxLogWarning(wxT("Can't find image files in either '.' or '..'!"));
 
     wxImage image = bitmap.ConvertToImage();
 
 #if wxUSE_LIBPNG

-    if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ))
+    if ( !image.SaveFile( dir + _T("test.png"), wxBITMAP_TYPE_PNG ))

         wxLogError(wxT("Can't save file"));
 
     image.Destroy();
 
         wxLogError(wxT("Can't save file"));
 
     image.Destroy();
 

-    image.LoadFile( dir + wxString("test.png") );
+    image.LoadFile( dir + _T("test.png") );

     my_square = new wxBitmap( image );
 
     image.Destroy();
 
     my_square = new wxBitmap( image );
 
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.png")) )
+    if ( !image.LoadFile( dir + _T("horse.png")) )

         wxLogError(wxT("Can't load PNG image"));
     else
         my_horse_png = new wxBitmap( image );
         wxLogError(wxT("Can't load PNG image"));
     else
         my_horse_png = new wxBitmap( image );


@@ -308,7 +318,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 #if wxUSE_LIBJPEG
     image.Destroy();
 
 #if wxUSE_LIBJPEG
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.jpg")) )
+    if ( !image.LoadFile( dir + _T("horse.jpg")) )

         wxLogError(wxT("Can't load JPG image"));
     else
         my_horse_jpeg = new wxBitmap( image );
         wxLogError(wxT("Can't load JPG image"));
     else
         my_horse_jpeg = new wxBitmap( image );


@@ -317,7 +327,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 #if wxUSE_GIF
     image.Destroy();
 
 #if wxUSE_GIF
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.gif")) )
+    if ( !image.LoadFile( dir + _T("horse.gif" )) )

         wxLogError(wxT("Can't load GIF image"));
     else
         my_horse_gif = new wxBitmap( image );
         wxLogError(wxT("Can't load GIF image"));
     else
         my_horse_gif = new wxBitmap( image );


@@ -326,7 +336,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 #if wxUSE_PCX
     image.Destroy();
 
 #if wxUSE_PCX
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.pcx"), wxBITMAP_TYPE_PCX ) )
+    if ( !image.LoadFile( dir + _T("horse.pcx"), wxBITMAP_TYPE_PCX ) )

         wxLogError(wxT("Can't load PCX image"));
     else
         my_horse_pcx = new wxBitmap( image );
         wxLogError(wxT("Can't load PCX image"));
     else
         my_horse_pcx = new wxBitmap( image );


@@ -334,7 +344,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
     image.Destroy();
 
 
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) )
+    if ( !image.LoadFile( dir + _T("horse.bmp"), wxBITMAP_TYPE_BMP ) )

         wxLogError(wxT("Can't load BMP image"));
     else
         my_horse_bmp = new wxBitmap( image );
         wxLogError(wxT("Can't load BMP image"));
     else
         my_horse_bmp = new wxBitmap( image );


@@ -342,19 +352,19 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 #if wxUSE_XPM
     image.Destroy();
 
 #if wxUSE_XPM
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.xpm"), wxBITMAP_TYPE_XPM ) )
+    if ( !image.LoadFile( dir + _T("horse.xpm"), wxBITMAP_TYPE_XPM ) )

         wxLogError(wxT("Can't load XPM image"));
     else
         my_horse_xpm = new wxBitmap( image );
 
         wxLogError(wxT("Can't load XPM image"));
     else
         my_horse_xpm = new wxBitmap( image );
 

-    if ( !image.SaveFile( dir + wxString("test.xpm"), wxBITMAP_TYPE_XPM ))
+    if ( !image.SaveFile( dir + _T("test.xpm"), wxBITMAP_TYPE_XPM ))

         wxLogError(wxT("Can't save file"));
 #endif
 
 #if wxUSE_PNM
     image.Destroy();
 
         wxLogError(wxT("Can't save file"));
 #endif
 
 #if wxUSE_PNM
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) )
+    if ( !image.LoadFile( dir + _T("horse.pnm"), wxBITMAP_TYPE_PNM ) )

         wxLogError(wxT("Can't load PNM image"));
     else
         my_horse_pnm = new wxBitmap( image );
         wxLogError(wxT("Can't load PNM image"));
     else
         my_horse_pnm = new wxBitmap( image );


@@ -363,7 +373,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 #if wxUSE_LIBTIFF
     image.Destroy();
 
 #if wxUSE_LIBTIFF
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.tif"), wxBITMAP_TYPE_TIF ) )
+    if ( !image.LoadFile( dir + _T("horse.tif"), wxBITMAP_TYPE_TIF ) )

         wxLogError(wxT("Can't load TIFF image"));
     else
         my_horse_tiff = new wxBitmap( image );
         wxLogError(wxT("Can't load TIFF image"));
     else
         my_horse_tiff = new wxBitmap( image );


@@ -377,44 +387,82 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 #if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
     // demonstrates XPM automatically using the mask when saving
     if ( m_bmpSmileXpm.Ok() )
 #if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
     // demonstrates XPM automatically using the mask when saving
     if ( m_bmpSmileXpm.Ok() )

-        m_bmpSmileXpm.SaveFile("saved.xpm", wxBITMAP_TYPE_XPM);
+        m_bmpSmileXpm.SaveFile(_T("saved.xpm"), wxBITMAP_TYPE_XPM);

 #endif
 
 #if wxUSE_ICO_CUR
     image.Destroy();
 
 #endif
 
 #if wxUSE_ICO_CUR
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.ico"), wxBITMAP_TYPE_ICO, 0 ) )
+    if ( !image.LoadFile( dir + _T("horse.ico"), wxBITMAP_TYPE_ICO, 0 ) )

         wxLogError(wxT("Can't load first ICO image"));
     else
         my_horse_ico32 = new wxBitmap( image );
         wxLogError(wxT("Can't load first ICO image"));
     else
         my_horse_ico32 = new wxBitmap( image );

-        
+

     image.Destroy();
 
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.ico"), wxBITMAP_TYPE_ICO, 1 ) )
+    if ( !image.LoadFile( dir + _T("horse.ico"), wxBITMAP_TYPE_ICO, 1 ) )

         wxLogError(wxT("Can't load second ICO image"));
     else
         my_horse_ico16 = new wxBitmap( image );
 
     image.Destroy();
 
         wxLogError(wxT("Can't load second ICO image"));
     else
         my_horse_ico16 = new wxBitmap( image );
 
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.ico") ) )
+    if ( !image.LoadFile( dir + _T("horse.ico") ) )

         wxLogError(wxT("Can't load best ICO image"));
     else
         my_horse_ico = new wxBitmap( image );
 
     image.Destroy();
 
         wxLogError(wxT("Can't load best ICO image"));
     else
         my_horse_ico = new wxBitmap( image );
 
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.cur"), wxBITMAP_TYPE_CUR ) )
+    if ( !image.LoadFile( dir + _T("horse.cur"), wxBITMAP_TYPE_CUR ) )

         wxLogError(wxT("Can't load best ICO image"));
     else
         wxLogError(wxT("Can't load best ICO image"));
     else

-        {
+    {

         my_horse_cur = new wxBitmap( image );
         xH = 30 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) ;
         yH = 2420 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ;
         my_horse_cur = new wxBitmap( image );
         xH = 30 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) ;
         yH = 2420 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ;

+    }
+
+    m_ani_images = wxImage::GetImageCount ( dir + _T("horse3.ani"), wxBITMAP_TYPE_ANI );
+    if (m_ani_images==0)
+        wxLogError(wxT("No ANI-format images found"));
+    else
+        my_horse_ani = new wxBitmap [m_ani_images];
+    int i ;
+    for (i=0; i < m_ani_images; i++)
+    {
+        image.Destroy();
+        if (!image.LoadFile( dir + _T("horse3.ani"), wxBITMAP_TYPE_ANI, i ))
+        {
+            wxString tmp = wxT("Can't load image number ");
+            tmp << i ;
+            wxLogError(tmp);

         }
         }

+        else    
+            my_horse_ani [i] = wxBitmap( image );
+    }
+    

     
 #endif
 
     
 #endif
 

+    image.Destroy();
+
+    // test image loading from stream
+    wxFile file(dir + _T("horse.bmp"));
+    off_t len = file.Length();
+    void *data = malloc(len);
+    if ( file.Read(data, len) != len )
+        wxLogError(_T("Reading bitmap file failed"));
+    else
+    {
+        wxMemoryInputStream mis(data, len);
+        if ( !image.LoadFile(mis) )
+            wxLogError(wxT("Can't load BMP image from stream"));
+        else
+            my_horse_bmp2 = new wxBitmap( image );
+    }
+
+    free(data);

 }
 
 MyCanvas::~MyCanvas()
 }
 
 MyCanvas::~MyCanvas()


@@ -424,12 +472,15 @@ MyCanvas::~MyCanvas()
     delete my_horse_jpeg;
     delete my_horse_gif;
     delete my_horse_bmp;
     delete my_horse_jpeg;
     delete my_horse_gif;
     delete my_horse_bmp;

+    delete my_horse_bmp2;

     delete my_horse_pcx;
     delete my_horse_tiff;
     delete my_horse_xpm;
     delete my_horse_ico32;
     delete my_horse_ico16;
     delete my_horse_ico;
     delete my_horse_pcx;
     delete my_horse_tiff;
     delete my_horse_xpm;
     delete my_horse_ico32;
     delete my_horse_ico16;
     delete my_horse_ico;

+    delete my_horse_cur;
+    delete [] my_horse_ani;

     delete my_smile_xbm;
     delete my_square;
     delete my_anti;
     delete my_smile_xbm;
     delete my_square;
     delete my_anti;


@@ -440,10 +491,10 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     wxPaintDC dc( this );
     PrepareDC( dc );
 
     wxPaintDC dc( this );
     PrepareDC( dc );
 

-    dc.DrawText( "Loaded image", 30, 10 );
+    dc.DrawText( _T("Loaded image"), 30, 10 );

     if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 );
 
     if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 );
 

-    dc.DrawText( "Drawn directly", 150, 10 );
+    dc.DrawText( _T("Drawn directly"), 150, 10 );

     dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );
     dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 150, 30, 100, 100 );
     dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );
     dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 150, 30, 100, 100 );


@@ -453,56 +504,60 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     if (my_anti && my_anti->Ok())
         dc.DrawBitmap( *my_anti, 280, 30 );
 
     if (my_anti && my_anti->Ok())
         dc.DrawBitmap( *my_anti, 280, 30 );
 

-    dc.DrawText( "PNG handler", 30, 135 );
+    dc.DrawText( _T("PNG handler"), 30, 135 );

     if (my_horse_png && my_horse_png->Ok())
     {
         dc.DrawBitmap( *my_horse_png, 30, 150 );
         wxRect rect(0,0,100,100);
         wxBitmap sub( my_horse_png->GetSubBitmap(rect) );
     if (my_horse_png && my_horse_png->Ok())
     {
         dc.DrawBitmap( *my_horse_png, 30, 150 );
         wxRect rect(0,0,100,100);
         wxBitmap sub( my_horse_png->GetSubBitmap(rect) );

-        dc.DrawText( "GetSubBitmap()", 280, 190 );
+        dc.DrawText( _T("GetSubBitmap()"), 280, 190 );

         dc.DrawBitmap( sub, 280, 210 );
     }
 
         dc.DrawBitmap( sub, 280, 210 );
     }
 

-    dc.DrawText( "JPEG handler", 30, 365 );
+    dc.DrawText( _T("JPEG handler"), 30, 365 );

     if (my_horse_jpeg && my_horse_jpeg->Ok())
         dc.DrawBitmap( *my_horse_jpeg, 30, 380 );
 
     if (my_horse_jpeg && my_horse_jpeg->Ok())
         dc.DrawBitmap( *my_horse_jpeg, 30, 380 );
 

-    dc.DrawText( "GIF handler", 30, 595 );
+    dc.DrawText( _T("GIF handler"), 30, 595 );

     if (my_horse_gif && my_horse_gif->Ok())
         dc.DrawBitmap( *my_horse_gif, 30, 610 );
 
     if (my_horse_gif && my_horse_gif->Ok())
         dc.DrawBitmap( *my_horse_gif, 30, 610 );
 

-    dc.DrawText( "PCX handler", 30, 825 );
+    dc.DrawText( _T("PCX handler"), 30, 825 );

     if (my_horse_pcx && my_horse_pcx->Ok())
         dc.DrawBitmap( *my_horse_pcx, 30, 840 );
 
     if (my_horse_pcx && my_horse_pcx->Ok())
         dc.DrawBitmap( *my_horse_pcx, 30, 840 );
 

-    dc.DrawText( "BMP handler", 30, 1055 );
+    dc.DrawText( _T("BMP handler"), 30, 1055 );

     if (my_horse_bmp && my_horse_bmp->Ok())
         dc.DrawBitmap( *my_horse_bmp, 30, 1070 );
 
     if (my_horse_bmp && my_horse_bmp->Ok())
         dc.DrawBitmap( *my_horse_bmp, 30, 1070 );
 

-    dc.DrawText( "PNM handler", 30, 1285 );
+    dc.DrawText( _T("BMP read from memory"), 280, 1055 );
+    if (my_horse_bmp2 && my_horse_bmp2->Ok())
+        dc.DrawBitmap( *my_horse_bmp2, 280, 1070 );
+
+    dc.DrawText( _T("PNM handler"), 30, 1285 );

     if (my_horse_pnm && my_horse_pnm->Ok())
         dc.DrawBitmap( *my_horse_pnm, 30, 1300 );
 
     if (my_horse_pnm && my_horse_pnm->Ok())
         dc.DrawBitmap( *my_horse_pnm, 30, 1300 );
 

-    dc.DrawText( "TIFF handler", 30, 1515 );
+    dc.DrawText( _T("TIFF handler"), 30, 1515 );

     if (my_horse_tiff && my_horse_tiff->Ok())
         dc.DrawBitmap( *my_horse_tiff, 30, 1530 );
 
     if (my_horse_tiff && my_horse_tiff->Ok())
         dc.DrawBitmap( *my_horse_tiff, 30, 1530 );
 

-    dc.DrawText( "XPM handler", 30, 1745 );
+    dc.DrawText( _T("XPM handler"), 30, 1745 );

     if (my_horse_xpm && my_horse_xpm->Ok())
         dc.DrawBitmap( *my_horse_xpm, 30, 1760 );
 
 
     if (my_smile_xbm && my_smile_xbm->Ok())
     {
     if (my_horse_xpm && my_horse_xpm->Ok())
         dc.DrawBitmap( *my_horse_xpm, 30, 1760 );
 
 
     if (my_smile_xbm && my_smile_xbm->Ok())
     {

-        dc.DrawText( "XBM bitmap", 30, 1975 );
-        dc.DrawText( "(green on red)", 30, 1990 );
-        dc.SetTextForeground( wxT("GREEN") );
-        dc.SetTextBackground( wxT("RED") );
+        dc.DrawText( _T("XBM bitmap"), 30, 1975 );
+        dc.DrawText( _T("(green on red)"), 30, 1990 );
+        dc.SetTextForeground( _T("GREEN") );
+        dc.SetTextBackground( _T("RED") );

         dc.DrawBitmap( *my_smile_xbm, 30, 2010 );
 
         dc.SetTextForeground( wxT("BLACK") );
         dc.DrawBitmap( *my_smile_xbm, 30, 2010 );
 
         dc.SetTextForeground( wxT("BLACK") );

-        dc.DrawText( "After wxImage conversion", 150, 1975 );
-        dc.DrawText( "(red on white)", 150, 1990 );
+        dc.DrawText( _T("After wxImage conversion"), 150, 1975 );
+        dc.DrawText( _T("(red on white)"), 150, 1990 );

         dc.SetTextForeground( wxT("RED") );
         wxImage i = my_smile_xbm->ConvertToImage();
         i.SetMaskColour( 255, 255, 255 );
         dc.SetTextForeground( wxT("RED") );
         wxImage i = my_smile_xbm->ConvertToImage();
         i.SetMaskColour( 255, 255, 255 );


@@ -510,7 +565,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );
                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );

-        dc.DrawBitmap( i.ConvertToBitmap(), 150, 2010, TRUE );
+        dc.DrawBitmap( wxBitmap(i), 150, 2010, TRUE );

         dc.SetTextForeground( wxT("BLACK") );
     }
 
         dc.SetTextForeground( wxT("BLACK") );
     }
 


@@ -522,7 +577,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     memdc.SetBrush( *wxWHITE_BRUSH );
     memdc.DrawRectangle( 0,0,60,50 );
     memdc.SetTextForeground( *wxBLACK );
     memdc.SetBrush( *wxWHITE_BRUSH );
     memdc.DrawRectangle( 0,0,60,50 );
     memdc.SetTextForeground( *wxBLACK );

-    memdc.DrawText( "Hi!", 5, 5 );
+    memdc.DrawText( _T("Hi!"), 5, 5 );

     memdc.SetBrush( *wxBLACK_BRUSH );
     memdc.DrawRectangle( 33,5,20,20 );
     memdc.SetPen( *wxRED_PEN );
     memdc.SetBrush( *wxBLACK_BRUSH );
     memdc.DrawRectangle( 33,5,20,20 );
     memdc.SetPen( *wxRED_PEN );


@@ -531,15 +586,15 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     if (mono.Ok())
     {
 
     if (mono.Ok())
     {

-        dc.DrawText( "Mono bitmap", 30, 2095 );
-        dc.DrawText( "(red on green)", 30, 2110 );
+        dc.DrawText( _T("Mono bitmap"), 30, 2095 );
+        dc.DrawText( _T("(red on green)"), 30, 2110 );

         dc.SetTextForeground( wxT("RED") );
         dc.SetTextBackground( wxT("GREEN") );
         dc.DrawBitmap( mono, 30, 2130 );
 
         dc.SetTextForeground( wxT("BLACK") );
         dc.SetTextForeground( wxT("RED") );
         dc.SetTextBackground( wxT("GREEN") );
         dc.DrawBitmap( mono, 30, 2130 );
 
         dc.SetTextForeground( wxT("BLACK") );

-        dc.DrawText( "After wxImage conversion", 150, 2095 );
-        dc.DrawText( "(red on white)", 150, 2110 );
+        dc.DrawText( _T("After wxImage conversion"), 150, 2095 );
+        dc.DrawText( _T("(red on white)"), 150, 2110 );

         dc.SetTextForeground( wxT("RED") );
         wxImage i = mono.ConvertToImage();
         i.SetMaskColour( 255,255,255 );
         dc.SetTextForeground( wxT("RED") );
         wxImage i = mono.ConvertToImage();
         i.SetMaskColour( 255,255,255 );


@@ -547,41 +602,48 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );
                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );

-        dc.DrawBitmap( i.ConvertToBitmap(), 150, 2130, TRUE );
+        dc.DrawBitmap( wxBitmap(i), 150, 2130, TRUE );

         dc.SetTextForeground( wxT("BLACK") );
     }
 
         dc.SetTextForeground( wxT("BLACK") );
     }
 

-    dc.DrawText("XPM bitmap", 30, 2230);
+    dc.DrawText(_T("XPM bitmap"), 30, 2230);

     if ( m_bmpSmileXpm.Ok() )
     {
         dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, TRUE);
     }
 
     if ( m_bmpSmileXpm.Ok() )
     {
         dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, TRUE);
     }
 

-    dc.DrawText("XPM icon", 150, 2230);
+    dc.DrawText(_T("XPM icon"), 150, 2230);

     if ( m_iconSmileXpm.Ok() )
     {
         dc.DrawIcon(m_iconSmileXpm, 150, 2250);
     }
 
     if ( m_iconSmileXpm.Ok() )
     {
         dc.DrawIcon(m_iconSmileXpm, 150, 2250);
     }
 

-    dc.DrawText( "ICO handler (1st image)", 30, 2290 );
+    dc.DrawText( _T("ICO handler (1st image)"), 30, 2290 );

     if (my_horse_ico32 && my_horse_ico32->Ok())
         dc.DrawBitmap( *my_horse_ico32, 30, 2330, TRUE );
 
     if (my_horse_ico32 && my_horse_ico32->Ok())
         dc.DrawBitmap( *my_horse_ico32, 30, 2330, TRUE );
 

-    dc.DrawText( "ICO handler (2nd image)", 230, 2290 );
+    dc.DrawText( _T("ICO handler (2nd image)"), 230, 2290 );

     if (my_horse_ico16 && my_horse_ico16->Ok())
         dc.DrawBitmap( *my_horse_ico16, 230, 2330, TRUE );
     if (my_horse_ico16 && my_horse_ico16->Ok())
         dc.DrawBitmap( *my_horse_ico16, 230, 2330, TRUE );

-        
-    dc.DrawText( "ICO handler (best image)", 430, 2290 );
+
+    dc.DrawText( _T("ICO handler (best image)"), 430, 2290 );

     if (my_horse_ico && my_horse_ico->Ok())
         dc.DrawBitmap( *my_horse_ico, 430, 2330, TRUE );
 
     if (my_horse_ico && my_horse_ico->Ok())
         dc.DrawBitmap( *my_horse_ico, 430, 2330, TRUE );
 

-    dc.DrawText( "CUR handler", 30, 2390 );
+    dc.DrawText( _T("CUR handler"), 30, 2390 );

     if (my_horse_cur && my_horse_cur->Ok())
     if (my_horse_cur && my_horse_cur->Ok())

-        {
+    {

         dc.DrawBitmap( *my_horse_cur, 30, 2420, TRUE );
         dc.SetPen (*wxRED_PEN);
         dc.DrawLine (xH-10,yH,xH+10,yH);
         dc.DrawLine (xH,yH-10,xH,yH+10);
         dc.DrawBitmap( *my_horse_cur, 30, 2420, TRUE );
         dc.SetPen (*wxRED_PEN);
         dc.DrawLine (xH-10,yH,xH+10,yH);
         dc.DrawLine (xH,yH-10,xH,yH+10);

+    }
+    dc.DrawText( _T("ANI handler"), 230, 2390 );
+    int i ;
+    for (i=0; i < m_ani_images; i ++)
+        if (my_horse_ani[i].Ok())
+        {
+            dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, TRUE );

         }
 }
 
         }
 }
 


@@ -597,8 +659,8 @@ void MyCanvas::CreateAntiAliasedBitmap()
 
   dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) );
   dc.SetTextForeground( wxT("RED") );
 
   dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) );
   dc.SetTextForeground( wxT("RED") );

-  dc.DrawText( "This is anti-aliased Text.", 20, 20 );
-  dc.DrawText( "And a Rectangle.", 20, 60 );
+  dc.DrawText( _T("This is anti-aliased Text."), 20, 20 );
+  dc.DrawText( _T("And a Rectangle."), 20, 60 );

 
   dc.SetBrush( *wxRED_BRUSH );
   dc.SetPen( *wxTRANSPARENT_PEN );
 
   dc.SetBrush( *wxRED_BRUSH );
   dc.SetPen( *wxTRANSPARENT_PEN );


@@ -631,7 +693,7 @@ void MyCanvas::CreateAntiAliasedBitmap()
        blue = blue/4;
        anti.SetRGB( x, y, red, green, blue );
     }
        blue = blue/4;
        anti.SetRGB( x, y, red, green, blue );
     }

-  my_anti = new wxBitmap( anti.ConvertToBitmap() );
+  my_anti = new wxBitmap(anti);

 }
 
 // MyFrame
 }
 
 // MyFrame


@@ -649,18 +711,18 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()

-       : wxFrame( (wxFrame *)NULL, -1, "wxImage sample",
+       : wxFrame( (wxFrame *)NULL, -1, _T("wxImage sample"),

                   wxPoint(20,20), wxSize(470,360) )
 {
   wxMenu *file_menu = new wxMenu();
                   wxPoint(20,20), wxSize(470,360) )
 {
   wxMenu *file_menu = new wxMenu();

-  file_menu->Append( ID_NEW, "&Show image...");
+  file_menu->Append( ID_NEW, _T("&Show image..."));

   file_menu->AppendSeparator();
   file_menu->AppendSeparator();

-  file_menu->Append( ID_ABOUT, "&About...");
+  file_menu->Append( ID_ABOUT, _T("&About..."));

   file_menu->AppendSeparator();
   file_menu->AppendSeparator();

-  file_menu->Append( ID_QUIT, "E&xit");
+  file_menu->Append( ID_QUIT, _T("E&xit"));

 
   wxMenuBar *menu_bar = new wxMenuBar();
 
   wxMenuBar *menu_bar = new wxMenuBar();

-  menu_bar->Append(file_menu, "&File");
+  menu_bar->Append(file_menu, _T("&File"));

 
   SetMenuBar( menu_bar );
 
 
   SetMenuBar( menu_bar );
 


@@ -681,9 +743,9 @@ void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
 
 void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 {
 
 void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 {

-  (void)wxMessageBox( "wxImage demo\n"
-                      "Robert Roebling (c) 1998,2000",
-                      "About wxImage Demo", wxICON_INFORMATION | wxOK );
+  (void)wxMessageBox( _T("wxImage demo\n")
+                      _T("Robert Roebling (c) 1998,2000"),
+                      _T("About wxImage Demo"), wxICON_INFORMATION | wxOK );

 }
 
 void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
 }
 
 void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )


@@ -700,7 +762,7 @@ void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
         return;
     }
 
         return;
     }
 

-    (new MyImageFrame(this, image.ConvertToBitmap()))->Show();
+    (new MyImageFrame(this, wxBitmap(image)))->Show();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -740,6 +802,7 @@ bool MyApp::OnInit()
 #if wxUSE_ICO_CUR
   wxImage::AddHandler( new wxICOHandler );
   wxImage::AddHandler( new wxCURHandler );
 #if wxUSE_ICO_CUR
   wxImage::AddHandler( new wxICOHandler );
   wxImage::AddHandler( new wxCURHandler );

+  wxImage::AddHandler( new wxANIHandler );

 #endif
 
   wxFrame *frame = new MyFrame();
 #endif
 
   wxFrame *frame = new MyFrame();