reSWIGged

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 3dfe14841fc63eaabe314f07cf488da05b5ec8d5..e52c7e6c08790c3ef9cf33c6f9bd147274a223b8 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"


@@ -15,11 +17,12 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
+    #include "wx/wx.h"

 #endif
 
 #include "wx/image.h"
 #include "wx/file.h"
 #endif
 
 #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"


@@ -30,13 +33,17 @@
 #endif // wxUSE_CLIPBOARD
 
 #include "smile.xbm"
 #endif // wxUSE_CLIPBOARD
 
 #include "smile.xbm"

+#include "smile.xpm"

 
 

-#if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
-    #include "smile.xpm"
+#if defined(__WXMSW__)
+    #ifdef wxHAVE_RAW_BITMAP
+    #include "wx/rawbmp.h"
+    #endif

 #endif
 
 #endif
 

-#if defined(__WXMSW__)
+#if defined(__WXMAC__) || defined(__WXGTK__)

     #define wxHAVE_RAW_BITMAP
     #define wxHAVE_RAW_BITMAP

+    #include "wx/rawbmp.h"

 #endif
 
 // derived classes
 #endif
 
 // derived classes


@@ -49,69 +56,54 @@ class MyApp;
 class MyCanvas: public wxScrolledWindow
 {
 public:
 class MyCanvas: public wxScrolledWindow
 {
 public:

-    MyCanvas() {}

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

-    wxBitmap  *my_horse_png;
-    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_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_horse_png;
+    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_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_horse_asciigrey_pnm;
+    wxBitmap  my_horse_rawgrey_pnm;
+
+    wxBitmap  colorized_horse_jpeg;
+    wxBitmap  my_cmyk_jpeg;
+
+    wxBitmap my_toucan;
+    wxBitmap my_toucan_flipped_horiz;
+    wxBitmap my_toucan_flipped_vert;
+    wxBitmap my_toucan_flipped_both;
+    wxBitmap my_toucan_grey;
+    wxBitmap my_toucan_head;

 
     int xH, yH ;
 
     int xH, yH ;

-    int m_ani_images ;
+    int m_ani_images;
+    wxBitmap *my_horse_ani;

 
 

-protected:
+private:

     wxBitmap m_bmpSmileXpm;
     wxIcon   m_iconSmileXpm;
 
     wxBitmap m_bmpSmileXpm;
     wxIcon   m_iconSmileXpm;
 

-private:
-    DECLARE_DYNAMIC_CLASS(MyCanvas)

     DECLARE_EVENT_TABLE()
 };
 
 
     DECLARE_EVENT_TABLE()
 };
 
 

-const int nChoices = 8 ;
-static const wxString bppchoices[nChoices] =
-{
-    _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] =
-{
-    wxBMP_1BPP,
-    wxBMP_1BPP_BW,
-    wxBMP_4BPP,
-    wxBMP_8BPP,
-    wxBMP_8BPP_GREY,
-    wxBMP_8BPP_RED,
-    wxBMP_8BPP_PALETTE,
-    wxBMP_24BPP
-};
-

 // MyFrame
 
 
 // MyFrame
 
 


@@ -127,7 +119,7 @@ public:
 #endif // wxHAVE_RAW_BITMAP
     void OnQuit( wxCommandEvent &event );
 
 #endif // wxHAVE_RAW_BITMAP
     void OnQuit( wxCommandEvent &event );
 

-#if wxUSE_CLIPBOARD && !defined(__WXMOTIF_)
+#if wxUSE_CLIPBOARD

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


@@ -143,7 +135,7 @@ 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,
                   wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX),
                   m_bitmap(bitmap)
                   wxDefaultPosition, wxDefaultSize,
                   wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX),
                   m_bitmap(bitmap)


@@ -159,79 +151,133 @@ public:
     void OnPaint(wxPaintEvent& WXUNUSED(event))
     {
         wxPaintDC dc( this );
     void OnPaint(wxPaintEvent& WXUNUSED(event))
     {
         wxPaintDC dc( this );

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

     }
 
     void OnSave(wxMouseEvent& WXUNUSED(event))
     {
     }
 
     void OnSave(wxMouseEvent& WXUNUSED(event))
     {

+#if wxUSE_FILEDLG

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

-        int bppselection = wxGetSingleChoiceIndex(_T("Set BMP BPP"),
-                                                  _T("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"),
         wxString savefilename = wxFileSelector( wxT("Save Image"),

-                                                wxT(""),
-                                                deffilename,
+                                                wxEmptyString,
+                                                wxEmptyString,

                                                 (const wxChar *)NULL,
                                                 (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);
+                                                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"),
+                                                wxFD_SAVE,
+                                                this);

 
         if ( savefilename.empty() )
             return;
 
 
         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));
+        wxString extension;
+        wxFileName::SplitPath(savefilename, NULL, NULL, &extension);

 
 

-            delete cmap;
+        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;
+                }
+            }

         }
         }

