]> git.saurik.com Git - wxWidgets.git/commitdiff
no real change; just reorganize the sample splitting it in two source files
authorFrancesco Montorsi <f18m_cpp217828@yahoo.it>
Wed, 14 Jan 2009 17:41:21 +0000 (17:41 +0000)
committerFrancesco Montorsi <f18m_cpp217828@yahoo.it>
Wed, 14 Jan 2009 17:41:21 +0000 (17:41 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

14 files changed:
samples/image/Makefile.in
samples/image/canvas.cpp [new file with mode: 0644]
samples/image/canvas.h [new file with mode: 0644]
samples/image/image.bkl
samples/image/image.cpp
samples/image/image.dsp
samples/image/image_vc7.vcproj
samples/image/image_vc8.vcproj
samples/image/image_vc9.vcproj
samples/image/makefile.bcc
samples/image/makefile.gcc
samples/image/makefile.unx
samples/image/makefile.vc
samples/image/makefile.wat

index 67960ba9399cfbf114dfa6528afec8b975bcf55c..9f131ae272cdd0094f7257a971d273917196c63a 100644 (file)
@@ -50,6 +50,7 @@ IMAGE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 IMAGE_OBJECTS =  \
        $(__image_os2_lib_res) \
        image_image.o \
+       image_canvas.o \
        $(__image___win32rc)
 
 ### Conditionally set variables: ###
@@ -190,6 +191,9 @@ data:
 image_image.o: $(srcdir)/image.cpp
        $(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $(srcdir)/image.cpp
 
+image_canvas.o: $(srcdir)/canvas.cpp
+       $(CXXC) -c -o $@ $(IMAGE_CXXFLAGS) $(srcdir)/canvas.cpp
+
 image_image_rc.o: $(srcdir)/image.rc
        $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
 
diff --git a/samples/image/canvas.cpp b/samples/image/canvas.cpp
new file mode 100644 (file)
index 0000000..91ef136
--- /dev/null
@@ -0,0 +1,610 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        samples/image/canvas.cpp
+// Purpose:     sample showing operations with wxImage
+// Author:      Robert Roebling
+// Modified by: Francesco Montorsi
+// 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"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.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/stopwatch.h"
+
+#if wxUSE_CLIPBOARD
+    #include "wx/dataobj.h"
+    #include "wx/clipbrd.h"
+#endif // wxUSE_CLIPBOARD
+
+#include "smile.xbm"
+#include "smile.xpm"
+
+#include "canvas.h"
+
+
+//-----------------------------------------------------------------------------
+// MyCanvas
+//-----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
+    EVT_PAINT(MyCanvas::OnPaint)
+END_EVENT_TABLE()
+
+MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
+                    const wxPoint &pos, const wxSize &size )
+    : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
+    , m_bmpSmileXpm(smile_xpm)
+    , m_iconSmileXpm(smile_xpm)
+{
+    my_horse_ani = NULL;
+    m_ani_images = 0 ;
+
+    SetBackgroundColour(* wxWHITE);
+
+    wxBitmap bitmap( 100, 100 );
+
+    wxMemoryDC dc;
+    dc.SelectObject( bitmap );
+    dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );
+    dc.SetPen( *wxBLACK_PEN );
+    dc.DrawRectangle( 0, 0, 100, 100 );
+    dc.SetBrush( *wxWHITE_BRUSH );
+    dc.DrawRectangle( 20, 20, 60, 60 );
+    dc.SelectObject( wxNullBitmap );
+
+    // try to find the directory with our images
+    wxString dir;
+    if ( wxFile::Exists(wxT("./horse.png")) )
+        dir = wxT("./");
+    else if ( wxFile::Exists(wxT("../horse.png")) )
+        dir = wxT("../");
+    else
+        wxLogWarning(wxT("Can't find image files in either '.' or '..'!"));
+
+    wxImage image = bitmap.ConvertToImage();
+
+#if wxUSE_LIBPNG
+    if ( !image.SaveFile( dir + _T("test.png"), wxBITMAP_TYPE_PNG ))
+        wxLogError(wxT("Can't save file"));
+
+    image.Destroy();
+
+    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
+        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)));
+    my_toucan_scaled_normal = wxBitmap(image.Scale(110,90,wxIMAGE_QUALITY_NORMAL));
+    my_toucan_scaled_high = wxBitmap(image.Scale(110,90,wxIMAGE_QUALITY_HIGH));
+    my_toucan_blur = wxBitmap(image.Blur(10));
+
+#endif // wxUSE_LIBPNG
+
+#if wxUSE_LIBJPEG
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + _T("horse.jpg")) )
+        wxLogError(wxT("Can't load JPG image"));
+    else
+    {
+        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
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + _T("horse.gif" )) )
+        wxLogError(wxT("Can't load GIF image"));
+    else
+        my_horse_gif = wxBitmap( image );
+#endif
+
+#if wxUSE_PCX
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + _T("horse.pcx"), wxBITMAP_TYPE_PCX ) )
+        wxLogError(wxT("Can't load PCX image"));
+    else
+        my_horse_pcx = wxBitmap( image );
+#endif
+
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + _T("horse.bmp"), wxBITMAP_TYPE_BMP ) )
+        wxLogError(wxT("Can't load BMP image"));
+    else
+        my_horse_bmp = wxBitmap( image );
+
+#if wxUSE_XPM
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + _T("horse.xpm"), wxBITMAP_TYPE_XPM ) )
+        wxLogError(wxT("Can't load XPM image"));
+    else
+        my_horse_xpm = wxBitmap( image );
+
+    if ( !image.SaveFile( dir + _T("test.xpm"), wxBITMAP_TYPE_XPM ))
+        wxLogError(wxT("Can't save file"));
+#endif
+
+#if wxUSE_PNM
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + _T("horse.pnm"), wxBITMAP_TYPE_PNM ) )
+        wxLogError(wxT("Can't load PNM image"));
+    else
+        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
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + _T("horse.tif"), wxBITMAP_TYPE_TIF ) )
+        wxLogError(wxT("Can't load TIFF image"));
+    else
+        my_horse_tiff = wxBitmap( image );
+#endif
+
+#if wxUSE_LIBTIFF
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + _T("horse.tga"), wxBITMAP_TYPE_TGA ) )
+        wxLogError(wxT("Can't load TGA image"));
+    else
+        my_horse_tga = wxBitmap( image );
+#endif
+
+    CreateAntiAliasedBitmap();
+
+    my_smile_xbm = wxBitmap( (const char*)smile_bits, smile_width,
+                                smile_height, 1 );
+
+    // demonstrates XPM automatically using the mask when saving
+    if ( m_bmpSmileXpm.Ok() )
+        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 = 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 = wxBitmap( image );
+
+    image.Destroy();
+
+    if ( !image.LoadFile( dir + _T("horse.ico") ) )
+        wxLogError(wxT("Can't load best ICO image"));
+    else
+        my_horse_ico = 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 = 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 = wxBitmap( image );
+        }
+
+        free(data);
+    }
+}
+
+MyCanvas::~MyCanvas()
+{
+    delete [] my_horse_ani;
+}
+
+void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
+{
+    wxPaintDC dc( this );
+    PrepareDC( dc );
+
+    dc.DrawText( _T("Loaded image"), 30, 10 );
+    if (my_square.Ok())
+        dc.DrawBitmap( my_square, 30, 30 );
+
+    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.DrawRectangle( 170, 50, 60, 60 );
+
+    if (my_anti.Ok())
+        dc.DrawBitmap( my_anti, 280, 30 );
+
+    dc.DrawText( _T("PNG handler"), 30, 135 );
+    if (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( _T("GetSubBitmap()"), 280, 175 );
+        dc.DrawBitmap( sub, 280, 195 );
+    }
+
+    dc.DrawText( _T("JPEG handler"), 30, 365 );
+    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 );
+    if (my_horse_gif.Ok())
+        dc.DrawBitmap( my_horse_gif, 30, 610 );
+
+    dc.DrawText( _T("PCX handler"), 30, 825 );
+    if (my_horse_pcx.Ok())
+        dc.DrawBitmap( my_horse_pcx, 30, 840 );
+
+    dc.DrawText( _T("BMP handler"), 30, 1055 );
+    if (my_horse_bmp.Ok())
+        dc.DrawBitmap( my_horse_bmp, 30, 1070 );
+
+    dc.DrawText( _T("BMP read from memory"), 280, 1055 );
+    if (my_horse_bmp2.Ok())
+        dc.DrawBitmap( my_horse_bmp2, 280, 1070 );
+
+    dc.DrawText( _T("PNM handler"), 30, 1285 );
+    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 );
+    if (my_horse_tiff.Ok())
+        dc.DrawBitmap( my_horse_tiff, 30, 1530 );
+
+    dc.DrawText( _T("TGA handler"), 30, 1745 );
+    if (my_horse_tga.Ok())
+        dc.DrawBitmap( my_horse_tga, 30, 1760 );
+
+    dc.DrawText( _T("XPM handler"), 30, 1975 );
+    if (my_horse_xpm.Ok())
+        dc.DrawBitmap( my_horse_xpm, 30, 2000 );
+
+    // toucans
+    {
+        int x = 750, y = 10, yy = 170;
+
+        dc.DrawText(wxT("Original toucan"), x+50, y);
+        dc.DrawBitmap(my_toucan, x, y+15, true);
+        y += yy;
+        dc.DrawText(wxT("Flipped horizontally"), x+50, y);
+        dc.DrawBitmap(my_toucan_flipped_horiz, x, y+15, true);
+        y += yy;
+        dc.DrawText(wxT("Flipped vertically"), x+50, y);
+        dc.DrawBitmap(my_toucan_flipped_vert, x, y+15, true);
+        y += yy;
+        dc.DrawText(wxT("Flipped both h&v"), x+50, y);
+        dc.DrawBitmap(my_toucan_flipped_both, x, y+15, true);
+
+        y += yy;
+        dc.DrawText(wxT("In greyscale"), x+50, y);
+        dc.DrawBitmap(my_toucan_grey, x, y+15, true);
+
+        y += yy;
+        dc.DrawText(wxT("Toucan's head"), x+50, y);
+        dc.DrawBitmap(my_toucan_head, x, y+15, true);
+
+        y += yy;
+        dc.DrawText(wxT("Scaled with normal quality"), x+50, y);
+        dc.DrawBitmap(my_toucan_scaled_normal, x, y+15, true);
+
+        y += yy;
+        dc.DrawText(wxT("Scaled with high quality"), x+50, y);
+        dc.DrawBitmap(my_toucan_scaled_high, x, y+15, true);
+
+        y += yy;
+        dc.DrawText(wxT("Blured"), x+50, y);
+        dc.DrawBitmap(my_toucan_blur, x, y+15, true);
+    }
+
+    if (my_smile_xbm.Ok())
+    {
+        int x = 300, y = 1800;
+
+        dc.DrawText( _T("XBM bitmap"), x, y );
+        dc.DrawText( _T("(green on red)"), x, y + 15 );
+        dc.SetTextForeground( _T("GREEN") );
+        dc.SetTextBackground( _T("RED") );
+        dc.DrawBitmap( my_smile_xbm, x, y + 30 );
+
+        dc.SetTextForeground( *wxBLACK );
+        dc.DrawText( _T("After wxImage conversion"), x + 120, y );
+        dc.DrawText( _T("(red on white)"), x + 120, y + 15 );
+        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() );
+        dc.DrawBitmap( wxBitmap(i), x + 120, y + 30, true );
+        dc.SetTextForeground( *wxBLACK );
+    }
+
+
+    wxBitmap mono( 60,50,1 );
+    wxMemoryDC memdc;
+    memdc.SelectObject( mono );
+    memdc.SetPen( *wxBLACK_PEN );
+    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 );
+#endif
+    memdc.SetBrush( *wxBLACK_BRUSH );
+    memdc.DrawRectangle( 33,5,20,20 );
+    memdc.SetPen( *wxRED_PEN );
+    memdc.DrawLine( 5, 42, 50, 42 );
+    memdc.SelectObject( wxNullBitmap );
+
+    if (mono.Ok())
+    {
+        int x = 300, y = 1900;
+
+        dc.DrawText( _T("Mono bitmap"), x, y );
+        dc.DrawText( _T("(red on green)"), x, y + 15 );
+        dc.SetTextForeground( wxT("RED") );
+        dc.SetTextBackground( wxT("GREEN") );
+        dc.DrawBitmap( mono, x, y + 30 );
+
+        dc.SetTextForeground( *wxBLACK );
+        dc.DrawText( _T("After wxImage conversion"), x + 120, y );
+        dc.DrawText( _T("(red on white)"), x + 120, y + 15 );
+        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() );
+        dc.DrawBitmap( wxBitmap(i), x + 120, y + 30, true );
+        dc.SetTextForeground( *wxBLACK );
+    }
+
+    // For testing transparency
+    dc.SetBrush( *wxRED_BRUSH );
+    dc.DrawRectangle( 20, 2220, 560, 68 );
+
+    dc.DrawText(_T("XPM bitmap"), 30, 2230 );
+    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.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 );
+    if (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.Ok())
+        dc.DrawBitmap( my_horse_ico16, 230, 2330, true );
+
+    dc.DrawText( _T("ICO handler (best image)"), 430, 2290 );
+    if (my_horse_ico.Ok())
+        dc.DrawBitmap( my_horse_ico, 430, 2330, true );
+
+    dc.DrawText( _T("CUR handler"), 30, 2390 );
+    if (my_horse_cur.Ok())
+    {
+        dc.DrawBitmap( my_horse_cur, 30, 2420, true );
+        dc.SetPen (*wxRED_PEN);
+        dc.DrawLine (xH-10,yH,xH+10,yH);
+        dc.DrawLine (xH,yH-10,xH,yH+10);
+    }
+
+    dc.DrawText( _T("ANI handler"), 230, 2390 );
+    for ( int 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()
+{
+    wxBitmap bitmap( 300, 300 );
+
+    wxMemoryDC dc;
+
+    dc.SelectObject( bitmap );
+
+    dc.Clear();
+
+    dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) );
+    dc.SetTextForeground( wxT("RED") );
+    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.DrawRoundedRectangle( 20, 85, 200, 180, 20 );
+
+    wxImage original= bitmap.ConvertToImage();
+    wxImage anti( 150, 150 );
+
+    /* This is quite slow, but safe. Use wxImage::GetData() for speed instead. */
+
+    for (int y = 1; y < 149; y++)
+        for (int x = 1; x < 149; x++)
+        {
+            int red = original.GetRed( x*2, y*2 ) +
+                        original.GetRed( x*2-1, y*2 ) +
+                        original.GetRed( x*2, y*2+1 ) +
+                        original.GetRed( x*2+1, y*2+1 );
+            red = red/4;
+
+            int green = original.GetGreen( x*2, y*2 ) +
+                        original.GetGreen( x*2-1, y*2 ) +
+                        original.GetGreen( x*2, y*2+1 ) +
+                        original.GetGreen( x*2+1, y*2+1 );
+            green = green/4;
+
+            int blue = original.GetBlue( x*2, y*2 ) +
+                        original.GetBlue( x*2-1, y*2 ) +
+                        original.GetBlue( x*2, y*2+1 ) +
+                        original.GetBlue( x*2+1, y*2+1 );
+            blue = blue/4;
+            anti.SetRGB( x, y, (unsigned char)red, (unsigned char)green, (unsigned char)blue );
+        }
+
+    my_anti = wxBitmap(anti);
+}
diff --git a/samples/image/canvas.h b/samples/image/canvas.h
new file mode 100644 (file)
index 0000000..1c56b7d
--- /dev/null
@@ -0,0 +1,71 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        samples/image/canvas.h
+// Purpose:     sample showing operations with wxImage
+// Author:      Robert Roebling
+// Modified by: Francesco Montorsi
+// Created:     1998
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998-2005 Robert Roebling
+// License:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#include "wx/scrolwin.h"
+
+//-----------------------------------------------------------------------------
+// MyCanvas
+//-----------------------------------------------------------------------------
+
+class MyCanvas: public wxScrolledWindow
+{
+public:
+    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_tga;
+    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;
+    wxBitmap my_toucan_scaled_normal;
+    wxBitmap my_toucan_scaled_high;
+    wxBitmap my_toucan_blur;
+
+    int xH, yH;
+    int m_ani_images;
+    wxBitmap *my_horse_ani;
+
+private:
+    wxBitmap m_bmpSmileXpm;
+    wxIcon   m_iconSmileXpm;
+
+    DECLARE_EVENT_TABLE()
+};
index be89e4d6e13671a640f2b87ee0c42986560b37b4..f3f477abb5cd237d213ad13ccb45f47394763b2d 100644 (file)
@@ -6,7 +6,7 @@
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
     <exe id="image" template="wx_sample" template_append="wx_append">
