Version updates, manual date change, no change to dragimmg.cpp

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 88a08a91ae7f94f03c141d5ddd0f72b0665902cc..262078f92c0773e3de1a066aa376afab19247b79 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -22,6 +22,7 @@
 #include "wx/file.h"
 #include "wx/mstream.h"
 #include "wx/wfstream.h"
 #include "wx/file.h"
 #include "wx/mstream.h"
 #include "wx/wfstream.h"

+#include "wx/quantize.h"

 
 #include "smile.xbm"
 #include "smile.xpm"
 
 #include "smile.xbm"
 #include "smile.xpm"


@@ -50,10 +51,18 @@ public:
     wxBitmap  *my_horse_pcx;
     wxBitmap  *my_horse_pnm;
     wxBitmap  *my_horse_tiff;
     wxBitmap  *my_horse_pcx;
     wxBitmap  *my_horse_pnm;
     wxBitmap  *my_horse_tiff;

+    wxBitmap  *my_horse_xpm;
+    wxBitmap  *my_horse_ico32;
+    wxBitmap  *my_horse_ico16;
+    wxBitmap  *my_horse_ico;
+    wxBitmap  *my_horse_cur;
+    

     wxBitmap  *my_smile_xbm;
     wxBitmap  *my_square;
     wxBitmap  *my_anti;
 
     wxBitmap  *my_smile_xbm;
     wxBitmap  *my_square;
     wxBitmap  *my_anti;
 

+    int xH, yH ;
+

 protected:
     wxBitmap m_bmpSmileXpm;
     wxIcon   m_iconSmileXpm;
 protected:
     wxBitmap m_bmpSmileXpm;
     wxIcon   m_iconSmileXpm;


@@ -63,8 +72,35 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+
+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"
+};
+
+static const int bppvalues[nChoices] =
+{
+    wxBMP_1BPP,
+    wxBMP_1BPP_BW,
+    wxBMP_4BPP,
+    wxBMP_8BPP,
+    wxBMP_8BPP_GREY,
+    wxBMP_8BPP_RED,
+    wxBMP_8BPP_PALETTE,
+    wxBMP_24BPP
+};
+

 // MyFrame
 
 // MyFrame
 

