Fixes to allow compilation with no wchar_t (djgpp probably has a real wchar_t

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 2e768ad4bae2703a5ee66711b8b82d075ae034aa..7bfe2db778bfb71e12cd5ee0f075341acd8aba2e 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -1,11 +1,13 @@
-/*
- * Program: image
- *
- * Author: Robert Roebling
- *
- * Copyright: (C) 1998, Robert Roebling
- *
- */
+///////////////////////////////////////////////////////////////////////////////
+// Name:        samples/image/image.cpp
+// Purpose:     sample showing operations with wxImage
+// Author:      Robert Roebling
+// Modified by:
+// Created:     1998
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998-2005 Robert Roebling
+// License:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////

 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"


@@ -20,13 +22,29 @@
 
 #include "wx/image.h"
 #include "wx/file.h"
 
 #include "wx/image.h"
 #include "wx/file.h"

+#include "wx/filename.h"

 #include "wx/mstream.h"
 #include "wx/wfstream.h"
 #include "wx/quantize.h"
 
 #include "wx/mstream.h"
 #include "wx/wfstream.h"
 #include "wx/quantize.h"
 

+#if wxUSE_CLIPBOARD
+    #include "wx/dataobj.h"
+    #include "wx/clipbrd.h"
+#endif // wxUSE_CLIPBOARD
+

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

+#if defined(__WXMSW__)
+    #ifdef wxHAVE_RAW_BITMAP
+    #include "wx/rawbmp.h"
+    #endif
+#endif
+
+#if defined(__WXMAC__) || defined(__WXGTK__)
+    #define wxHAVE_RAW_BITMAP
+    #include "wx/rawbmp.h"
+#endif

 
 // derived classes
 
 
 // derived classes
 


@@ -38,7 +56,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,15 +66,24 @@ 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_xpm;
     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_horse_ani;

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

+    int xH, yH ;
+    int m_ani_images ;
+

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


@@ -66,8 +93,10 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+

 // MyFrame
 
 // MyFrame
 

+

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


@@ -75,8 +104,16 @@ public:
 
     void OnAbout( wxCommandEvent &event );
     void OnNewFrame( wxCommandEvent &event );
 
     void OnAbout( wxCommandEvent &event );
     void OnNewFrame( wxCommandEvent &event );

+#ifdef wxHAVE_RAW_BITMAP
+    void OnTestRawBitmap( wxCommandEvent &event );
+#endif // wxHAVE_RAW_BITMAP

     void OnQuit( wxCommandEvent &event );
 
     void OnQuit( wxCommandEvent &event );
 

+#if wxUSE_CLIPBOARD
+    void OnCopy(wxCommandEvent& event);
+    void OnPaste(wxCommandEvent& event);
+#endif // wxUSE_CLIPBOARD
+

     MyCanvas         *m_canvas;
 
 private:
     MyCanvas         *m_canvas;
 
 private:


@@ -88,109 +125,222 @@ class MyImageFrame : public wxFrame
 {
 public:
     MyImageFrame(wxFrame *parent, const wxBitmap& bitmap)
 {
 public:
     MyImageFrame(wxFrame *parent, const wxBitmap& bitmap)

-        : wxFrame(parent, -1, _T("Double click to save"),
+        : wxFrame(parent, wxID_ANY, _T("Double click to save"),

                   wxDefaultPosition, wxDefaultSize,
                   wxDefaultPosition, wxDefaultSize,

-                  wxCAPTION | wxSYSTEM_MENU),
+                  wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX),

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

+    void OnEraseBackground(wxEraseEvent& WXUNUSED(event))
+    {
+        // do nothing here to be able to see how transparent images are shown
+    }
+

     void OnPaint(wxPaintEvent& WXUNUSED(event))
     {
         wxPaintDC dc( this );
     void OnPaint(wxPaintEvent& WXUNUSED(event))
     {
         wxPaintDC dc( this );

-        dc.DrawBitmap( m_bitmap, 0, 0 );
+        dc.DrawBitmap( m_bitmap, 0, 0, true /* use mask */ );

     }
 
     }
 

-    void OnSave(wxCommandEvent& WXUNUSED(event))
+    void OnSave(wxMouseEvent& WXUNUSED(event))

     {
     {

-        wxImage image(m_bitmap);
+        wxImage image = m_bitmap.ConvertToImage();
+
+        wxString savefilename = wxFileSelector( wxT("Save Image"),
+                                                wxT(""),
+                                                wxT(""),
+                                                (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,
+                                                this);
+
+        if ( savefilename.empty() )
+            return;
+
+        wxString extension;
+        wxFileName::SplitPath(savefilename, NULL, NULL, &extension);

 
 

-        static const wxString bppchoices[8] =
+        bool saved = false;
+        if ( extension == _T("bpp") )
+        {
+            static const int bppvalues[] =
+            {
+                wxBMP_1BPP,
+                wxBMP_1BPP_BW,
+                wxBMP_4BPP,
+                wxBMP_8BPP,
+                wxBMP_8BPP_GREY,
+                wxBMP_8BPP_RED,
+                wxBMP_8BPP_PALETTE,
+                wxBMP_24BPP
+            };
+
+            const wxString bppchoices[] =
+            {
+                _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")
+            };
+
+            int bppselection = wxGetSingleChoiceIndex(_T("Set BMP BPP"),
+                                                      _T("Image sample: save file"),
+                                                      WXSIZEOF(bppchoices),
+                                                      bppchoices,
+                                                      this);
+            if ( bppselection != -1 )
+            {
+                int format = bppvalues[bppselection];
+                image.SetOption(wxIMAGE_OPTION_BMP_FORMAT, format);
+
+                if ( format == wxBMP_8BPP_PALETTE )
+                {
+                    unsigned char *cmap = new unsigned char [256];
+                    for ( int i = 0; i < 256; i++ )
+                        cmap[i] = (unsigned char)i;
+                    image.SetPalette(wxPalette(256, cmap, cmap, cmap));
+
+                    delete cmap;
+                }
+            }
+        }
+        else if ( extension == _T("png") )

         {
         {

-            "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[WXSIZEOF(bppchoices)] =
+            static const int pngvalues[] =
+            {
+                wxPNG_TYPE_COLOUR,
+                wxPNG_TYPE_COLOUR,
+                wxPNG_TYPE_GREY,
+                wxPNG_TYPE_GREY,
+                wxPNG_TYPE_GREY_RED,
+                wxPNG_TYPE_GREY_RED,
+            };
+
+            const wxString pngchoices[] =
+            {
+                _T("Colour 8bpp"),
+                _T("Colour 16bpp"),
+                _T("Grey 8bpp"),
+                _T("Grey 16bpp"),
+                _T("Grey red 8bpp"),
+                _T("Grey red 16bpp"),
+            };
+
+            int sel = wxGetSingleChoiceIndex(_T("Set PNG format"),
+                                             _T("Image sample: save file"),
+                                             WXSIZEOF(pngchoices),
+                                             pngchoices,
+                                             this);
+            if ( sel != -1 )
+            {
+                image.SetOption(wxIMAGE_OPTION_PNG_FORMAT, pngvalues[sel]);
+                image.SetOption(wxIMAGE_OPTION_PNG_BITDEPTH, sel % 2 ? 16 : 8);
+            }
+        }
+        else if ( extension == _T("cur") )

         {
         {

-            wxBMP_1BPP,
-            wxBMP_1BPP_BW,
-            wxBMP_4BPP,
-            wxBMP_8BPP,
-            wxBMP_8BPP_GREY,
-            wxBMP_8BPP_RED,
-            wxBMP_8BPP_PALETTE,
-            wxBMP_24BPP
-        };
-
-        int bppselection = wxGetSingleChoiceIndex("Set BMP BPP",
-                                                  "Set BMP BPP",
-                                                  WXSIZEOF(bppchoices),
-                                                  bppchoices,
-                                                  this);
-        if ( bppselection == -1 )
+            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:
+            saved = image.SaveFile(savefilename, wxBITMAP_TYPE_CUR);
+        }
+
+        if ( !saved )

         {
         {

-            // cancelled
-            return;
+            // This one guesses image format from filename extension
+            // (it may fail if the extension is not recognized):
+            image.SaveFile(savefilename);

         }
         }

+    }

 
 

-        image.SetOption(wxBMP_FORMAT, bppvalues[bppselection]);
-
-        wxString deffilename = bppchoices[bppselection];
-        deffilename.Replace(" ", "_");
-        deffilename += ".bmp";
-        wxString savefilename = wxFileSelector( "Save Image",
-                                                "",
-                                                deffilename,
-                                                (const char *)NULL,
-                                                "BMP files (*.bmp)|*.bmp|"
-                                                "PNG files (*.png)|*.png|"
-                                                "JPEG files (*.jpg)|*.jpg|"
-                                                "GIF files (*.gif)|*.gif|"
-                                                "TIFF files (*.tif)|*.tif|"
-                                                "PCX files (*.pcx)|*.pcx",
-                                                wxSAVE);
+private:
+    wxBitmap m_bitmap;

 
 

-        if ( savefilename.empty() )
-            return;
+    DECLARE_EVENT_TABLE()
+};
+
+#ifdef wxHAVE_RAW_BITMAP
+
+#include "wx/rawbmp.h"
+
+class MyRawBitmapFrame : public wxFrame
+{
+public:
+    enum
+    {
+        BORDER = 15,
+        SIZE = 150,
+        REAL_SIZE = SIZE - 2*BORDER
+    };
+
+    MyRawBitmapFrame(wxFrame *parent)
+        : wxFrame(parent, wxID_ANY, _T("Raw bitmaps (how exciting)")),
+          m_bitmap(SIZE, SIZE, 32)
+    {
+        SetClientSize(SIZE, SIZE);
+
+        // another possibility: wxNativePixelData (don't forget to remove code
+        // setting alpha in the loop below then)
+        typedef wxAlphaPixelData Data;

 
 

-        if ( image.GetOptionInt(wxBMP_FORMAT) == wxBMP_8BPP_PALETTE )
+        Data data(m_bitmap, wxPoint(BORDER, BORDER), wxSize(REAL_SIZE, REAL_SIZE));
+        if ( !data )

         {
         {

-            unsigned char *cmap = new unsigned char [256];
-            for ( int i = 0; i < 256; i++ )
-                cmap[i] = i;
-            image.SetPalette(wxPalette(256, cmap, cmap, cmap));
+            wxLogError(_T("Failed to gain raw access to bitmap data"));
+            return;
+        }
+
+        data.UseAlpha();

 
 

-            delete cmap;
+        Data::Iterator p(data);
+
+        for ( int y = 0; y < REAL_SIZE; ++y )
+        {
+            Data::Iterator rowStart = p;
+
+            int r = y < REAL_SIZE/3 ? 255 : 0,
+                g = (REAL_SIZE/3 <= y) && (y < 2*(REAL_SIZE/3)) ? 255 : 0,
+                b = 2*(REAL_SIZE/3) <= y ? 255 : 0;
+
+            for ( int x = 0; x < REAL_SIZE; ++x )
+            {
+                // note that RGB must be premultiplied by alpha
+                unsigned a = (Data::Iterator::ChannelType)((x*255.)/REAL_SIZE);
+                p.Red() = r * a / 256;
+                p.Green() = g * a / 256;
+                p.Blue() = b * a / 256;
+                p.Alpha() = a;
+
+                ++p; // same as p.OffsetX(1)
+            }
+
+            p = rowStart;
+            p.OffsetY(data, 1);

         }
         }

+    }

 
 

-        bool saved = FALSE;
-
-        wxString extension = savefilename.AfterLast('.').Lower();
-
-        if (extension == "bmp")
-            saved=image.SaveFile(savefilename, wxBITMAP_TYPE_BMP);
-        else if (extension == "png")
-            saved=image.SaveFile(savefilename, wxBITMAP_TYPE_PNG);
-        else if (extension == "pcx")
-            saved=image.SaveFile(savefilename, wxBITMAP_TYPE_PCX);
-        else if ((extension == "tif") || (extension == "tiff"))
-            saved=image.SaveFile(savefilename, wxBITMAP_TYPE_TIF);
-        else if (extension == "jpg")
-            saved=image.SaveFile(savefilename, wxBITMAP_TYPE_JPEG);
-        else if (extension == "pnm")
-            saved=image.SaveFile(savefilename, wxBITMAP_TYPE_PNM);
-        else
-            wxMessageBox("Unknown file type, see options in file selector.",
-                         "Unknown file type",
-                         wxOK|wxCENTRE, this);
+    void OnPaint(wxPaintEvent& WXUNUSED(event))
+    {
+        wxPaintDC dc( this );
+        dc.DrawText(_T("This is alpha and raw bitmap test"), 0, BORDER);
+        dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE/2 - BORDER);
+        dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE - 2*BORDER);
+        dc.DrawBitmap( m_bitmap, 0, 0, true /* use mask */ );

     }
 
 private:
     }
 
 private:


@@ -199,6 +349,8 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+#endif // wxHAVE_RAW_BITMAP
+

 // MyApp
 
 class MyApp: public wxApp
 // MyApp
 
 class MyApp: public wxApp


@@ -216,10 +368,19 @@ 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_LEFT_DCLICK(MyImageFrame::OnSave)
+    EVT_ERASE_BACKGROUND(MyImageFrame::OnEraseBackground)
+    EVT_PAINT(MyImageFrame::OnPaint)
+    EVT_LEFT_DCLICK(MyImageFrame::OnSave)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

+#ifdef wxHAVE_RAW_BITMAP
+
+BEGIN_EVENT_TABLE(MyRawBitmapFrame, wxFrame)
+    EVT_PAINT(MyRawBitmapFrame::OnPaint)
+END_EVENT_TABLE()
+
+#endif // wxHAVE_RAW_BITMAP
+

 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
   EVT_PAINT(MyCanvas::OnPaint)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
   EVT_PAINT(MyCanvas::OnPaint)
 END_EVENT_TABLE()


@@ -227,30 +388,37 @@ END_EVENT_TABLE()
 MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
                     const wxPoint &pos, const wxSize &size )
         : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
 MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
                     const wxPoint &pos, const wxSize &size )
         : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )

-#if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW

           , m_bmpSmileXpm((const char **) smile_xpm)
           , m_iconSmileXpm((const char **) smile_xpm)
           , m_bmpSmileXpm((const char **) smile_xpm)
           , m_iconSmileXpm((const char **) smile_xpm)

-#endif

 {
     my_horse_png = (wxBitmap*) NULL;
     my_horse_jpeg = (wxBitmap*) NULL;
     my_horse_gif = (wxBitmap*) NULL;
     my_horse_bmp = (wxBitmap*) NULL;
 {
     my_horse_png = (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_xpm = (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_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 );
 
     wxMemoryDC dc;
     dc.SelectObject( bitmap );
     SetBackgroundColour(* wxWHITE);
 
     wxBitmap bitmap( 100, 100 );
 
     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 );


@@ -259,28 +427,28 @@ 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") )
-        dir = "./";
-    else if ( wxFile::Exists("../horse.png") )
-        dir = "../";
+    if ( wxFile::Exists(wxT("./horse.png")) )
+        dir = wxT("./");
+    else if ( wxFile::Exists(wxT("../horse.png")) )
+        dir = wxT("../");

     else
     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
 
     wxImage image = bitmap.ConvertToImage();
 
 #if wxUSE_LIBPNG

-    if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ))
-        wxLogError("Can't save file");
+    if ( !image.SaveFile( dir + _T("test.png"), wxBITMAP_TYPE_PNG ))
+        wxLogError(wxT("Can't save file"));

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