-
-        bool loaded;
-        wxString extension = savefilename.AfterLast('.').Lower();
-
-        if (extension == _T("cur"))
+        else if ( extension == _T("png") )
+        {
+            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") )

         {
             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:
         {
             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);
+            saved = image.SaveFile(savefilename, wxBITMAP_TYPE_CUR);

         }
         }

-        else
+
+        if ( !saved )

         {
             // This one guesses image format from filename extension
             // (it may fail if the extension is not recognized):
         {
             // This one guesses image format from filename extension
             // (it may fail if the extension is not recognized):

-            loaded = image.SaveFile(savefilename);
+            image.SaveFile(savefilename);

         }
         }

-
-        if ( !loaded )
-            wxMessageBox(_T("No handler for this file type."),
-                         _T("File was not saved"),
-                         wxOK|wxCENTRE, this);
+#endif // wxUSE_FILEDLG

     }
 
 private:
     }
 
 private:


@@ -255,25 +301,54 @@ public:
     };
 
     MyRawBitmapFrame(wxFrame *parent)
     };
 
     MyRawBitmapFrame(wxFrame *parent)

-        : wxFrame(parent, -1, _T("Raw bitmaps (how exciting)")),
+        : wxFrame(parent, wxID_ANY, _T("Raw bitmaps (how exciting)")),

           m_bitmap(SIZE, SIZE, 32)
     {
         SetClientSize(SIZE, SIZE);
 
           m_bitmap(SIZE, SIZE, 32)
     {
         SetClientSize(SIZE, SIZE);
 

-        wxRawBitmapData data(m_bitmap);
+        // another possibility: wxNativePixelData (don't forget to remove code
+        // setting alpha in the loop below then)
+        typedef wxAlphaPixelData Data;
+        // typedef wxNativePixelData Data;
+
+        // First, clear the whole bitmap by making it alpha
+        {
+            Data data( m_bitmap, wxPoint(0,0), wxSize(SIZE, SIZE) );
+            if ( !data )
+            {
+                wxLogError(_T("Failed to gain raw access to bitmap data"));
+                return;
+            }
+            data.UseAlpha();
+            Data::Iterator p(data);
+            for ( int y = 0; y < SIZE; ++y )
+            {
+                Data::Iterator rowStart = p;
+                for ( int x = 0; x < SIZE; ++x )
+                {
+                    p.Alpha() = 0;
+                    ++p; // same as p.OffsetX(1)
+                }
+                p = rowStart;
+                p.OffsetY(data, 1);
+            }
+        }
+
+        // Then, draw colourful alpha-blended stripes
+        Data data(m_bitmap, wxPoint(BORDER, BORDER) , wxSize(REAL_SIZE, REAL_SIZE));

         if ( !data )
         {
             wxLogError(_T("Failed to gain raw access to bitmap data"));
             return;
         }
 
         if ( !data )
         {
             wxLogError(_T("Failed to gain raw access to bitmap data"));
             return;
         }
 

-        wxRawBitmapIterator p(data);
+        data.UseAlpha();

 
 

-        p.Offset(BORDER, BORDER);
+        Data::Iterator p(data);

 
         for ( int y = 0; y < REAL_SIZE; ++y )
         {
 
         for ( int y = 0; y < REAL_SIZE; ++y )
         {

-            wxRawBitmapIterator rowStart = p;
+            Data::Iterator rowStart = p;

 
             int r = y < REAL_SIZE/3 ? 255 : 0,
                 g = (REAL_SIZE/3 <= y) && (y < 2*(REAL_SIZE/3)) ? 255 : 0,
 
             int r = y < REAL_SIZE/3 ? 255 : 0,
                 g = (REAL_SIZE/3 <= y) && (y < 2*(REAL_SIZE/3)) ? 255 : 0,


@@ -281,16 +356,18 @@ public:
 
             for ( int x = 0; x < REAL_SIZE; ++x )
             {
 
             for ( int x = 0; x < REAL_SIZE; ++x )
             {

-                p.Red() = r;
-                p.Green() = g;
-                p.Blue() = b;
-                p.Alpha() = 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; // same as p.OffsetX(1)
             }
 
             p = rowStart;

-            p.OffsetY(1);
+            p.OffsetY(data, 1);

         }
     }
 
         }
     }
 


@@ -300,7 +377,7 @@ public:
         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.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 */ );