-        <sources>image.cpp</sources>
+        <sources>image.cpp canvas.cpp</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>image.rc</win32-res>
index 01af647f11d9fa230abc2a97486378bcb1bcd625..584ad7aa5c393276ef61ba6029557eb6817796f6 100644 (file)
@@ -2,7 +2,7 @@
 // Name:        samples/image/image.cpp
 // Purpose:     sample showing operations with wxImage
 // Author:      Robert Roebling
-// Modified by:
+// Modified by: Francesco Montorsi
 // Created:     1998
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998-2005 Robert Roebling
@@ -33,9 +33,6 @@
     #include "wx/clipbrd.h"
 #endif // wxUSE_CLIPBOARD
 
-#include "smile.xbm"
-#include "smile.xpm"
-
 #if defined(__WXMSW__)
     #ifdef wxHAVE_RAW_BITMAP
     #include "wx/rawbmp.h"
     #include "wx/rawbmp.h"
 #endif
 
-// derived classes
+#include "canvas.h"
 
-class MyFrame;
-class MyApp;
 
-// MyCanvas
+// ============================================================================
+// declarations
+// ============================================================================
 
-class MyCanvas: public wxScrolledWindow
+//-----------------------------------------------------------------------------
+// MyApp
+//-----------------------------------------------------------------------------
+
+class MyApp: public wxApp
 {
 public:
-    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_tga;
-    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;
-    wxBitmap my_toucan_scaled_normal;
-    wxBitmap my_toucan_scaled_high;
-    wxBitmap my_toucan_blur;
-
-    int xH, yH ;
-    int m_ani_images;
-    wxBitmap *my_horse_ani;
-
-private:
-    wxBitmap m_bmpSmileXpm;
-    wxIcon   m_iconSmileXpm;
-
-    DECLARE_EVENT_TABLE()
+    virtual bool OnInit();
 };
 