+

 class MyFrame: public wxFrame
 {
 public:
 class MyFrame: public wxFrame
 {
 public:


@@ -85,10 +121,10 @@ class MyImageFrame : public wxFrame
 {
 public:
     MyImageFrame(wxFrame *parent, const wxBitmap& bitmap)
 {
 public:
     MyImageFrame(wxFrame *parent, const wxBitmap& bitmap)

-        : wxFrame(parent, -1, _T("Frame with image"),
+        : wxFrame(parent, -1, _T("Double click to save"),

                   wxDefaultPosition, wxDefaultSize,
                   wxCAPTION | wxSYSTEM_MENU),
                   wxDefaultPosition, wxDefaultSize,
                   wxCAPTION | wxSYSTEM_MENU),

-          m_bitmap(bitmap)
+                  m_bitmap(bitmap)

     {
         SetClientSize(bitmap.GetWidth(), bitmap.GetHeight());
     }
     {
         SetClientSize(bitmap.GetWidth(), bitmap.GetHeight());
     }


@@ -96,7 +132,80 @@ public:
     void OnPaint(wxPaintEvent& WXUNUSED(event))
     {
         wxPaintDC dc( this );
     void OnPaint(wxPaintEvent& WXUNUSED(event))
     {
         wxPaintDC dc( this );

-        dc.DrawBitmap( m_bitmap, 0, 0 );
+        //TRUE for masked images
+        dc.DrawBitmap( m_bitmap, 0, 0, TRUE );
+    }
+
+    void OnSave(wxCommandEvent& WXUNUSED(event))
+    {
+        wxImage image = m_bitmap.ConvertToImage();
+
+        int bppselection = wxGetSingleChoiceIndex("Set BMP BPP",
+                                                  "Set BMP BPP",
+                                                  nChoices,
+                                                  bppchoices,
+                                                  this);
+        if ( bppselection == -1 )
+        {
+            // cancelled
+            return;
+        }
+
+        image.SetOption(wxIMAGE_OPTION_BMP_FORMAT, bppvalues[bppselection]);
+
+        wxString deffilename = bppchoices[bppselection];
+        deffilename.Replace(wxT(" "), wxT("_"));
+        deffilename += wxT(".bmp");
+        wxString savefilename = wxFileSelector( wxT("Save Image"),
+                                                wxT(""),
+                                                deffilename,
+                                                (const wxChar *)NULL,
+                                            wxT("BMP files (*.bmp)|*.bmp|")
+                                            wxT("PNG files (*.png)|*.png|")
+                                            wxT("JPEG files (*.jpg)|*.jpg|")
+                                            wxT("GIF files (*.gif)|*.gif|")
+                                            wxT("TIFF files (*.tif)|*.tif|")
+                                            wxT("PCX files (*.pcx)|*.pcx|")
+                                            wxT("ICO files (*.ico)|*.ico|")
+                                            wxT("CUR files (*.cur)|*.cur"),
+                                                wxSAVE);
+
+        if ( savefilename.empty() )
+            return;
+
+        if ( image.GetOptionInt(wxIMAGE_OPTION_BMP_FORMAT) == wxBMP_8BPP_PALETTE )
+        {
+            unsigned char *cmap = new unsigned char [256];
+            for ( int i = 0; i < 256; i++ )
+                cmap[i] = i;
+            image.SetPalette(wxPalette(256, cmap, cmap, cmap));
+
+            delete cmap;
+        }
+
+        bool loaded;
+        wxString extension = savefilename.AfterLast('.').Lower();
+
+        if (extension == "cur")
+        {
+            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);
+        }
+        else 
+        {
+            // This one guesses image format from filename extension
+            // (it may fail if the extension is not recognized):
+            loaded = image.SaveFile(savefilename);
+        }
+        
+        if ( !loaded )
+            wxMessageBox("No handler for this file type.",
+                         "File was not saved",
+                         wxOK|wxCENTRE, this);

     }
 
 private:
     }
 
 private:


@@ -122,7 +231,8 @@ IMPLEMENT_APP(MyApp)
 IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow)
 
 BEGIN_EVENT_TABLE(MyImageFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow)
 
 BEGIN_EVENT_TABLE(MyImageFrame, wxFrame)

-    EVT_PAINT(MyImageFrame::OnPaint)
+  EVT_PAINT(MyImageFrame::OnPaint)
+  EVT_LEFT_DCLICK(MyImageFrame::OnSave)

 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)


@@ -144,6 +254,12 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     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;

+    my_horse_xpm = (wxBitmap*) NULL;
+    my_horse_ico32 = (wxBitmap*) NULL;
+    my_horse_ico16 = (wxBitmap*) NULL;
+    my_horse_ico = (wxBitmap*) NULL;
+    my_horse_cur = (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;


@@ -154,7 +270,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
     wxMemoryDC dc;
     dc.SelectObject( bitmap );
 
     wxMemoryDC dc;
     dc.SelectObject( bitmap );

-    dc.SetBrush( wxBrush( "orange", wxSOLID ) );
+    dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );

     dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 0, 0, 100, 100 );
     dc.SetBrush( *wxWHITE_BRUSH );
     dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 0, 0, 100, 100 );
     dc.SetBrush( *wxWHITE_BRUSH );


@@ -163,18 +279,18 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
     // try to find the directory with our images
     wxString dir;
 
     // try to find the directory with our images
     wxString dir;

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

         dir = "./";
         dir = "./";

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

         dir = "../";
     else
         dir = "../";
     else