+        dc.DrawBitmap( m_bitmap, 0, 0, true /* use mask */ );

     }
 
 private:
     }
 
 private:


@@ -325,8 +402,6 @@ IMPLEMENT_APP(MyApp)
 
 // MyCanvas
 
 
 // MyCanvas
 

-IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow)
-

 BEGIN_EVENT_TABLE(MyImageFrame, wxFrame)
     EVT_ERASE_BACKGROUND(MyImageFrame::OnEraseBackground)
     EVT_PAINT(MyImageFrame::OnPaint)
 BEGIN_EVENT_TABLE(MyImageFrame, wxFrame)
     EVT_ERASE_BACKGROUND(MyImageFrame::OnEraseBackground)
     EVT_PAINT(MyImageFrame::OnPaint)


@@ -348,30 +423,10 @@ 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_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_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_horse_ani = NULL;

     m_ani_images = 0 ;
 
     SetBackgroundColour(* wxWHITE);
     m_ani_images = 0 ;
 
     SetBackgroundColour(* wxWHITE);


@@ -404,15 +459,27 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
     image.Destroy();
 
 
     image.Destroy();
 

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

 
     image.Destroy();
 
     if ( !image.LoadFile( dir + _T("horse.png")) )
         wxLogError(wxT("Can't load PNG image"));
     else
 
     image.Destroy();
 
     if ( !image.LoadFile( dir + _T("horse.png")) )
         wxLogError(wxT("Can't load PNG image"));
     else

-        my_horse_png = new wxBitmap( image );
+        my_horse_png = wxBitmap( image );
+
+    if ( !image.LoadFile( dir + _T("toucan.png")) )
+        wxLogError(wxT("Can't load PNG image"));
+    else
+        my_toucan = wxBitmap(image);
+
+    my_toucan_flipped_horiz = wxBitmap(image.Mirror(true));
+    my_toucan_flipped_vert = wxBitmap(image.Mirror(false));
+    my_toucan_flipped_both = wxBitmap(image.Mirror(true).Mirror(false));
+    my_toucan_grey = wxBitmap(image.ConvertToGreyscale());
+    my_toucan_head = wxBitmap(image.GetSubImage(wxRect(40, 7, 80, 60)));
+

 #endif // wxUSE_LIBPNG
 
 #if wxUSE_LIBJPEG
 #endif // wxUSE_LIBPNG
 
 #if wxUSE_LIBJPEG


@@ -421,7 +488,20 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     if ( !image.LoadFile( dir + _T("horse.jpg")) )
         wxLogError(wxT("Can't load JPG image"));
     else
     if ( !image.LoadFile( dir + _T("horse.jpg")) )
         wxLogError(wxT("Can't load JPG image"));
     else

-        my_horse_jpeg = new wxBitmap( image );
+    {
+        my_horse_jpeg = wxBitmap( image );
+
+        // Colorize by rotating green hue to red
+        wxImage::HSVValue greenHSV = wxImage::RGBtoHSV(wxImage::RGBValue(0, 255, 0));
+        wxImage::HSVValue redHSV = wxImage::RGBtoHSV(wxImage::RGBValue(255, 0, 0));
+        image.RotateHue(redHSV.hue - greenHSV.hue);
+        colorized_horse_jpeg = wxBitmap( image );
+    }
+
+    if ( !image.LoadFile( dir + _T("cmyk.jpg")) )
+        wxLogError(_T("Can't load CMYK JPG image"));
+    else
+        my_cmyk_jpeg = wxBitmap(image);

 #endif // wxUSE_LIBJPEG
 
 #if wxUSE_GIF
 #endif // wxUSE_LIBJPEG
 
 #if wxUSE_GIF


@@ -430,7 +510,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     if ( !image.LoadFile( dir + _T("horse.gif" )) )
         wxLogError(wxT("Can't load GIF image"));
     else
     if ( !image.LoadFile( dir + _T("horse.gif" )) )
         wxLogError(wxT("Can't load GIF image"));
     else

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

 #endif
 
 #if wxUSE_PCX
 #endif
 
 #if wxUSE_PCX


@@ -439,7 +519,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     if ( !image.LoadFile( dir + _T("horse.pcx"), wxBITMAP_TYPE_PCX ) )
         wxLogError(wxT("Can't load PCX image"));
     else
     if ( !image.LoadFile( dir + _T("horse.pcx"), wxBITMAP_TYPE_PCX ) )
         wxLogError(wxT("Can't load PCX image"));
     else

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

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