-    image.LoadFile( dir + wxString("test.png") );
-    my_square = new wxBitmap( image );
+    if ( image.LoadFile( dir + _T("test.png") ) )
+        my_square = new wxBitmap( image );

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

-    if ( !image.LoadFile( dir + wxString("horse.png")) )
-        wxLogError("Can't load PNG image");
+    if ( !image.LoadFile( dir + _T("horse.png")) )
+        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


@@ -288,8 +456,8 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 #if wxUSE_LIBJPEG
     image.Destroy();
 
 #if wxUSE_LIBJPEG
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.jpg")) )
-        wxLogError("Can't load JPG image");
+    if ( !image.LoadFile( dir + _T("horse.jpg")) )
+        wxLogError(wxT("Can't load JPG image"));

     else
         my_horse_jpeg = new wxBitmap( image );
 #endif // wxUSE_LIBJPEG
     else
         my_horse_jpeg = new wxBitmap( image );
 #endif // wxUSE_LIBJPEG


@@ -297,8 +465,8 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 #if wxUSE_GIF
     image.Destroy();
 
 #if wxUSE_GIF
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.gif")) )
-        wxLogError("Can't load GIF image");
+    if ( !image.LoadFile( dir + _T("horse.gif" )) )
+        wxLogError(wxT("Can't load GIF image"));

     else
         my_horse_gif = new wxBitmap( image );
 #endif
     else
         my_horse_gif = new wxBitmap( image );
 #endif


