updated VC build instructions

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

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 1df4e86ac5bb870839913235606ec48445491714..5fe1e004dd397f32b7487cba05b7986c3d3c981b 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -24,9 +24,19 @@
 #include "wx/wfstream.h"
 #include "wx/quantize.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__) || defined(__WXMAC__)
+    #ifdef wxHAVE_RAW_BITMAP
+    #include "wx/rawbmp.h"
+    #endif
+#endif

 
 // derived classes
 
 
 // derived classes
 


@@ -57,12 +67,14 @@ public:
     wxBitmap  *my_horse_ico16;
     wxBitmap  *my_horse_ico;
     wxBitmap  *my_horse_cur;
     wxBitmap  *my_horse_ico16;
     wxBitmap  *my_horse_ico;
     wxBitmap  *my_horse_cur;

+    wxBitmap  *my_horse_ani;

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

+    int m_ani_images ;

 
 protected:
     wxBitmap m_bmpSmileXpm;
 
 protected:
     wxBitmap m_bmpSmileXpm;


@@ -109,8 +121,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:


@@ -124,20 +144,24 @@ public:
     MyImageFrame(wxFrame *parent, const wxBitmap& bitmap)
         : wxFrame(parent, -1, _T("Double click to save"),
                   wxDefaultPosition, wxDefaultSize,
     MyImageFrame(wxFrame *parent, const wxBitmap& bitmap)
         : wxFrame(parent, -1, _T("Double click to save"),
                   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 );

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

     }
 
     }
 

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

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


@@ -215,6 +239,81 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     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, -1, _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;
+
+        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;
+        }
+
+        data.UseAlpha();
+
+        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 )
+            {
+                p.Red() = r;
+                p.Green() = g;
+                p.Blue() = b;
+                p.Alpha() = (Data::Iterator::ChannelType)((x*255.)/REAL_SIZE);
+
+                ++p; // same as p.OffsetX(1)
+            }
+
+            p = rowStart;
+            p.OffsetY(data, 1);
+        }
+    }
+
+    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:
+    wxBitmap m_bitmap;
+
+    DECLARE_EVENT_TABLE()
+};
+
+#endif // wxHAVE_RAW_BITMAP
+

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


@@ -232,10 +331,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()
+
+#ifdef wxHAVE_RAW_BITMAP
+
+BEGIN_EVENT_TABLE(MyRawBitmapFrame, wxFrame)
+    EVT_PAINT(MyRawBitmapFrame::OnPaint)

 END_EVENT_TABLE()
 
 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()


@@ -243,10 +351,8 @@ 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_png = (wxBitmap*) NULL;
     my_horse_jpeg = (wxBitmap*) NULL;


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

+    my_horse_ani = (wxBitmap*) NULL;

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

+    m_ani_images = 0 ;
+

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


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

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

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

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

     else
         wxLogWarning(wxT("Can't find image files in either '.' or '..'!"));
 
     else
         wxLogWarning(wxT("Can't find image files in either '.' or '..'!"));
 


@@ -296,8 +405,8 @@ 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 = new wxBitmap( image );

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


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

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

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


@@ -376,11 +485,9 @@ 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() )
         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();


@@ -414,26 +521,48 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
         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) ;
     }

-#endif
+
+    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"));
 
     image.Destroy();
 
     // test image loading from stream
     wxFile file(dir + _T("horse.bmp"));

-    off_t len = file.Length();
-    void *data = malloc(len);
-    if ( file.Read(data, len) != len )
-        wxLogError(_T("Reading bitmap file failed"));
-    else
+    if ( file.IsOpened() )

     {
     {

-        wxMemoryInputStream mis(data, len);
-        if ( !image.LoadFile(mis) )
-            wxLogError(wxT("Can't load BMP image from stream"));
+        off_t len = file.Length();
+        void *data = malloc(len);
+        if ( file.Read(data, len) != len )
+            wxLogError(_T("Reading bitmap file failed"));

         else
         else

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

 
 

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

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


@@ -451,6 +580,7 @@ MyCanvas::~MyCanvas()
     delete my_horse_ico16;
     delete my_horse_ico;
     delete my_horse_cur;
     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;


@@ -547,7 +677,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 );


@@ -576,16 +709,43 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
         dc.SetTextForeground( wxT("BLACK") );
     }
 
         dc.SetTextForeground( wxT("BLACK") );
     }
 

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


@@ -608,6 +768,13 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
         dc.DrawLine (xH-10,yH,xH+10,yH);
         dc.DrawLine (xH,yH-10,xH,yH+10);
     }
         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()


@@ -661,9 +828,13 @@ void MyCanvas::CreateAntiAliasedBitmap()
 
 // 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 )
 


@@ -671,21 +842,40 @@ 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()
        : wxFrame( (wxFrame *)NULL, -1, _T("wxImage sample"),
                   wxPoint(20,20), wxSize(470,360) )
 {
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()
        : wxFrame( (wxFrame *)NULL, -1, _T("wxImage sample"),
                   wxPoint(20,20), wxSize(470,360) )
 {

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

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

-  menu_bar->Append(file_menu, _T("&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 );
 


@@ -728,6 +918,50 @@ void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
     (new MyImageFrame(this, wxBitmap(image)))->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
 //-----------------------------------------------------------------------------


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

+  wxImage::AddHandler( new wxANIHandler );

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