@@ -447,7 +527,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     if ( !image.LoadFile( dir + _T("horse.bmp"), wxBITMAP_TYPE_BMP ) )
         wxLogError(wxT("Can't load BMP image"));
     else
     if ( !image.LoadFile( dir + _T("horse.bmp"), wxBITMAP_TYPE_BMP ) )
         wxLogError(wxT("Can't load BMP image"));
     else

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

 
 #if wxUSE_XPM
     image.Destroy();
 
 #if wxUSE_XPM
     image.Destroy();


@@ -455,7 +535,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     if ( !image.LoadFile( dir + _T("horse.xpm"), wxBITMAP_TYPE_XPM ) )
         wxLogError(wxT("Can't load XPM image"));
     else
     if ( !image.LoadFile( dir + _T("horse.xpm"), wxBITMAP_TYPE_XPM ) )
         wxLogError(wxT("Can't load XPM image"));
     else

-        my_horse_xpm = new wxBitmap( image );
+        my_horse_xpm = wxBitmap( image );

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


@@ -467,7 +547,21 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     if ( !image.LoadFile( dir + _T("horse.pnm"), wxBITMAP_TYPE_PNM ) )
         wxLogError(wxT("Can't load PNM image"));
     else
     if ( !image.LoadFile( dir + _T("horse.pnm"), wxBITMAP_TYPE_PNM ) )
         wxLogError(wxT("Can't load PNM image"));
     else

-        my_horse_pnm = new wxBitmap( image );
+        my_horse_pnm = wxBitmap( image );
+
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + _T("horse_ag.pnm"), wxBITMAP_TYPE_PNM ) )
+        wxLogError(wxT("Can't load PNM image"));
+    else
+        my_horse_asciigrey_pnm = wxBitmap( image );
+
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + _T("horse_rg.pnm"), wxBITMAP_TYPE_PNM ) )
+        wxLogError(wxT("Can't load PNM image"));
+    else
+        my_horse_rawgrey_pnm = wxBitmap( image );

 #endif
 
 #if wxUSE_LIBTIFF
 #endif
 
 #if wxUSE_LIBTIFF


@@ -476,19 +570,17 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     if ( !image.LoadFile( dir + _T("horse.tif"), wxBITMAP_TYPE_TIF ) )
         wxLogError(wxT("Can't load TIFF image"));
     else
     if ( !image.LoadFile( dir + _T("horse.tif"), wxBITMAP_TYPE_TIF ) )
         wxLogError(wxT("Can't load TIFF image"));
     else

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

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

-    my_smile_xbm = new wxBitmap( (const char*)smile_bits, smile_width,
+    my_smile_xbm = wxBitmap( (const char*)smile_bits, smile_width,

                                  smile_height, 1 );
 
                                  smile_height, 1 );
 

-#if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW

     // demonstrates XPM automatically using the mask when saving
     if ( m_bmpSmileXpm.Ok() )
         m_bmpSmileXpm.SaveFile(_T("saved.xpm"), wxBITMAP_TYPE_XPM);
     // demonstrates XPM automatically using the mask when saving
     if ( m_bmpSmileXpm.Ok() )
         m_bmpSmileXpm.SaveFile(_T("saved.xpm"), wxBITMAP_TYPE_XPM);

-#endif

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


@@ -496,21 +588,21 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     if ( !image.LoadFile( dir + _T("horse.ico"), wxBITMAP_TYPE_ICO, 0 ) )
         wxLogError(wxT("Can't load first ICO image"));
     else
     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 );
+        my_horse_ico32 = wxBitmap( image );

 
     image.Destroy();
 
     if ( !image.LoadFile( dir + _T("horse.ico"), wxBITMAP_TYPE_ICO, 1 ) )
         wxLogError(wxT("Can't load second ICO image"));
     else
 
     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 );
+        my_horse_ico16 = wxBitmap( image );

 
     image.Destroy();
 
     if ( !image.LoadFile( dir + _T("horse.ico") ) )
         wxLogError(wxT("Can't load best ICO image"));
     else
 
     image.Destroy();
 
     if ( !image.LoadFile( dir + _T("horse.ico") ) )
         wxLogError(wxT("Can't load best ICO image"));
     else

-        my_horse_ico = new wxBitmap( image );
+        my_horse_ico = wxBitmap( image );

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