@@ -306,36 +474,36 @@ 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 ) )
-        wxLogError("Can't load PCX image");
+    if ( !image.LoadFile( dir + _T("horse.pcx"), wxBITMAP_TYPE_PCX ) )
+        wxLogError(wxT("Can't load PCX image"));

     else
         my_horse_pcx = new wxBitmap( image );
 #endif
 
     image.Destroy();
 
     else
         my_horse_pcx = new wxBitmap( image );
 #endif
 
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) )
-        wxLogError("Can't load BMP image");
+    if ( !image.LoadFile( dir + _T("horse.bmp"), wxBITMAP_TYPE_BMP ) )
+        wxLogError(wxT("Can't load BMP image"));

     else
         my_horse_bmp = new wxBitmap( image );
 
 #if wxUSE_XPM
     image.Destroy();
 
     else
         my_horse_bmp = new wxBitmap( image );
 
 #if wxUSE_XPM
     image.Destroy();
 

-    if ( !image.LoadFile( dir + wxString("horse.xpm"), wxBITMAP_TYPE_XPM ) )
-        wxLogError("Can't load XPM image");
+    if ( !image.LoadFile( dir + _T("horse.xpm"), wxBITMAP_TYPE_XPM ) )
+        wxLogError(wxT("Can't load XPM image"));

     else
         my_horse_xpm = new wxBitmap( image );
 
     else
         my_horse_xpm = new wxBitmap( image );
 