-        wxLogWarning("Can't find image files in either '.' or '..'!");
+        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 ))
 
     wxImage image = bitmap.ConvertToImage();
 
 #if wxUSE_LIBPNG
     if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ))

-        wxLogError("Can't save file");
+        wxLogError(wxT("Can't save file"));

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


@@ -184,7 +300,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.png")) )
     image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.png")) )

-        wxLogError("Can't load PNG image");
+        wxLogError(wxT("Can't load PNG image"));

     else
         my_horse_png = new wxBitmap( image );
 #endif // wxUSE_LIBPNG
     else
         my_horse_png = new wxBitmap( image );
 #endif // wxUSE_LIBPNG


@@ -193,57 +309,65 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.jpg")) )
     image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.jpg")) )

-        wxLogError("Can't load JPG image");
+        wxLogError(wxT("Can't load JPG image"));

     else
     else

-        my_horse_jpeg = new wxBitmap( image.ConvertToBitmap() );
+        my_horse_jpeg = new wxBitmap( image );

 #endif // wxUSE_LIBJPEG
 
 #if wxUSE_GIF
     image.Destroy();
 
 #endif // wxUSE_LIBJPEG
 
 #if wxUSE_GIF
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.gif")) )
-        wxLogError("Can't load GIF image");
+    if ( !image.LoadFile( dir + wxString("horse.gif")))
+    //if ( !image.LoadFile( wxString("\\slidbar.gif"), wxBITMAP_TYPE_GIF, -2) )
+        wxLogError(wxT("Can't load GIF image"));

     else
     else

-        my_horse_gif = new wxBitmap( image.ConvertToBitmap() );
+        my_horse_gif = new wxBitmap( image );

 #endif
 
 #if wxUSE_PCX
     image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.pcx"), wxBITMAP_TYPE_PCX ) )
 #endif
 
 #if wxUSE_PCX
     image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.pcx"), wxBITMAP_TYPE_PCX ) )

-        wxLogError("Can't load PCX image");
+        wxLogError(wxT("Can't load PCX image"));

     else
     else

-        my_horse_pcx = new wxBitmap( image.ConvertToBitmap() );
+        my_horse_pcx = new wxBitmap( image );

 #endif
 
     image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) )
 #endif
 
     image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) )

-        wxLogError("Can't load BMP image");
+        wxLogError(wxT("Can't load BMP image"));

     else
     else

-        my_horse_bmp = new wxBitmap( image.ConvertToBitmap() );
+        my_horse_bmp = new wxBitmap( image );

 
 #if wxUSE_XPM
 
 #if wxUSE_XPM

+    image.Destroy();
+
+    if ( !image.LoadFile( dir + wxString("horse.xpm"), wxBITMAP_TYPE_XPM ) )
+        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 + wxString("test.xpm"), wxBITMAP_TYPE_XPM ))

-        wxLogError("Can't save file");
+        wxLogError(wxT("Can't save file"));

 #endif
 
 #if wxUSE_PNM
     image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) )
 #endif
 
 #if wxUSE_PNM
     image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) )

-        wxLogError("Can't load PNM image");
+        wxLogError(wxT("Can't load PNM image"));

     else
     else

-        my_horse_pnm = new wxBitmap( image.ConvertToBitmap() );
+        my_horse_pnm = new wxBitmap( image );

 #endif
 
 #if wxUSE_LIBTIFF
     image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.tif"), wxBITMAP_TYPE_TIF ) )
 #endif
 
 #if wxUSE_LIBTIFF
     image.Destroy();
 
     if ( !image.LoadFile( dir + wxString("horse.tif"), wxBITMAP_TYPE_TIF ) )

-        wxLogError("Can't load TIFF image");
+        wxLogError(wxT("Can't load TIFF image"));

     else
     else

-        my_horse_tiff = new wxBitmap( image.ConvertToBitmap() );
+        my_horse_tiff = new wxBitmap( image );

 #endif
 
     CreateAntiAliasedBitmap();
 #endif
 
     CreateAntiAliasedBitmap();