-
+// ----------------------------------------------------------------------------
 // MyFrame
-
+// ----------------------------------------------------------------------------
 
 class MyFrame: public wxFrame
 {
@@ -163,10 +116,10 @@ class MyImageFrame : public wxFrame
 public:
     MyImageFrame(wxFrame *parent, const wxString& desc, const wxBitmap& bitmap)
         : wxFrame(parent, wxID_ANY,
-                  wxString::Format(_T("Image from %s"), desc.c_str()),
-                  wxDefaultPosition, wxDefaultSize,
-                  wxDEFAULT_FRAME_STYLE | wxFULL_REPAINT_ON_RESIZE),
-                  m_bitmap(bitmap)
+                wxString::Format(_T("Image from %s"), desc.c_str()),
+                wxDefaultPosition, wxDefaultSize,
+                wxDEFAULT_FRAME_STYLE | wxFULL_REPAINT_ON_RESIZE),
+                m_bitmap(bitmap)
     {
         wxMenu *menu = new wxMenu;
         menu->Append(wxID_SAVE);
@@ -205,9 +158,9 @@ public:
 
         const wxSize size = GetClientSize();
         dc.DrawBitmap(m_bitmap,
-                      (size.x - m_bitmap.GetWidth())/2,
-                      (size.y - m_bitmap.GetHeight())/2,
-                      true /* use mask */);
+                    (size.x - m_bitmap.GetWidth())/2,
+                    (size.y - m_bitmap.GetHeight())/2,
+                    true /* use mask */);
     }
 
     void OnSave(wxCommandEvent& WXUNUSED(event))