-    if ( !image.SaveFile( dir + wxString("test.xpm"), wxBITMAP_TYPE_XPM ))
-        wxLogError("Can't save file");
+    if ( !image.SaveFile( dir + _T("test.xpm"), wxBITMAP_TYPE_XPM ))
+        wxLogError(wxT("Can't save file"));

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

-    if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) )
-        wxLogError("Can't load PNM image");
+    if ( !image.LoadFile( dir + _T("horse.pnm"), wxBITMAP_TYPE_PNM ) )
+        wxLogError(wxT("Can't load PNM image"));

     else
         my_horse_pnm = new wxBitmap( image );
 #endif
     else
         my_horse_pnm = new wxBitmap( image );
 #endif


@@ -343,8 +511,8 @@ 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 ) )
-        wxLogError("Can't load TIFF image");
+    if ( !image.LoadFile( dir + _T("horse.tif"), wxBITMAP_TYPE_TIF ) )
+        wxLogError(wxT("Can't load TIFF image"));

     else
         my_horse_tiff = new wxBitmap( image );
 #endif
     else
         my_horse_tiff = new wxBitmap( image );
 #endif


@@ -354,11 +522,85 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     my_smile_xbm = new wxBitmap( (const char*)smile_bits, smile_width,
                                  smile_height, 1 );
 
     my_smile_xbm = new wxBitmap( (const char*)smile_bits, smile_width,
                                  smile_height, 1 );
 