@@ -256,6 +380,42 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     if ( m_bmpSmileXpm.Ok() )
         m_bmpSmileXpm.SaveFile("saved.xpm", wxBITMAP_TYPE_XPM);
 #endif
     if ( m_bmpSmileXpm.Ok() )
         m_bmpSmileXpm.SaveFile("saved.xpm", wxBITMAP_TYPE_XPM);
 #endif

+
+#if wxUSE_ICO_CUR
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + wxString("horse.ico"), wxBITMAP_TYPE_ICO, 0 ) )
+        wxLogError(wxT("Can't load first ICO image"));
+    else
+        my_horse_ico32 = new wxBitmap( image );
+        
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + wxString("horse.ico"), wxBITMAP_TYPE_ICO, 1 ) )
+        wxLogError(wxT("Can't load second ICO image"));
+    else
+        my_horse_ico16 = new wxBitmap( image );
+
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + wxString("horse.ico") ) )
+        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 ) )
+        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) ;
+        }
+    
+#endif
+

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


@@ -267,6 +427,11 @@ MyCanvas::~MyCanvas()
     delete my_horse_bmp;
     delete my_horse_pcx;
     delete my_horse_tiff;
     delete my_horse_bmp;
     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_smile_xbm;
     delete my_square;
     delete my_anti;
     delete my_smile_xbm;
     delete my_square;
     delete my_anti;


@@ -281,7 +446,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 );
 
     dc.DrawText( "Drawn directly", 150, 10 );
     if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 );
 
     dc.DrawText( "Drawn directly", 150, 10 );

-    dc.SetBrush( wxBrush( "orange", wxSOLID ) );
+    dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );

     dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 150, 30, 100, 100 );
     dc.SetBrush( *wxWHITE_BRUSH );
     dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 150, 30, 100, 100 );
     dc.SetBrush( *wxWHITE_BRUSH );


@@ -324,26 +489,31 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     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 );
+    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_smile_xbm && my_smile_xbm->Ok())
     {

-        dc.DrawText( "XBM bitmap", 30, 1745 );
-        dc.DrawText( "(green on red)", 30, 1760 );
-        dc.SetTextForeground( "GREEN" );
-        dc.SetTextBackground( "RED" );
-        dc.DrawBitmap( *my_smile_xbm, 30, 1780 );
-
-        dc.SetTextForeground( "BLACK" );
-        dc.DrawText( "After wxImage conversion", 150, 1745 );
-        dc.DrawText( "(red on white)", 150, 1760 );
-        dc.SetTextForeground( "RED" );
+        dc.DrawText( "XBM bitmap", 30, 1975 );
+        dc.DrawText( "(green on red)", 30, 1990 );
+        dc.SetTextForeground( wxT("GREEN") );
+        dc.SetTextBackground( wxT("RED") );
+        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.SetTextForeground( wxT("RED") );

         wxImage i = my_smile_xbm->ConvertToImage();
         i.SetMaskColour( 255, 255, 255 );
         i.Replace( 0, 0, 0,
                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );
         wxImage i = my_smile_xbm->ConvertToImage();
         i.SetMaskColour( 255, 255, 255 );
         i.Replace( 0, 0, 0,
                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );

-        dc.DrawBitmap( i.ConvertToBitmap(), 150, 1780, TRUE );
-        dc.SetTextForeground( "BLACK" );
+        dc.DrawBitmap( wxBitmap(i), 150, 2010, TRUE );
+        dc.SetTextForeground( wxT("BLACK") );

     }
 
 
     }
 
 