@@ -264,10 +217,10 @@ public:
             };
 
             int bppselection = wxGetSingleChoiceIndex(_T("Set BMP BPP"),
-                                                      _T("Image sample: save file"),
-                                                      WXSIZEOF(bppchoices),
-                                                      bppchoices,
-                                                      this);
+                                                    _T("Image sample: save file"),
+                                                    WXSIZEOF(bppchoices),
+                                                    bppchoices,
+                                                    this);
             if ( bppselection != -1 )
             {
                 int format = bppvalues[bppselection];
@@ -307,10 +260,10 @@ public:
             };
 
             int sel = wxGetSingleChoiceIndex(_T("Set PNG format"),
-                                             _T("Image sample: save file"),
-                                             WXSIZEOF(pngchoices),
-                                             pngchoices,
-                                             this);
+                                            _T("Image sample: save file"),
+                                            WXSIZEOF(pngchoices),
+                                            pngchoices,
+                                            this);
             if ( sel != -1 )
             {
                 image.SetOption(wxIMAGE_OPTION_PNG_FORMAT, pngvalues[sel]);
@@ -398,8 +351,8 @@ public:
 
     MyRawBitmapFrame(wxFrame *parent)
         : wxFrame(parent, wxID_ANY, _T("Raw bitmaps (how exciting)")),
-          m_bitmap(SIZE, SIZE, 24),
-          m_alphaBitmap(SIZE, SIZE, 32)
+        m_bitmap(SIZE, SIZE, 24),
+        m_alphaBitmap(SIZE, SIZE, 32)
     {
         SetClientSize(SIZE, SIZE*2+25);
 
@@ -434,7 +387,7 @@ public:
 
         // Then, draw colourful alpha-blended stripes
         wxAlphaPixelData data(m_alphaBitmap, wxPoint(BORDER, BORDER),
-                              wxSize(REAL_SIZE, REAL_SIZE));
+                            wxSize(REAL_SIZE, REAL_SIZE));
         if ( !data )
         {
             wxLogError(_T("Failed to gain raw access to bitmap data"));
@@ -521,19 +474,14 @@ private:
 
 #endif // wxHAVE_RAW_BITMAP
 
-// MyApp
-
-class MyApp: public wxApp
-{
-public:
-    virtual bool OnInit();
-};
-
-// main program
 
-IMPLEMENT_APP(MyApp)
+// ============================================================================
+// implementations
+// ============================================================================
 
-// MyCanvas
+//-----------------------------------------------------------------------------
+// MyImageFrame
+//-----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyImageFrame, wxFrame)
     EVT_ERASE_BACKGROUND(MyImageFrame::OnEraseBackground)
@@ -544,6 +492,10 @@ BEGIN_EVENT_TABLE(MyImageFrame, wxFrame)
     EVT_MENU(ID_RESIZE, MyImageFrame::OnResize)
 END_EVENT_TABLE()
 
+//-----------------------------------------------------------------------------
+// MyRawBitmapFrame
+//-----------------------------------------------------------------------------
+
 #ifdef wxHAVE_RAW_BITMAP
 
 BEGIN_EVENT_TABLE(MyRawBitmapFrame, wxFrame)
@@ -552,570 +504,9 @@ END_EVENT_TABLE()
 
 #endif // wxHAVE_RAW_BITMAP
 
-BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
-    EVT_PAINT(MyCanvas::OnPaint)
-END_EVENT_TABLE()
-
-MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
-                    const wxPoint &pos, const wxSize &size )
-    : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
-    , m_bmpSmileXpm(smile_xpm)
-    , m_iconSmileXpm(smile_xpm)
-{
-    my_horse_ani = NULL;
-    m_ani_images = 0 ;
-
-    SetBackgroundColour(* wxWHITE);
-
-    wxBitmap bitmap( 100, 100 );
-
-    wxMemoryDC dc;
-    dc.SelectObject( bitmap );
-    dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );
-    dc.SetPen( *wxBLACK_PEN );
-    dc.DrawRectangle( 0, 0, 100, 100 );
-    dc.SetBrush( *wxWHITE_BRUSH );
-    dc.DrawRectangle( 20, 20, 60, 60 );
-    dc.SelectObject( wxNullBitmap );
-
-    // try to find the directory with our images
-    wxString dir;
-    if ( wxFile::Exists(wxT("./horse.png")) )
-        dir = wxT("./");
-    else if ( wxFile::Exists(wxT("../horse.png")) )
-        dir = wxT("../");
-    else
-        wxLogWarning(wxT("Can't find image files in either '.' or '..'!"));
-
-    wxImage image = bitmap.ConvertToImage();
-
-#if wxUSE_LIBPNG
-    if ( !image.SaveFile( dir + _T("test.png"), wxBITMAP_TYPE_PNG ))
-        wxLogError(wxT("Can't save file"));
-
-    image.Destroy();
-
-    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
-        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)));
-    my_toucan_scaled_normal = wxBitmap(image.Scale(110,90,wxIMAGE_QUALITY_NORMAL));
-    my_toucan_scaled_high = wxBitmap(image.Scale(110,90,wxIMAGE_QUALITY_HIGH));
-    my_toucan_blur = wxBitmap(image.Blur(10));
-
-#endif // wxUSE_LIBPNG
-
-#if wxUSE_LIBJPEG
-    image.Destroy();
-
-    if ( !image.LoadFile( dir + _T("horse.jpg")) )
-        wxLogError(wxT("Can't load JPG image"));
-    else
-    {
-        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
-    image.Destroy();
-
-    if ( !image.LoadFile( dir + _T("horse.gif" )) )
-        wxLogError(wxT("Can't load GIF image"));
-    else
-        my_horse_gif = wxBitmap( image );
-#endif
-
-#if wxUSE_PCX
-    image.Destroy();
-
-    if ( !image.LoadFile( dir + _T("horse.pcx"), wxBITMAP_TYPE_PCX ) )
-        wxLogError(wxT("Can't load PCX image"));
-    else
-        my_horse_pcx = wxBitmap( image );
-#endif
-
-    image.Destroy();
-
-    if ( !image.LoadFile( dir + _T("horse.bmp"), wxBITMAP_TYPE_BMP ) )
-        wxLogError(wxT("Can't load BMP image"));
-    else
-        my_horse_bmp = wxBitmap( image );
-
-#if wxUSE_XPM
-    image.Destroy();
-
-    if ( !image.LoadFile( dir + _T("horse.xpm"), wxBITMAP_TYPE_XPM ) )
-        wxLogError(wxT("Can't load XPM image"));
-    else
-        my_horse_xpm = wxBitmap( image );
-
-    if ( !image.SaveFile( dir + _T("test.xpm"), wxBITMAP_TYPE_XPM ))
-        wxLogError(wxT("Can't save file"));
-#endif
-
-#if wxUSE_PNM
-    image.Destroy();
-
-    if ( !image.LoadFile( dir + _T("horse.pnm"), wxBITMAP_TYPE_PNM ) )
-        wxLogError(wxT("Can't load PNM image"));
-    else
-        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
-    image.Destroy();
-
-    if ( !image.LoadFile( dir + _T("horse.tif"), wxBITMAP_TYPE_TIF ) )
-        wxLogError(wxT("Can't load TIFF image"));
-    else
-        my_horse_tiff = wxBitmap( image );
-#endif
-
-#if wxUSE_LIBTIFF
-    image.Destroy();
-
-    if ( !image.LoadFile( dir + _T("horse.tga"), wxBITMAP_TYPE_TGA ) )
-        wxLogError(wxT("Can't load TGA image"));
-    else
-        my_horse_tga = wxBitmap( image );
-#endif
-
-    CreateAntiAliasedBitmap();
-
-    my_smile_xbm = wxBitmap( (const char*)smile_bits, smile_width,
-                                 smile_height, 1 );
-
-    // demonstrates XPM automatically using the mask when saving
-    if ( m_bmpSmileXpm.Ok() )
-        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 = 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 = wxBitmap( image );
-
-    image.Destroy();
-
-    if ( !image.LoadFile( dir + _T("horse.ico") ) )
-        wxLogError(wxT("Can't load best ICO image"));
-    else
-        my_horse_ico = 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 = 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 = wxBitmap( image );
-        }
-
-        free(data);
-    }
-}
-
-MyCanvas::~MyCanvas()
-{
-    delete [] my_horse_ani;
-}
-
-void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
-{
-    wxPaintDC dc( this );
-    PrepareDC( dc );
-
-    dc.DrawText( _T("Loaded image"), 30, 10 );
-    if (my_square.Ok())
-        dc.DrawBitmap( my_square, 30, 30 );
-
-    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.DrawRectangle( 170, 50, 60, 60 );
-
-    if (my_anti.Ok())
-        dc.DrawBitmap( my_anti, 280, 30 );
-
-    dc.DrawText( _T("PNG handler"), 30, 135 );
-    if (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( _T("GetSubBitmap()"), 280, 175 );
-        dc.DrawBitmap( sub, 280, 195 );
-    }
-
-    dc.DrawText( _T("JPEG handler"), 30, 365 );
-    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 );
-    if (my_horse_gif.Ok())
-        dc.DrawBitmap( my_horse_gif, 30, 610 );
-
-    dc.DrawText( _T("PCX handler"), 30, 825 );
-    if (my_horse_pcx.Ok())
-        dc.DrawBitmap( my_horse_pcx, 30, 840 );
-
-    dc.DrawText( _T("BMP handler"), 30, 1055 );
-    if (my_horse_bmp.Ok())
-        dc.DrawBitmap( my_horse_bmp, 30, 1070 );
-
-    dc.DrawText( _T("BMP read from memory"), 280, 1055 );
-    if (my_horse_bmp2.Ok())
-        dc.DrawBitmap( my_horse_bmp2, 280, 1070 );
-
-    dc.DrawText( _T("PNM handler"), 30, 1285 );
-    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 );
-    if (my_horse_tiff.Ok())
-        dc.DrawBitmap( my_horse_tiff, 30, 1530 );
-
-    dc.DrawText( _T("TGA handler"), 30, 1745 );
-    if (my_horse_tga.Ok())
-        dc.DrawBitmap( my_horse_tga, 30, 1760 );
-
-    dc.DrawText( _T("XPM handler"), 30, 1975 );
-    if (my_horse_xpm.Ok())
-        dc.DrawBitmap( my_horse_xpm, 30, 2000 );
-
-    // toucans
-    {
-        int x = 750, y = 10, yy = 170;
-
-        dc.DrawText(wxT("Original toucan"), x+50, y);
-        dc.DrawBitmap(my_toucan, x, y+15, true);
-        y += yy;
-        dc.DrawText(wxT("Flipped horizontally"), x+50, y);
-        dc.DrawBitmap(my_toucan_flipped_horiz, x, y+15, true);
-        y += yy;
-        dc.DrawText(wxT("Flipped vertically"), x+50, y);
-        dc.DrawBitmap(my_toucan_flipped_vert, x, y+15, true);
-        y += yy;
-        dc.DrawText(wxT("Flipped both h&v"), x+50, y);
-        dc.DrawBitmap(my_toucan_flipped_both, x, y+15, true);
-
-        y += yy;
-        dc.DrawText(wxT("In greyscale"), x+50, y);
-        dc.DrawBitmap(my_toucan_grey, x, y+15, true);
-
-        y += yy;
-        dc.DrawText(wxT("Toucan's head"), x+50, y);
-        dc.DrawBitmap(my_toucan_head, x, y+15, true);
-
-        y += yy;
-        dc.DrawText(wxT("Scaled with normal quality"), x+50, y);
-        dc.DrawBitmap(my_toucan_scaled_normal, x, y+15, true);
-
-        y += yy;
-        dc.DrawText(wxT("Scaled with high quality"), x+50, y);
-        dc.DrawBitmap(my_toucan_scaled_high, x, y+15, true);
-
-        y += yy;
-        dc.DrawText(wxT("Blured"), x+50, y);
-        dc.DrawBitmap(my_toucan_blur, x, y+15, true);
-    }
-
-    if (my_smile_xbm.Ok())
-    {
-        int x = 300, y = 1800;
-
-        dc.DrawText( _T("XBM bitmap"), x, y );
-        dc.DrawText( _T("(green on red)"), x, y + 15 );
-        dc.SetTextForeground( _T("GREEN") );
-        dc.SetTextBackground( _T("RED") );
-        dc.DrawBitmap( my_smile_xbm, x, y + 30 );
-
-        dc.SetTextForeground( *wxBLACK );
-        dc.DrawText( _T("After wxImage conversion"), x + 120, y );
-        dc.DrawText( _T("(red on white)"), x + 120, y + 15 );
-        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() );
-        dc.DrawBitmap( wxBitmap(i), x + 120, y + 30, true );
-        dc.SetTextForeground( *wxBLACK );
-    }
-
-
-    wxBitmap mono( 60,50,1 );
-    wxMemoryDC memdc;
-    memdc.SelectObject( mono );
-    memdc.SetPen( *wxBLACK_PEN );
-    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 );
-#endif
-    memdc.SetBrush( *wxBLACK_BRUSH );
-    memdc.DrawRectangle( 33,5,20,20 );
-    memdc.SetPen( *wxRED_PEN );
-    memdc.DrawLine( 5, 42, 50, 42 );
-    memdc.SelectObject( wxNullBitmap );
-
-    if (mono.Ok())
-    {
-        int x = 300, y = 1900;
-
-        dc.DrawText( _T("Mono bitmap"), x, y );
-        dc.DrawText( _T("(red on green)"), x, y + 15 );
-        dc.SetTextForeground( wxT("RED") );
-        dc.SetTextBackground( wxT("GREEN") );
-        dc.DrawBitmap( mono, x, y + 30 );
-
-        dc.SetTextForeground( *wxBLACK );
-        dc.DrawText( _T("After wxImage conversion"), x + 120, y );
-        dc.DrawText( _T("(red on white)"), x + 120, y + 15 );
-        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() );
-        dc.DrawBitmap( wxBitmap(i), x + 120, y + 30, true );
-        dc.SetTextForeground( *wxBLACK );
-    }
-
-    // For testing transparency
-    dc.SetBrush( *wxRED_BRUSH );
-    dc.DrawRectangle( 20, 2220, 560, 68 );
-
-    dc.DrawText(_T("XPM bitmap"), 30, 2230 );
-    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.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 );
-    if (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.Ok())
-        dc.DrawBitmap( my_horse_ico16, 230, 2330, true );
-
-    dc.DrawText( _T("ICO handler (best image)"), 430, 2290 );
-    if (my_horse_ico.Ok())
-        dc.DrawBitmap( my_horse_ico, 430, 2330, true );
-
-    dc.DrawText( _T("CUR handler"), 30, 2390 );
-    if (my_horse_cur.Ok())
-    {
-        dc.DrawBitmap( my_horse_cur, 30, 2420, true );
-        dc.SetPen (*wxRED_PEN);
-        dc.DrawLine (xH-10,yH,xH+10,yH);
-        dc.DrawLine (xH,yH-10,xH,yH+10);
-    }
-
-    dc.DrawText( _T("ANI handler"), 230, 2390 );
-    for ( int 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()
-{
-  wxBitmap bitmap( 300, 300 );
-
-  wxMemoryDC dc;
-
-  dc.SelectObject( bitmap );
-
-  dc.Clear();
-
-  dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) );
-  dc.SetTextForeground( wxT("RED") );
-  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.DrawRoundedRectangle( 20, 85, 200, 180, 20 );
-
-  wxImage original= bitmap.ConvertToImage();
-  wxImage anti( 150, 150 );
-
-  /* This is quite slow, but safe. Use wxImage::GetData() for speed instead. */
-
-  for (int y = 1; y < 149; y++)
-    for (int x = 1; x < 149; x++)
-    {
-       int red = original.GetRed( x*2, y*2 ) +
-                 original.GetRed( x*2-1, y*2 ) +
-                 original.GetRed( x*2, y*2+1 ) +
-                 original.GetRed( x*2+1, y*2+1 );
-       red = red/4;
-
-       int green = original.GetGreen( x*2, y*2 ) +
-                   original.GetGreen( x*2-1, y*2 ) +
-                   original.GetGreen( x*2, y*2+1 ) +
-                   original.GetGreen( x*2+1, y*2+1 );
-       green = green/4;
-
-       int blue = original.GetBlue( x*2, y*2 ) +
-                  original.GetBlue( x*2-1, y*2 ) +
-                  original.GetBlue( x*2, y*2+1 ) +
-                  original.GetBlue( x*2+1, y*2+1 );
-       blue = blue/4;
-       anti.SetRGB( x, y, (unsigned char)red, (unsigned char)green, (unsigned char)blue );
-    }
-  my_anti = wxBitmap(anti);
-}
-
+//-----------------------------------------------------------------------------
 // MyFrame