@@ -518,7 +610,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
         wxLogError(wxT("Can't load best ICO image"));
     else
     {
         wxLogError(wxT("Can't load best ICO image"));
     else
     {

-        my_horse_cur = new wxBitmap( image );
+        my_horse_cur = wxBitmap( image );

         xH = 30 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) ;
         yH = 2420 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ;
     }
         xH = 30 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) ;
         yH = 2420 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ;
     }


@@ -538,7 +630,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
             tmp << i ;
             wxLogError(tmp);
         }
             tmp << i ;
             wxLogError(tmp);
         }

-        else    
+        else

             my_horse_ani [i] = wxBitmap( image );
     }
 #endif // wxUSE_ICO_CUR
             my_horse_ani [i] = wxBitmap( image );
     }
 #endif // wxUSE_ICO_CUR


@@ -547,41 +639,29 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
     // test image loading from stream
     wxFile file(dir + _T("horse.bmp"));
 
     // 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
+    if ( file.IsOpened() )

     {
     {

-        wxMemoryInputStream mis(data, len);
-        if ( !image.LoadFile(mis) )
-            wxLogError(wxT("Can't load BMP image from stream"));
+        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
         else

-            my_horse_bmp2 = new wxBitmap( image );
-    }
+        {
+            wxMemoryInputStream mis(data, dataSize);
+            if ( !image.LoadFile(mis) )
+                wxLogError(wxT("Can't load BMP image from stream"));
+            else
+                my_horse_bmp2 = wxBitmap( image );
+        }

 
 

-    free(data);
+        free(data);
+    }

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

-    delete my_horse_pnm;
-    delete my_horse_png;
-    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_cur;

     delete [] my_horse_ani;
     delete [] my_horse_ani;

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

 }
 
 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 }
 
 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )


@@ -590,7 +670,8 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     PrepareDC( dc );
 
     dc.DrawText( _T("Loaded image"), 30, 10 );
     PrepareDC( dc );
 
     dc.DrawText( _T("Loaded image"), 30, 10 );

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

 
     dc.DrawText( _T("Drawn directly"), 150, 10 );
     dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );
 
     dc.DrawText( _T("Drawn directly"), 150, 10 );
     dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );


@@ -599,72 +680,112 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     dc.SetBrush( *wxWHITE_BRUSH );
     dc.DrawRectangle( 170, 50, 60, 60 );
 
     dc.SetBrush( *wxWHITE_BRUSH );
     dc.DrawRectangle( 170, 50, 60, 60 );
 

-    if (my_anti && my_anti->Ok())
-        dc.DrawBitmap( *my_anti, 280, 30 );
+    if (my_anti.Ok())
+        dc.DrawBitmap( my_anti, 280, 30 );

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