-#if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW

     // demonstrates XPM automatically using the mask when saving
     if ( m_bmpSmileXpm.Ok() )
     // demonstrates XPM automatically using the mask when saving
     if ( m_bmpSmileXpm.Ok() )

-        m_bmpSmileXpm.SaveFile("saved.xpm", wxBITMAP_TYPE_XPM);
-#endif
+        m_bmpSmileXpm.SaveFile(_T("saved.xpm"), wxBITMAP_TYPE_XPM);
+
+#if wxUSE_ICO_CUR
+    image.Destroy();
+
+    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 );
+
+    image.Destroy();
+
+    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();
+
+    if ( !image.LoadFile( dir + _T("horse.ico") ) )
+        wxLogError(wxT("Can't load best ICO image"));
+    else
+        my_horse_ico = new wxBitmap( image );
+
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + _T("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) ;
+    }
+
+    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 // wxUSE_ICO_CUR
+
+    image.Destroy();
+
+    // test image loading from stream
+    wxFile file(dir + _T("horse.bmp"));
+    if ( file.IsOpened() )
+    {
+        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, dataSize);
+            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()


@@ -368,9 +610,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_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;


@@ -381,11 +629,11 @@ 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.SetBrush( wxBrush( "orange", wxSOLID ) );
+    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( *wxWHITE_BRUSH );
     dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 150, 30, 100, 100 );
     dc.SetBrush( *wxWHITE_BRUSH );


@@ -394,64 +642,69 @@ 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_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, 1975 );
-        dc.DrawText( "(green on red)", 30, 1990 );
-        dc.SetTextForeground( "GREEN" );
-        dc.SetTextBackground( "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.DrawBitmap( *my_smile_xbm, 30, 2010 );
 

-        dc.SetTextForeground( "BLACK" );
-        dc.DrawText( "After wxImage conversion", 150, 1975 );
-        dc.DrawText( "(red on white)", 150, 1990 );
-        dc.SetTextForeground( "RED" );
+        dc.SetTextForeground( wxT("BLACK") );
+        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 );
         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, 2010, TRUE );
-        dc.SetTextForeground( "BLACK" );
+        dc.DrawBitmap( wxBitmap(i), 150, 2010, true );
+        dc.SetTextForeground( wxT("BLACK") );

     }
 
 
     }
 
 


@@ -462,7 +715,10 @@ 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 );
+#ifndef __WXGTK20__
+    // I cannot convince GTK2 to draw into mono bitmaps
+    memdc.DrawText( _T("Hi!"), 5, 5 );
+#endif

     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 );


@@ -471,37 +727,92 @@ 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.SetTextForeground( "RED" );
-        dc.SetTextBackground( "GREEN" );
+        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.DrawBitmap( mono, 30, 2130 );
 

-        dc.SetTextForeground( "BLACK" );
-        dc.DrawText( "After wxImage conversion", 150, 2095 );
-        dc.DrawText( "(red on white)", 150, 2110 );
-        dc.SetTextForeground( "RED" );
+        dc.SetTextForeground( wxT("BLACK") );
+        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 );
         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, 2130, TRUE );
-        dc.SetTextForeground( "BLACK" );
+        dc.DrawBitmap( wxBitmap(i), 150, 2130, true );
+        dc.SetTextForeground( wxT("BLACK") );

     }
 
     }
 

-    dc.DrawText("XPM bitmap", 30, 2230);
+    // For testing transparency
+    dc.SetBrush( *wxRED_BRUSH );
+    dc.DrawRectangle( 20, 2220, 560, 68 );
+
+    dc.DrawText(_T("XPM bitmap"), 30, 2230 );

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