+//-----------------------------------------------------------------------------
 
 enum
 {
@@ -1128,17 +519,15 @@ enum
 };
 
 IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
-
 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_INFO,  MyFrame::OnImageInfo)
-  EVT_MENU    (ID_SHOWTHUMBNAIL, MyFrame::OnThumbnail)
+    EVT_MENU    (ID_ABOUT, MyFrame::OnAbout)
+    EVT_MENU    (ID_QUIT,  MyFrame::OnQuit)
+    EVT_MENU    (ID_NEW,   MyFrame::OnNewFrame)
+    EVT_MENU    (ID_INFO,  MyFrame::OnImageInfo)
+    EVT_MENU    (ID_SHOWTHUMBNAIL, MyFrame::OnThumbnail)
 #ifdef wxHAVE_RAW_BITMAP
-  EVT_MENU    (ID_SHOWRAW, MyFrame::OnTestRawBitmap)
+    EVT_MENU    (ID_SHOWRAW, MyFrame::OnTestRawBitmap)
 #endif
-
 #if wxUSE_CLIPBOARD
     EVT_MENU(wxID_COPY, MyFrame::OnCopy)
     EVT_MENU(wxID_PASTE, MyFrame::OnPaste)
@@ -1146,58 +535,58 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame()
-       : wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxImage sample"),
-                  wxPoint(20, 20), wxSize(950, 700) )
+    : wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxImage sample"),
+                wxPoint(20, 20), wxSize(950, 700) )
 {
-  wxMenuBar *menu_bar = new wxMenuBar();
+    wxMenuBar *menu_bar = new wxMenuBar();
 
-  wxMenu *menuImage = new wxMenu;
-  menuImage->Append( ID_NEW, _T("&Show any image...\tCtrl-O"));
-  menuImage->Append( ID_INFO, _T("Show image &information...\tCtrl-I"));
+    wxMenu *menuImage = new wxMenu;
+    menuImage->Append( ID_NEW, _T("&Show any image...\tCtrl-O"));
+    menuImage->Append( ID_INFO, _T("Show image &information...\tCtrl-I"));
 #ifdef wxHAVE_RAW_BITMAP
-  menuImage->AppendSeparator();
-  menuImage->Append( ID_SHOWRAW, _T("Test &raw bitmap...\tCtrl-R"));
+    menuImage->AppendSeparator();
+    menuImage->Append( ID_SHOWRAW, _T("Test &raw bitmap...\tCtrl-R"));
 #endif
-  menuImage->AppendSeparator();
-  menuImage->Append( ID_SHOWTHUMBNAIL, _T("Test &thumbnail...\tCtrl-T"),
-                    "Test scaling the image during load (try with JPEG)");
-  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"));
+    menuImage->AppendSeparator();
+    menuImage->Append( ID_SHOWTHUMBNAIL, _T("Test &thumbnail...\tCtrl-T"),
+                        "Test scaling the image during load (try with JPEG)");
+    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"));
+    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, wxID_ANY, wxPoint(0,0), wxSize(10,10) );
+    m_canvas = new MyCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) );
 