@@ -363,37 +533,58 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     if (mono.Ok())
     {
 
     if (mono.Ok())
     {

-        dc.DrawText( "Mono bitmap", 30, 1865 );
-        dc.DrawText( "(red on green)", 30, 1880 );
-        dc.SetTextForeground( "RED" );
-        dc.SetTextBackground( "GREEN" );
-        dc.DrawBitmap( mono, 30, 1900 );
-
-        dc.SetTextForeground( "BLACK" );
-        dc.DrawText( "After wxImage conversion", 150, 1865 );
-        dc.DrawText( "(red on white)", 150, 1880 );
-        dc.SetTextForeground( "RED" );
+        dc.DrawText( "Mono bitmap", 30, 2095 );
+        dc.DrawText( "(red on green)", 30, 2110 );
+        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.SetTextForeground( wxT("RED") );

         wxImage i = mono.ConvertToImage();
         i.SetMaskColour( 255,255,255 );
         i.Replace( 0,0,0,
                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );
         wxImage i = mono.ConvertToImage();
         i.SetMaskColour( 255,255,255 );
         i.Replace( 0,0,0,
                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );

-        dc.DrawBitmap( i.ConvertToBitmap(), 150, 1900, TRUE );
-        dc.SetTextForeground( "BLACK" );
+        dc.DrawBitmap( wxBitmap(i), 150, 2130, TRUE );
+        dc.SetTextForeground( wxT("BLACK") );

     }
 
     }
 

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

     if ( m_bmpSmileXpm.Ok() )
     {
     if ( m_bmpSmileXpm.Ok() )
     {

-        dc.DrawBitmap(m_bmpSmileXpm, 30, 2020, TRUE);
+        dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, TRUE);

     }
 
     }
 

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

     if ( m_iconSmileXpm.Ok() )
     {
     if ( m_iconSmileXpm.Ok() )
     {

-        dc.DrawIcon(m_iconSmileXpm, 150, 2020);
+        dc.DrawIcon(m_iconSmileXpm, 150, 2250);

     }
     }

+
+    dc.DrawText( "ICO handler (1st image)", 30, 2290 );
+    if (my_horse_ico32 && my_horse_ico32->Ok())
+        dc.DrawBitmap( *my_horse_ico32, 30, 2330, TRUE );
+
+    dc.DrawText( "ICO handler (2nd image)", 230, 2290 );
+    if (my_horse_ico16 && my_horse_ico16->Ok())
+        dc.DrawBitmap( *my_horse_ico16, 230, 2330, TRUE );
+        
+    dc.DrawText( "ICO handler (best image)", 430, 2290 );
+    if (my_horse_ico && my_horse_ico->Ok())
+        dc.DrawBitmap( *my_horse_ico, 430, 2330, TRUE );
+
+    dc.DrawText( "CUR handler", 30, 2390 );
+    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);
+        }

 }
 
 void MyCanvas::CreateAntiAliasedBitmap()
 }
 
 void MyCanvas::CreateAntiAliasedBitmap()


@@ -407,7 +598,7 @@ void MyCanvas::CreateAntiAliasedBitmap()
   dc.Clear();
 
   dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) );
   dc.Clear();
 
   dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) );

-  dc.SetTextForeground( "RED" );
+  dc.SetTextForeground( wxT("RED") );

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


@@ -442,7 +633,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


@@ -481,8 +672,8 @@ MyFrame::MyFrame()
 
   m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
 
 
   m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
 

-  // 500 width * 2100 height
-  m_canvas->SetScrollbars( 10, 10, 50, 220 );
+  // 500 width * 2500 height
+  m_canvas->SetScrollbars( 10, 10, 50, 250 );

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


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

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

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


@@ -548,6 +739,11 @@ bool MyApp::OnInit()
   wxImage::AddHandler( new wxXPMHandler );
 #endif
 
   wxImage::AddHandler( new wxXPMHandler );
 #endif
 

+#if wxUSE_ICO_CUR
+  wxImage::AddHandler( new wxICOHandler );
+  wxImage::AddHandler( new wxCURHandler );
+#endif
+

   wxFrame *frame = new MyFrame();
   frame->Show( TRUE );
 
   wxFrame *frame = new MyFrame();
   frame->Show( TRUE );