-    if (my_horse_png && my_horse_png->Ok())
+    if (my_horse_png.Ok())

     {
     {

-        dc.DrawBitmap( *my_horse_png, 30, 150 );
+        dc.DrawBitmap( my_horse_png, 30, 150 );

         wxRect rect(0,0,100,100);
         wxRect rect(0,0,100,100);

-        wxBitmap sub( my_horse_png->GetSubBitmap(rect) );
-        dc.DrawText( _T("GetSubBitmap()"), 280, 190 );
-        dc.DrawBitmap( sub, 280, 210 );
+        wxBitmap sub( my_horse_png.GetSubBitmap(rect) );
+        dc.DrawText( _T("GetSubBitmap()"), 280, 175 );
+        dc.DrawBitmap( sub, 280, 195 );

     }
 
     dc.DrawText( _T("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.Ok())
+        dc.DrawBitmap( my_horse_jpeg, 30, 380 );
+
+    dc.DrawText( _T("Green rotated to red"), 280, 365 );
+    if (colorized_horse_jpeg.Ok())
+        dc.DrawBitmap( colorized_horse_jpeg, 280, 380 );
+
+    dc.DrawText( _T("CMYK JPEG image"), 530, 365 );
+    if (my_cmyk_jpeg.Ok())
+        dc.DrawBitmap( my_cmyk_jpeg, 530, 380 );

 
     dc.DrawText( _T("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.Ok())
+        dc.DrawBitmap( my_horse_gif, 30, 610 );

 
     dc.DrawText( _T("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.Ok())
+        dc.DrawBitmap( my_horse_pcx, 30, 840 );

 
     dc.DrawText( _T("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.Ok())
+        dc.DrawBitmap( my_horse_bmp, 30, 1070 );

 
     dc.DrawText( _T("BMP read from memory"), 280, 1055 );
 
     dc.DrawText( _T("BMP read from memory"), 280, 1055 );

-    if (my_horse_bmp2 && my_horse_bmp2->Ok())
-        dc.DrawBitmap( *my_horse_bmp2, 280, 1070 );
+    if (my_horse_bmp2.Ok())
+        dc.DrawBitmap( my_horse_bmp2, 280, 1070 );

 
     dc.DrawText( _T("PNM handler"), 30, 1285 );
 
     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.Ok())
+        dc.DrawBitmap( my_horse_pnm, 30, 1300 );
+
+    dc.DrawText( _T("PNM handler (ascii grey)"), 280, 1285 );
+    if (my_horse_asciigrey_pnm.Ok())
+        dc.DrawBitmap( my_horse_asciigrey_pnm, 280, 1300 );
+
+    dc.DrawText( _T("PNM handler (raw grey)"), 530, 1285 );
+    if (my_horse_rawgrey_pnm.Ok())
+        dc.DrawBitmap( my_horse_rawgrey_pnm, 530, 1300 );

 
     dc.DrawText( _T("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.Ok())
+        dc.DrawBitmap( my_horse_tiff, 30, 1530 );

 
     dc.DrawText( _T("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.Ok())
+        dc.DrawBitmap( my_horse_xpm, 30, 1760 );

 
 

+    // toucans
+    {
+        int x = 750, y = 10, yy = 170;
+
+        dc.DrawText(wxT("Original toucan"), x+50, y);
+        dc.DrawBitmap(my_toucan, x, y+15);
+        y += yy;
+        dc.DrawText(wxT("Flipped horizontally"), x+50, y);
+        dc.DrawBitmap(my_toucan_flipped_horiz, x, y+15);
+        y += yy;
+        dc.DrawText(wxT("Flipped vertically"), x+50, y);
+        dc.DrawBitmap(my_toucan_flipped_vert, x, y+15);
+        y += yy;
+        dc.DrawText(wxT("Flipped both h&v"), x+50, y);
+        dc.DrawBitmap(my_toucan_flipped_both, x, y+15);
+
+        y += yy;
+        dc.DrawText(wxT("In greyscale"), x+50, y);
+        dc.DrawBitmap(my_toucan_grey, x, y+15);
+
+        y += yy;
+        dc.DrawText(wxT("Toucan's head"), x+50, y);
+        dc.DrawBitmap(my_toucan_head, x, y+15);
+    }

 
 

-    if (my_smile_xbm && my_smile_xbm->Ok())
+    if (my_smile_xbm.Ok())

     {
         dc.DrawText( _T("XBM bitmap"), 30, 1975 );
         dc.DrawText( _T("(green on red)"), 30, 1990 );
         dc.SetTextForeground( _T("GREEN") );
         dc.SetTextBackground( _T("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( wxT("BLACK") );
+        dc.SetTextForeground( *wxBLACK );

         dc.DrawText( _T("After wxImage conversion"), 150, 1975 );
         dc.DrawText( _T("(red on white)"), 150, 1990 );
         dc.SetTextForeground( wxT("RED") );
         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();
+        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() );
         i.SetMaskColour( 255, 255, 255 );
         i.Replace( 0, 0, 0,
                wxRED_PEN->GetColour().Red(),
                wxRED_PEN->GetColour().Green(),
                wxRED_PEN->GetColour().Blue() );

-        dc.DrawBitmap( wxBitmap(i), 150, 2010, TRUE );
-        dc.SetTextForeground( wxT("BLACK") );
+        dc.DrawBitmap( wxBitmap(i), 150, 2010, true );
+        dc.SetTextForeground( *wxBLACK );

     }
 
 
     }
 
 


@@ -675,7 +796,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 );

+#ifndef __WXGTK20__
+    // I cannot convince GTK2 to draw into mono bitmaps

     memdc.DrawText( _T("Hi!"), 5, 5 );
     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 );


@@ -690,7 +814,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
         dc.SetTextBackground( wxT("GREEN") );
         dc.DrawBitmap( mono, 30, 2130 );
 
         dc.SetTextBackground( wxT("GREEN") );
         dc.DrawBitmap( mono, 30, 2130 );
 

-        dc.SetTextForeground( wxT("BLACK") );
+        dc.SetTextForeground( *wxBLACK );

         dc.DrawText( _T("After wxImage conversion"), 150, 2095 );
         dc.DrawText( _T("(red on white)"), 150, 2110 );
         dc.SetTextForeground( wxT("RED") );
         dc.DrawText( _T("After wxImage conversion"), 150, 2095 );
         dc.DrawText( _T("(red on white)"), 150, 2110 );
         dc.SetTextForeground( wxT("RED") );


@@ -700,49 +824,78 @@ 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( wxBitmap(i), 150, 2130, TRUE );
-        dc.SetTextForeground( wxT("BLACK") );
+        dc.DrawBitmap( wxBitmap(i), 150, 2130, true );
+        dc.SetTextForeground( *wxBLACK );

     }
 
     }
 

-    dc.DrawText(_T("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.DrawBitmap(m_bmpSmileXpm, 30, 2250, true);

 
 

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

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

+        dc.DrawIcon(m_iconSmileXpm, 110, 2250);
+
+    // testing icon -> bitmap conversion
+    wxBitmap to_blit( m_iconSmileXpm );
+    if (to_blit.Ok())

     {
     {

-        dc.DrawIcon(m_iconSmileXpm, 150, 2250);
+        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( _T("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.Ok())
+        dc.DrawBitmap( my_horse_ico32, 30, 2330, true );

 
     dc.DrawText( _T("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.Ok())
+        dc.DrawBitmap( my_horse_ico16, 230, 2330, true );

 
     dc.DrawText( _T("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.Ok())
+        dc.DrawBitmap( my_horse_ico, 430, 2330, true );

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

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

     {
     {

-        dc.DrawBitmap( *my_horse_cur, 30, 2420, TRUE );
+        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.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 );
     dc.DrawText( _T("ANI handler"), 230, 2390 );

-    int i ;
-    for (i=0; i < m_ani_images; i ++)
+    for ( int i=0; i < m_ani_images; i++ )
+    {

         if (my_horse_ani[i].Ok())
         {
         if (my_horse_ani[i].Ok())
         {

-            dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, TRUE );
+            dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, true );

         }
         }

+    }

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


@@ -757,12 +910,12 @@ 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( _T("This is anti-aliased Text."), 20, 20 );
-  dc.DrawText( _T("And a Rectangle."), 20, 60 );
+  dc.DrawText( _T("This is anti-aliased Text."), 20, 5 );
+  dc.DrawText( _T("And a Rectangle."), 20, 45 );

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

-  dc.DrawRoundedRectangle( 20, 100, 200, 180, 20 );
+  dc.DrawRoundedRectangle( 20, 85, 200, 180, 20 );

 
   wxImage original= bitmap.ConvertToImage();
   wxImage anti( 150, 150 );
 
   wxImage original= bitmap.ConvertToImage();
   wxImage anti( 150, 150 );


@@ -789,19 +942,19 @@ 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);
+  my_anti = wxBitmap(anti);

 }
 
 // MyFrame
 
 enum
 {
 }
 
 // MyFrame
 
 enum
 {

-    ID_QUIT  = 108,
-    ID_ABOUT,
-    ID_NEW,
-    ID_SHOWRAW
+    ID_QUIT  = wxID_EXIT,
+    ID_ABOUT = wxID_ABOUT,
+    ID_NEW = 100,
+    ID_SHOWRAW = 101

 };
 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
 };
 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )


@@ -814,20 +967,21 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame)
   EVT_MENU    (ID_SHOWRAW,  MyFrame::OnTestRawBitmap)
 #endif
 
   EVT_MENU    (ID_SHOWRAW,  MyFrame::OnTestRawBitmap)
 #endif
 

-#if wxUSE_CLIPBOARD && !defined(__WXMOTIF__)
+#if wxUSE_CLIPBOARD

     EVT_MENU(wxID_COPY, MyFrame::OnCopy)
     EVT_MENU(wxID_PASTE, MyFrame::OnPaste)
 #endif // wxUSE_CLIPBOARD
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()
     EVT_MENU(wxID_COPY, MyFrame::OnCopy)
     EVT_MENU(wxID_PASTE, MyFrame::OnPaste)
 #endif // wxUSE_CLIPBOARD
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()

-       : wxFrame( (wxFrame *)NULL, -1, _T("wxImage sample"),
-                  wxPoint(20,20), wxSize(470,360) )
+       : wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxImage sample"),
+                  wxPoint(20, 20), wxSize(950, 700) )

 {
   wxMenuBar *menu_bar = new wxMenuBar();
 
   wxMenu *menuImage = new wxMenu;
   menuImage->Append( ID_NEW, _T("&Show any image...\tCtrl-O"));
 {
   wxMenuBar *menu_bar = new wxMenuBar();
 
   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
 #ifdef wxHAVE_RAW_BITMAP
   menuImage->Append( ID_SHOWRAW, _T("Test &raw bitmap...\tCtrl-R"));
 #endif


@@ -837,7 +991,7 @@ MyFrame::MyFrame()
   menuImage->Append( ID_QUIT, _T("E&xit\tCtrl-Q"));
   menu_bar->Append(menuImage, _T("&Image"));
 
   menuImage->Append( ID_QUIT, _T("E&xit\tCtrl-Q"));
   menu_bar->Append(menuImage, _T("&Image"));
 

-#if wxUSE_CLIPBOARD && !defined(__WXMOTIF__)
+#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"));
   wxMenu *menuClipboard = new wxMenu;
   menuClipboard->Append(wxID_COPY, _T("&Copy test image\tCtrl-C"));
   menuClipboard->Append(wxID_PASTE, _T("&Paste image\tCtrl-V"));


@@ -846,19 +1000,21 @@ MyFrame::MyFrame()
 
   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 * 2500 height
-  m_canvas->SetScrollbars( 10, 10, 50, 250 );
+  // 500 width * 2750 height
+  m_canvas->SetScrollbars( 10, 10, 50, 275 );

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


@@ -870,6 +1026,7 @@ void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 
 void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
 {
 
 void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
 {

+#if wxUSE_FILEDLG

     wxString filename = wxFileSelector(_T("Select image file"));
     if ( !filename )
         return;
     wxString filename = wxFileSelector(_T("Select image file"));
     if ( !filename )
         return;


@@ -883,33 +1040,40 @@ void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
     }
 
     (new MyImageFrame(this, wxBitmap(image)))->Show();
     }
 
     (new MyImageFrame(this, wxBitmap(image)))->Show();

+#endif // wxUSE_FILEDLG

 }
 
 #ifdef wxHAVE_RAW_BITMAP
 
 }
 
 #ifdef wxHAVE_RAW_BITMAP
 

-void MyFrame::OnTestRawBitmap( wxCommandEvent &event )
+void MyFrame::OnTestRawBitmap( wxCommandEvent &WXUNUSED(event) )

 {
     (new MyRawBitmapFrame(this))->Show();
 }
 
 #endif // wxHAVE_RAW_BITMAP
 
 {
     (new MyRawBitmapFrame(this))->Show();
 }
 
 #endif // wxHAVE_RAW_BITMAP
 

-#if wxUSE_CLIPBOARD && !defined(__WXMOTIF__)
+#if wxUSE_CLIPBOARD

 
 void MyFrame::OnCopy(wxCommandEvent& WXUNUSED(event))
 {
     wxBitmapDataObject *dobjBmp = new wxBitmapDataObject;
 
 void MyFrame::OnCopy(wxCommandEvent& WXUNUSED(event))
 {
     wxBitmapDataObject *dobjBmp = new wxBitmapDataObject;

-    dobjBmp->SetBitmap(*m_canvas->my_horse_png);
+    dobjBmp->SetBitmap(m_canvas->my_horse_png);
+
+    wxTheClipboard->Open();

 
     if ( !wxTheClipboard->SetData(dobjBmp) )
     {
         wxLogError(_T("Failed to copy bitmap to clipboard"));
     }
 
     if ( !wxTheClipboard->SetData(dobjBmp) )
     {
         wxLogError(_T("Failed to copy bitmap to clipboard"));
     }

+
+    wxTheClipboard->Close();

 }
 
 void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
 {
     wxBitmapDataObject dobjBmp;
 }
 
 void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
 {
     wxBitmapDataObject dobjBmp;

+
+    wxTheClipboard->Open();

     if ( !wxTheClipboard->GetData(dobjBmp) )
     {
         wxLogMessage(_T("No bitmap data in the clipboard"));
     if ( !wxTheClipboard->GetData(dobjBmp) )
     {
         wxLogMessage(_T("No bitmap data in the clipboard"));


@@ -918,6 +1082,7 @@ void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
     {
         (new MyImageFrame(this, dobjBmp.GetBitmap()))->Show();
     }
     {
         (new MyImageFrame(this, dobjBmp.GetBitmap()))->Show();
     }

+    wxTheClipboard->Close();

 }
 
 #endif // wxUSE_CLIPBOARD
 }
 
 #endif // wxUSE_CLIPBOARD


@@ -963,8 +1128,7 @@ bool MyApp::OnInit()
 #endif
 
   wxFrame *frame = new MyFrame();
 #endif
 
   wxFrame *frame = new MyFrame();

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

 
 

-  return TRUE;
+  return true;

 }
 }

-