+        dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, true);
+
+    dc.DrawText(_T("XPM icon"), 110, 2230 );
+    if ( m_iconSmileXpm.Ok() )
+        dc.DrawIcon(m_iconSmileXpm, 110, 2250);
+
+    // testing icon -> bitmap conversion
+    wxBitmap to_blit( m_iconSmileXpm );
+    if (to_blit.Ok())

     {
     {

-        dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, TRUE);
+        dc.DrawText( _T("SubBitmap"), 170, 2230 );
+        wxBitmap sub = to_blit.GetSubBitmap( wxRect(0,0,15,15) );
+        if (sub.Ok())
+            dc.DrawBitmap( sub, 170, 2250, true );
+
+        dc.DrawText( _T("Enlarged"), 250, 2230 );
+        dc.SetUserScale( 1.5, 1.5 );
+        dc.DrawBitmap( to_blit, (int)(250/1.5), (int)(2250/1.5), true );
+        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 );
+        dc.Blit( 400, 2250, to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, true );
+        dc.SetUserScale( 1.5, 1.5 );
+        dc.Blit( (int)(450/1.5), (int)(2250/1.5), to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, true );
+        dc.SetUserScale( 2, 2 );
+        dc.Blit( (int)(500/2), (int)(2250/2), to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, true );
+        dc.SetUserScale( 1.0, 1.0 );

     }
 
     }
 

-    dc.DrawText("XPM icon", 150, 2230);
-    if ( m_iconSmileXpm.Ok() )
+    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 );
+
+    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 );
+
+    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 );
+
+    dc.DrawText( _T("CUR handler"), 30, 2390 );
+    if (my_horse_cur && my_horse_cur->Ok())

     {
     {

-        dc.DrawIcon(m_iconSmileXpm, 150, 2250);
+        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 );
+        }

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


@@ -515,9 +826,9 @@ 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.DrawText( "This is anti-aliased Text.", 20, 20 );
-  dc.DrawText( "And a Rectangle.", 20, 60 );
+  dc.SetTextForeground( wxT("RED") );
+  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 );


@@ -548,16 +859,20 @@ void MyCanvas::CreateAntiAliasedBitmap()
                   original.GetBlue( x*2, y*2+1 ) +
                   original.GetBlue( x*2+1, y*2+1 );
        blue = blue/4;
                   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.ConvertToBitmap() );
+  my_anti = new wxBitmap(anti);

 }
 
 // MyFrame
 
 }
 
 // MyFrame
 

-const int ID_QUIT  = 108;
-const int ID_ABOUT = 109;
-const int ID_NEW = 110;
+enum
+{
+    ID_QUIT  = 108,
+    ID_ABOUT,
+    ID_NEW,
+    ID_SHOWRAW
+};

 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
 
 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
 


@@ -565,44 +880,65 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame)
   EVT_MENU    (ID_ABOUT, MyFrame::OnAbout)
   EVT_MENU    (ID_QUIT,  MyFrame::OnQuit)
   EVT_MENU    (ID_NEW,  MyFrame::OnNewFrame)
   EVT_MENU    (ID_ABOUT, MyFrame::OnAbout)
   EVT_MENU    (ID_QUIT,  MyFrame::OnQuit)
   EVT_MENU    (ID_NEW,  MyFrame::OnNewFrame)