-  // 500 width * 2750 height
-  m_canvas->SetScrollbars( 10, 10, 50, 275 );
+    // 500 width * 2750 height
+    m_canvas->SetScrollbars( 10, 10, 50, 275 );
 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
 {
-  Close( true );
+    Close( true );
 }
 
 void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 {
-  (void)wxMessageBox( _T("wxImage demo\n")
-                      _T("Robert Roebling (c) 1998,2000"),
-                      _T("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 );
 }
 
 wxString MyFrame::LoadUserImage(wxImage& image)
@@ -1235,8 +624,8 @@ void MyFrame::OnImageInfo( wxCommandEvent &WXUNUSED(event) )
     {
         // TODO: show more information about the file
         wxString info = wxString::Format("Image size: %dx%d",
-                                         image.GetWidth(),
-                                         image.GetHeight());
+                                        image.GetWidth(),
+                                        image.GetHeight());
 
         int xres = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX),
             yres = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY);
@@ -1311,23 +700,6 @@ void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
 
 #endif // wxUSE_CLIPBOARD
 
-//-----------------------------------------------------------------------------
-// MyApp
-//-----------------------------------------------------------------------------
-
-bool MyApp::OnInit()
-{
-    if ( !wxApp::OnInit() )
-        return false;
-
-    wxInitAllImageHandlers();
-
-    wxFrame *frame = new MyFrame();
-    frame->Show( true );
-
-    return true;
-}
-
 void MyFrame::OnThumbnail( wxCommandEvent &WXUNUSED(event) )
 {
 #if wxUSE_FILEDLG
@@ -1361,3 +733,21 @@ void MyFrame::OnThumbnail( wxCommandEvent &WXUNUSED(event) )
 #endif // wxUSE_FILEDLG
 }
 
+//-----------------------------------------------------------------------------
+// MyApp
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_APP(MyApp)
+
+bool MyApp::OnInit()
+{
+    if ( !wxApp::OnInit() )
+        return false;
+
+    wxInitAllImageHandlers();
+
+    wxFrame *frame = new MyFrame();
+    frame->Show( true );
+
+    return true;
+}
index 5b55869297dd49aab44c246f764ad286f061195c..2ce11ed106f47d1c12d48122b74c406ad138766f 100644 (file)
@@ -252,6 +252,10 @@ LINK32=link.exe
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
+SOURCE=.\canvas.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\image.cpp\r
 # End Source File\r
 # Begin Source File\r
index 16449b6e667ac9f2767f48dd3f729fa988388cc2..7674310a99e346c33a731077eb2efcad91062b7e 100644 (file)
                        Name="Source Files"\r
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r
+                       <File\r
+                               RelativePath=".\canvas.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath=".\image.cpp">\r
                        </File>\r
index a8823cb0a4b139c78d0f47c310c5dc3d620ca7b5..19192889a9cc448f5595ffe803e90b2c70af725c 100644 (file)
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
+                       <File\r
+                               RelativePath=".\canvas.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\image.cpp"\r
                                >\r
index ca31fa36e694a79e28abdfb9ca233d490440c211..811c9d32347f82c0fa7b3fba2f979d57a363a21e 100644 (file)
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
+                       <File\r
+                               RelativePath=".\canvas.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\image.cpp"\r
                                >\r