+#ifdef wxHAVE_RAW_BITMAP
+  EVT_MENU    (ID_SHOWRAW,  MyFrame::OnTestRawBitmap)
+#endif
+
+#if wxUSE_CLIPBOARD
+    EVT_MENU(wxID_COPY, MyFrame::OnCopy)
+    EVT_MENU(wxID_PASTE, MyFrame::OnPaste)
+#endif // wxUSE_CLIPBOARD

 END_EVENT_TABLE()
 
 MyFrame::MyFrame()
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()

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

                   wxPoint(20,20), wxSize(470,360) )
 {
                   wxPoint(20,20), wxSize(470,360) )
 {

-  wxMenu *file_menu = new wxMenu();
-  file_menu->Append( ID_NEW, "&Show image...");
-  file_menu->AppendSeparator();
-  file_menu->Append( ID_ABOUT, "&About...");
-  file_menu->AppendSeparator();
-  file_menu->Append( ID_QUIT, "E&xit");
-

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

-  menu_bar->Append(file_menu, "&File");
+
+  wxMenu *menuImage = new wxMenu;
+  menuImage->Append( ID_NEW, _T("&Show any image...\tCtrl-O"));
+
+#ifdef wxHAVE_RAW_BITMAP
+  menuImage->Append( ID_SHOWRAW, _T("Test &raw bitmap...\tCtrl-R"));
+#endif
+  menuImage->AppendSeparator();
+  menuImage->Append( ID_ABOUT, _T("&About..."));
+  menuImage->AppendSeparator();
+  menuImage->Append( ID_QUIT, _T("E&xit\tCtrl-Q"));
+  menu_bar->Append(menuImage, _T("&Image"));
+
+#if wxUSE_CLIPBOARD
+  wxMenu *menuClipboard = new wxMenu;
+  menuClipboard->Append(wxID_COPY, _T("&Copy test image\tCtrl-C"));
+  menuClipboard->Append(wxID_PASTE, _T("&Paste image\tCtrl-V"));
+  menu_bar->Append(menuClipboard, _T("&Clipboard"));
+#endif // wxUSE_CLIPBOARD

 
   SetMenuBar( menu_bar );
 
 
   SetMenuBar( menu_bar );
 

+#if wxUSE_STATUSBAR

   CreateStatusBar(2);
   int widths[] = { -1, 100 };
   SetStatusWidths( 2, widths );
   CreateStatusBar(2);
   int widths[] = { -1, 100 };
   SetStatusWidths( 2, widths );

+#endif // wxUSE_STATUSBAR

 
 

-  m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
+  m_canvas = new MyCanvas( this, wxID_ANY, 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) )
 {

-  Close( TRUE );
+  Close( true );

 }
 
 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) )


@@ -619,9 +955,53 @@ void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
         return;
     }
 
         return;
     }
 

-    (new MyImageFrame(this, image.ConvertToBitmap()))->Show();
+    (new MyImageFrame(this, wxBitmap(image)))->Show();
+}
+
+#ifdef wxHAVE_RAW_BITMAP
+
+void MyFrame::OnTestRawBitmap( wxCommandEvent &WXUNUSED(event) )
+{
+    (new MyRawBitmapFrame(this))->Show();
+}
+
+#endif // wxHAVE_RAW_BITMAP
+
+#if wxUSE_CLIPBOARD
+
+void MyFrame::OnCopy(wxCommandEvent& WXUNUSED(event))
+{
+    wxBitmapDataObject *dobjBmp = new wxBitmapDataObject;
+    dobjBmp->SetBitmap(*m_canvas->my_horse_png);
+
+    wxTheClipboard->Open();
+
+    if ( !wxTheClipboard->SetData(dobjBmp) )
+    {
+        wxLogError(_T("Failed to copy bitmap to clipboard"));
+    }
+
+    wxTheClipboard->Close();

 }
 
 }
 

+void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
+{
+    wxBitmapDataObject dobjBmp;
+
+    wxTheClipboard->Open();
+    if ( !wxTheClipboard->GetData(dobjBmp) )
+    {
+        wxLogMessage(_T("No bitmap data in the clipboard"));
+    }
+    else
+    {
+        (new MyImageFrame(this, dobjBmp.GetBitmap()))->Show();
+    }
+    wxTheClipboard->Close();
+}
+
+#endif // wxUSE_CLIPBOARD
+

 //-----------------------------------------------------------------------------
 // MyApp
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // MyApp
 //-----------------------------------------------------------------------------


@@ -656,9 +1036,15 @@ 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 );
+  wxImage::AddHandler( new wxANIHandler );
+#endif
+

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

-  frame->Show( TRUE );
+  frame->Show( true );

 
 

-  return TRUE;
+  return true;

 }
 
 }