index 4be10fa100f4b18281abc6fb587c008039e142b3..16b409d9a18eccb5e6b51f69f5b02a629620907d 100644 (file)
@@ -35,7 +35,8 @@ IMAGE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
        -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
 IMAGE_OBJECTS =  \
-       $(OBJS)\image_image.obj
+       $(OBJS)\image_image.obj \
+       $(OBJS)\image_canvas.obj
 
 ### Conditionally set variables: ###
 
@@ -240,6 +241,9 @@ data:
 $(OBJS)\image_image.obj: .\image.cpp
        $(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\image.cpp
 
+$(OBJS)\image_canvas.obj: .\canvas.cpp
+       $(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\canvas.cpp
+
 $(OBJS)\image_image.res: .\image.rc
        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\image.rc
 
index 320aed34b202b1f0f36e1eee98cefe6a9567423a..fe7d184529565a6ac8e6517516c4ff7e58f5caba 100644 (file)
@@ -29,6 +29,7 @@ IMAGE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
        $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 IMAGE_OBJECTS =  \
        $(OBJS)\image_image.o \
+       $(OBJS)\image_canvas.o \
        $(OBJS)\image_image_rc.o
 
 ### Conditionally set variables: ###
@@ -233,6 +234,9 @@ data:
 $(OBJS)\image_image.o: ./image.cpp
        $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\image_canvas.o: ./canvas.cpp
+       $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\image_image_rc.o: ./image.rc
        windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
 
index 2a7864a30186b7e5330e45ca7ba23be07366239e..ce970af9d3719f20f86fa8c8c2808e636b1c5f2a 100644 (file)
@@ -57,7 +57,8 @@ WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \
 IMAGE_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
        $(CXXFLAGS)
 IMAGE_OBJECTS =  \
-       image_image.o
+       image_image.o \
+       image_canvas.o
 
 ### Conditionally set variables: ###
 
@@ -103,6 +104,9 @@ image: $(IMAGE_OBJECTS)
 image_image.o: ./image.cpp
        $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<
 
+image_canvas.o: ./canvas.cpp
+       $(CXX) -c -o $@ $(IMAGE_CXXFLAGS) $(CPPDEPS) $<
+
 .PHONY: all install uninstall clean
 
 
index c8b322dd4c526f6b9be68f02df5c60319fb11a14..999c8c057e22d1ea046e4affd37b0627bf4d0bf4 100644 (file)
@@ -30,6 +30,7 @@ IMAGE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \
        $(CPPFLAGS) $(CXXFLAGS)
 IMAGE_OBJECTS =  \
        $(OBJS)\image_image.obj \
+       $(OBJS)\image_canvas.obj \
        $(OBJS)\image_image.res
 
 ### Conditionally set variables: ###
@@ -316,6 +317,9 @@ data:
 $(OBJS)\image_image.obj: .\image.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\image.cpp
 
+$(OBJS)\image_canvas.obj: .\canvas.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\canvas.cpp
+
 $(OBJS)\image_image.res: .\image.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\image.rc
 
index 5570c8ffb9ed9b2234fba25cf0759ac2181ca83b..37babe7474941caf04a88b902973bf4024ff671b 100644 (file)
@@ -227,7 +227,8 @@ IMAGE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
        -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
        $(CXXFLAGS)
 IMAGE_OBJECTS =  &
-       $(OBJS)\image_image.obj
+       $(OBJS)\image_image.obj &
+       $(OBJS)\image_canvas.obj
 
 
 all : $(OBJS)
@@ -265,6 +266,9 @@ data : .SYMBOLIC
 $(OBJS)\image_image.obj :  .AUTODEPEND .\image.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<
 
+$(OBJS)\image_canvas.obj :  .AUTODEPEND .\canvas.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $<
+
 $(OBJS)\image_image.res :  .AUTODEPEND .\image.rc
        wrc -q -ad -bt=nt -r -fo=$^@    -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<