X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d8bdf2dbc7c82e878038689db77e18556bad06c..2a45803fc3877afd0ae3ce356dfe216505165882:/samples/image/image.cpp diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 625b8dc375..e9de0eecc7 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -1,11 +1,14 @@ -/* - * 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: Francesco Montorsi +// Created: 1998 +// RCS-ID: $Id$ +// Copyright: (c) 1998-2005 Robert Roebling +// (c) 2005-2009 Vadim Zeitlin +// Licence: wxWindows licence +/////////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -15,57 +18,59 @@ #endif #ifndef WX_PRECOMP -#include "wx/wx.h" + #include "wx/wx.h" #endif #include "wx/image.h" #include "wx/file.h" +#include "wx/filename.h" +#include "wx/graphics.h" #include "wx/mstream.h" #include "wx/wfstream.h" +#include "wx/quantize.h" +#include "wx/scopedptr.h" +#include "wx/stopwatch.h" +#include "wx/versioninfo.h" + +#if wxUSE_CLIPBOARD + #include "wx/dataobj.h" + #include "wx/clipbrd.h" +#endif // wxUSE_CLIPBOARD + +#if defined(__WXMSW__) + #ifdef wxHAVE_RAW_BITMAP + #include "wx/rawbmp.h" + #endif +#endif -#include "smile.xbm" -#include "smile.xpm" +#if defined(__WXMAC__) || defined(__WXGTK__) + #define wxHAVE_RAW_BITMAP + #include "wx/rawbmp.h" +#endif +#include "canvas.h" -// derived classes +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../sample.xpm" +#endif -class MyFrame; -class MyApp; +// ============================================================================ +// declarations +// ============================================================================ -// MyCanvas +//----------------------------------------------------------------------------- +// MyApp +//----------------------------------------------------------------------------- -class MyCanvas: public wxScrolledWindow +class MyApp: public wxApp { public: - MyCanvas() {}; - 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_pcx; - wxBitmap *my_horse_pnm; - wxBitmap *my_horse_tiff; - wxBitmap *my_horse_xpm; - - wxBitmap *my_smile_xbm; - wxBitmap *my_square; - wxBitmap *my_anti; - -protected: - wxBitmap m_bmpSmileXpm; - wxIcon m_iconSmileXpm; - -private: - DECLARE_DYNAMIC_CLASS(MyCanvas) - DECLARE_EVENT_TABLE() + virtual bool OnInit(); }; +// ---------------------------------------------------------------------------- // MyFrame +// ---------------------------------------------------------------------------- class MyFrame: public wxFrame { @@ -74,498 +79,903 @@ public: void OnAbout( wxCommandEvent &event ); void OnNewFrame( wxCommandEvent &event ); + void OnImageInfo( wxCommandEvent &event ); + void OnThumbnail( wxCommandEvent &event ); + +#ifdef wxHAVE_RAW_BITMAP + void OnTestRawBitmap( wxCommandEvent &event ); +#endif // wxHAVE_RAW_BITMAP +#if wxUSE_GRAPHICS_CONTEXT + void OnTestGraphics(wxCommandEvent& event); +#endif // wxUSE_GRAPHICS_CONTEXT void OnQuit( wxCommandEvent &event ); +#if wxUSE_CLIPBOARD + void OnCopy(wxCommandEvent& event); + void OnPaste(wxCommandEvent& event); +#endif // wxUSE_CLIPBOARD + MyCanvas *m_canvas; private: + // ask user for the file name and try to load an image from it + // + // return the file path on success, empty string if we failed to load the + // image or were cancelled by user + static wxString LoadUserImage(wxImage& image); + + DECLARE_DYNAMIC_CLASS(MyFrame) DECLARE_EVENT_TABLE() }; +// ---------------------------------------------------------------------------- +// Frame used for showing a standalone image +// ---------------------------------------------------------------------------- + +enum +{ + ID_ROTATE_LEFT = wxID_HIGHEST+1, + ID_ROTATE_RIGHT, + ID_RESIZE, + ID_PAINT_BG +}; + class MyImageFrame : public wxFrame { public: - MyImageFrame(wxFrame *parent, const wxBitmap& bitmap) - : wxFrame(parent, -1, _T("Frame with image"), - wxDefaultPosition, wxDefaultSize, - wxCAPTION | wxSYSTEM_MENU), - m_bitmap(bitmap) + MyImageFrame(wxFrame *parent, const wxString& desc, const wxImage& image) { - SetClientSize(bitmap.GetWidth(), bitmap.GetHeight()); + Create(parent, desc, wxBitmap(image), image.GetImageCount(desc)); } - void OnPaint(wxPaintEvent& WXUNUSED(event)) + MyImageFrame(wxFrame *parent, const wxString& desc, const wxBitmap& bitmap) { - wxPaintDC dc( this ); - dc.DrawBitmap( m_bitmap, 0, 0 ); + Create(parent, desc, bitmap); } private: - wxBitmap m_bitmap; + bool Create(wxFrame *parent, + const wxString& desc, + const wxBitmap& bitmap, + int numImages = 1) + { + if ( !wxFrame::Create(parent, wxID_ANY, + wxString::Format(wxT("Image from %s"), desc), + wxDefaultPosition, wxDefaultSize, + wxDEFAULT_FRAME_STYLE | wxFULL_REPAINT_ON_RESIZE) ) + return false; + + m_bitmap = bitmap; + m_zoom = 1.; + + wxMenu *menu = new wxMenu; + menu->Append(wxID_SAVEAS); + menu->AppendSeparator(); + menu->AppendCheckItem(ID_PAINT_BG, wxT("&Paint background"), + "Uncheck this for transparent images"); + menu->AppendSeparator(); + menu->Append(ID_RESIZE, wxT("&Fit to window\tCtrl-F")); + menu->Append(wxID_ZOOM_IN, "Zoom &in\tCtrl-+"); + menu->Append(wxID_ZOOM_OUT, "Zoom &out\tCtrl--"); + menu->Append(wxID_ZOOM_100, "Reset zoom to &100%\tCtrl-1"); + menu->AppendSeparator(); + menu->Append(ID_ROTATE_LEFT, wxT("Rotate &left\tCtrl-L")); + menu->Append(ID_ROTATE_RIGHT, wxT("Rotate &right\tCtrl-R")); + + wxMenuBar *mbar = new wxMenuBar; + mbar->Append(menu, wxT("&Image")); + SetMenuBar(mbar); + + mbar->Check(ID_PAINT_BG, true); + + CreateStatusBar(2); + if ( numImages != 1 ) + SetStatusText(wxString::Format("%d images", numImages), 1); - DECLARE_EVENT_TABLE() -}; + SetClientSize(bitmap.GetWidth(), bitmap.GetHeight()); -// MyApp + UpdateStatusBar(); -class MyApp: public wxApp -{ -public: - virtual bool OnInit(); -}; + Show(); -// main program + return true; + } -IMPLEMENT_APP(MyApp) + void OnEraseBackground(wxEraseEvent& WXUNUSED(event)) + { + // do nothing here to be able to see how transparent images are shown + } -// MyCanvas + void OnPaint(wxPaintEvent& WXUNUSED(event)) + { + wxPaintDC dc(this); -IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow) + if ( GetMenuBar()->IsChecked(ID_PAINT_BG) ) + dc.Clear(); -BEGIN_EVENT_TABLE(MyImageFrame, wxFrame) - EVT_PAINT(MyImageFrame::OnPaint) -END_EVENT_TABLE() + dc.SetUserScale(m_zoom, m_zoom); -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) - EVT_PAINT(MyCanvas::OnPaint) -END_EVENT_TABLE() + const wxSize size = GetClientSize(); + dc.DrawBitmap + ( + m_bitmap, + dc.DeviceToLogicalX((size.x - m_zoom*m_bitmap.GetWidth())/2), + dc.DeviceToLogicalY((size.y - m_zoom*m_bitmap.GetHeight())/2), + true /* use mask */ + ); + } -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) + void OnSave(wxCommandEvent& WXUNUSED(event)) + { +#if wxUSE_FILEDLG + wxImage image = m_bitmap.ConvertToImage(); + + wxString savefilename = wxFileSelector( wxT("Save Image"), + wxEmptyString, + wxEmptyString, + wxEmptyString, + wxT("BMP files (*.bmp)|*.bmp|") +#if wxUSE_LIBPNG + wxT("PNG files (*.png)|*.png|") #endif -{ - my_horse_png = (wxBitmap*) NULL; - my_horse_jpeg = (wxBitmap*) NULL; - my_horse_gif = (wxBitmap*) NULL; - my_horse_bmp = (wxBitmap*) NULL; - my_horse_pcx = (wxBitmap*) NULL; - my_horse_pnm = (wxBitmap*) NULL; - my_horse_tiff = (wxBitmap*) NULL; - my_horse_xpm = (wxBitmap*) NULL; - my_smile_xbm = (wxBitmap*) NULL; - my_square = (wxBitmap*) NULL; - my_anti = (wxBitmap*) NULL; - - SetBackgroundColour(* wxWHITE); - - wxBitmap bitmap( 100, 100 ); - - wxMemoryDC dc; - dc.SelectObject( bitmap ); - dc.SetBrush( wxBrush( "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("./horse.png") ) - dir = "./"; - else if ( wxFile::Exists("../horse.png") ) - dir = "../"; - else - wxLogWarning("Can't find image files in either '.' or '..'!"); - - wxImage image = bitmap.ConvertToImage(); - +#if wxUSE_LIBJPEG + wxT("JPEG files (*.jpg)|*.jpg|") +#endif +#if wxUSE_GIF + wxT("GIF files (*.gif)|*.gif|") +#endif +#if wxUSE_LIBTIFF + wxT("TIFF files (*.tif)|*.tif|") +#endif +#if wxUSE_PCX + wxT("PCX files (*.pcx)|*.pcx|") +#endif +#if wxUSE_XPM + wxT("X PixMap files (*.xpm)|*.xpm|") +#endif + wxT("ICO files (*.ico)|*.ico|") + wxT("CUR files (*.cur)|*.cur"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT, + this); + + if ( savefilename.empty() ) + return; + + wxString extension; + wxFileName::SplitPath(savefilename, NULL, NULL, &extension); + + bool saved = false; + if ( extension == wxT("bmp") ) + { + 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[] = + { + wxT("1 bpp color"), + wxT("1 bpp B&W"), + wxT("4 bpp color"), + wxT("8 bpp color"), + wxT("8 bpp greyscale"), + wxT("8 bpp red"), + wxT("8 bpp own palette"), + wxT("24 bpp") + }; + + int bppselection = wxGetSingleChoiceIndex(wxT("Set BMP BPP"), + wxT("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; + } + } + } #if wxUSE_LIBPNG - if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG )) - wxLogError("Can't save file"); + else if ( extension == wxT("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[] = + { + wxT("Colour 8bpp"), + wxT("Colour 16bpp"), + wxT("Grey 8bpp"), + wxT("Grey 16bpp"), + wxT("Grey red 8bpp"), + wxT("Grey red 16bpp"), + }; + + int sel = wxGetSingleChoiceIndex(wxT("Set PNG format"), + wxT("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); + + // these values are taken from OptiPNG with -o3 switch + const wxString compressionChoices[] = + { + wxT("compression = 9, memory = 8, strategy = 0, filter = 0"), + wxT("compression = 9, memory = 9, strategy = 0, filter = 0"), + wxT("compression = 9, memory = 8, strategy = 1, filter = 0"), + wxT("compression = 9, memory = 9, strategy = 1, filter = 0"), + wxT("compression = 1, memory = 8, strategy = 2, filter = 0"), + wxT("compression = 1, memory = 9, strategy = 2, filter = 0"), + wxT("compression = 9, memory = 8, strategy = 0, filter = 5"), + wxT("compression = 9, memory = 9, strategy = 0, filter = 5"), + wxT("compression = 9, memory = 8, strategy = 1, filter = 5"), + wxT("compression = 9, memory = 9, strategy = 1, filter = 5"), + wxT("compression = 1, memory = 8, strategy = 2, filter = 5"), + wxT("compression = 1, memory = 9, strategy = 2, filter = 5"), + }; + + int sel = wxGetSingleChoiceIndex(wxT("Select compression option (Cancel to use default)\n"), + wxT("PNG Compression Options"), + WXSIZEOF(compressionChoices), + compressionChoices, + this); + if (sel != -1) + { + const int zc[] = {9, 9, 9, 9, 1, 1, 9, 9, 9, 9, 1, 1}; + const int zm[] = {8, 9, 8, 9, 8, 9, 8, 9, 8, 9, 8, 9}; + const int zs[] = {0, 0, 1, 1, 2, 2, 0, 0, 1, 1, 2, 2}; + const int f[] = {0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8}; + + image.SetOption(wxIMAGE_OPTION_PNG_COMPRESSION_LEVEL , zc[sel]); + image.SetOption(wxIMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL , zm[sel]); + image.SetOption(wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY , zs[sel]); + image.SetOption(wxIMAGE_OPTION_PNG_FILTER , f[sel]); + image.SetOption(wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE, 1048576); // 1 MB + } + } + } +#endif // wxUSE_LIBPNG + else if ( extension == wxT("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: + saved = image.SaveFile(savefilename, wxBITMAP_TYPE_CUR); + } + + if ( !saved ) + { + // This one guesses image format from filename extension + // (it may fail if the extension is not recognized): + image.SaveFile(savefilename); + } +#endif // wxUSE_FILEDLG + } - image.Destroy(); + void OnResize(wxCommandEvent& WXUNUSED(event)) + { + wxImage img(m_bitmap.ConvertToImage()); - image.LoadFile( dir + wxString("test.png") ); - my_square = new wxBitmap( image ); + const wxSize size = GetClientSize(); + img.Rescale(size.x, size.y, wxIMAGE_QUALITY_HIGH); + m_bitmap = wxBitmap(img); - image.Destroy(); + UpdateStatusBar(); + } - if ( !image.LoadFile( dir + wxString("horse.png")) ) - wxLogError("Can't load PNG image"); - else - my_horse_png = new wxBitmap( image ); -#endif // wxUSE_LIBPNG + void OnZoom(wxCommandEvent& event) + { + if ( event.GetId() == wxID_ZOOM_IN ) + m_zoom *= 1.2; + else if ( event.GetId() == wxID_ZOOM_OUT ) + m_zoom /= 1.2; + else // wxID_ZOOM_100 + m_zoom = 1.; + + UpdateStatusBar(); + } -#if wxUSE_LIBJPEG - image.Destroy(); + void OnRotate(wxCommandEvent& event) + { + double angle = 5; + if ( event.GetId() == ID_ROTATE_LEFT ) + angle = -angle; - if ( !image.LoadFile( dir + wxString("horse.jpg")) ) - wxLogError("Can't load JPG image"); - else - my_horse_jpeg = new wxBitmap( image ); -#endif // wxUSE_LIBJPEG + wxImage img(m_bitmap.ConvertToImage()); + img = img.Rotate(angle, wxPoint(img.GetWidth() / 2, img.GetHeight() / 2)); + if ( !img.IsOk() ) + { + wxLogWarning(wxT("Rotation failed")); + return; + } -#if wxUSE_GIF - image.Destroy(); + m_bitmap = wxBitmap(img); - if ( !image.LoadFile( dir + wxString("horse.gif")) ) - wxLogError("Can't load GIF image"); - else - my_horse_gif = new wxBitmap( image ); -#endif + UpdateStatusBar(); + } -#if wxUSE_PCX - image.Destroy(); + void UpdateStatusBar() + { + wxLogStatus(this, wxT("Image size: (%d, %d), zoom %.2f"), + m_bitmap.GetWidth(), + m_bitmap.GetHeight(), + m_zoom); + Refresh(); + } - if ( !image.LoadFile( dir + wxString("horse.pcx"), wxBITMAP_TYPE_PCX ) ) - wxLogError("Can't load PCX image"); - else - my_horse_pcx = new wxBitmap( image ); -#endif + wxBitmap m_bitmap; + double m_zoom; - image.Destroy(); + DECLARE_EVENT_TABLE() +}; - if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) ) - wxLogError("Can't load BMP image"); - else - my_horse_bmp = new wxBitmap( image ); +#ifdef wxHAVE_RAW_BITMAP -#if wxUSE_XPM - image.Destroy(); +#include "wx/rawbmp.h" - if ( !image.LoadFile( dir + wxString("horse.xpm"), wxBITMAP_TYPE_XPM ) ) - wxLogError("Can't load XPM image"); - else - my_horse_xpm = new wxBitmap( image ); +class MyRawBitmapFrame : public wxFrame +{ +public: + enum + { + BORDER = 15, + SIZE = 150, + REAL_SIZE = SIZE - 2*BORDER + }; + + MyRawBitmapFrame(wxFrame *parent) + : wxFrame(parent, wxID_ANY, wxT("Raw bitmaps (how exciting)")), + m_bitmap(SIZE, SIZE, 24), + m_alphaBitmap(SIZE, SIZE, 32) + { + SetClientSize(SIZE, SIZE*2+25); - if ( !image.SaveFile( dir + wxString("test.xpm"), wxBITMAP_TYPE_XPM )) - wxLogError("Can't save file"); -#endif + InitAlphaBitmap(); + InitBitmap(); -#if wxUSE_PNM - image.Destroy(); + } - if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) ) - wxLogError("Can't load PNM image"); - else - my_horse_pnm = new wxBitmap( image ); -#endif + void InitAlphaBitmap() + { + // First, clear the whole bitmap by making it alpha + { + wxAlphaPixelData data( m_alphaBitmap, wxPoint(0,0), wxSize(SIZE, SIZE) ); + if ( !data ) + { + wxLogError(wxT("Failed to gain raw access to bitmap data")); + return; + } + wxAlphaPixelData::Iterator p(data); + for ( int y = 0; y < SIZE; ++y ) + { + wxAlphaPixelData::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 + wxAlphaPixelData data(m_alphaBitmap, wxPoint(BORDER, BORDER), + wxSize(REAL_SIZE, REAL_SIZE)); + if ( !data ) + { + wxLogError(wxT("Failed to gain raw access to bitmap data")); + return; + } + + wxAlphaPixelData::Iterator p(data); + + for ( int y = 0; y < REAL_SIZE; ++y ) + { + wxAlphaPixelData::Iterator rowStart = p; + + int r = y < REAL_SIZE/3 ? 255 : 0, + g = (REAL_SIZE/3 <= y) && (y < 2*(REAL_SIZE/3)) ? 255 : 0, + b = 2*(REAL_SIZE/3) <= y ? 255 : 0; + + for ( int x = 0; x < REAL_SIZE; ++x ) + { + // note that RGB must be premultiplied by alpha + unsigned a = (wxAlphaPixelData::Iterator::ChannelType)((x*255.)/REAL_SIZE); + p.Red() = r * a / 256; + p.Green() = g * a / 256; + p.Blue() = b * a / 256; + p.Alpha() = a; + + ++p; // same as p.OffsetX(1) + } + + p = rowStart; + p.OffsetY(data, 1); + } + } -#if wxUSE_LIBTIFF - image.Destroy(); + void InitBitmap() + { + // draw some colourful stripes without alpha + wxNativePixelData data(m_bitmap); + if ( !data ) + { + wxLogError(wxT("Failed to gain raw access to bitmap data")); + return; + } + + wxNativePixelData::Iterator p(data); + for ( int y = 0; y < SIZE; ++y ) + { + wxNativePixelData::Iterator rowStart = p; + + int r = y < SIZE/3 ? 255 : 0, + g = (SIZE/3 <= y) && (y < 2*(SIZE/3)) ? 255 : 0, + b = 2*(SIZE/3) <= y ? 255 : 0; + + for ( int x = 0; x < SIZE; ++x ) + { + p.Red() = r; + p.Green() = g; + p.Blue() = b; + ++p; // same as p.OffsetX(1) + } + + p = rowStart; + p.OffsetY(data, 1); + } + } - if ( !image.LoadFile( dir + wxString("horse.tif"), wxBITMAP_TYPE_TIF ) ) - wxLogError("Can't load TIFF image"); - else - my_horse_tiff = new wxBitmap( image ); -#endif + void OnPaint(wxPaintEvent& WXUNUSED(event)) + { + wxPaintDC dc( this ); + dc.DrawText(wxT("This is alpha and raw bitmap test"), 0, BORDER); + dc.DrawText(wxT("This is alpha and raw bitmap test"), 0, SIZE/2 - BORDER); + dc.DrawText(wxT("This is alpha and raw bitmap test"), 0, SIZE - 2*BORDER); + dc.DrawBitmap( m_alphaBitmap, 0, 0, true /* use mask */ ); - CreateAntiAliasedBitmap(); + dc.DrawText(wxT("Raw bitmap access without alpha"), 0, SIZE+5); + dc.DrawBitmap( m_bitmap, 0, SIZE+5+dc.GetCharHeight()); + } - my_smile_xbm = new wxBitmap( (const char*)smile_bits, smile_width, - smile_height, 1 ); +private: + wxBitmap m_bitmap; + wxBitmap m_alphaBitmap; -#if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW - // demonstrates XPM automatically using the mask when saving - if ( m_bmpSmileXpm.Ok() ) - m_bmpSmileXpm.SaveFile("saved.xpm", wxBITMAP_TYPE_XPM); -#endif -} + DECLARE_EVENT_TABLE() +}; -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_pcx; - delete my_horse_tiff; - delete my_horse_xpm; - delete my_smile_xbm; - delete my_square; - delete my_anti; -} +#endif // wxHAVE_RAW_BITMAP -void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) -{ - wxPaintDC dc( this ); - PrepareDC( dc ); - dc.DrawText( "Loaded image", 30, 10 ); - if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 ); +// ============================================================================ +// implementations +// ============================================================================ - dc.DrawText( "Drawn directly", 150, 10 ); - dc.SetBrush( wxBrush( "orange", wxSOLID ) ); - dc.SetPen( *wxBLACK_PEN ); - dc.DrawRectangle( 150, 30, 100, 100 ); - dc.SetBrush( *wxWHITE_BRUSH ); - dc.DrawRectangle( 170, 50, 60, 60 ); +//----------------------------------------------------------------------------- +// MyImageFrame +//----------------------------------------------------------------------------- - if (my_anti && my_anti->Ok()) - dc.DrawBitmap( *my_anti, 280, 30 ); +BEGIN_EVENT_TABLE(MyImageFrame, wxFrame) + EVT_ERASE_BACKGROUND(MyImageFrame::OnEraseBackground) + EVT_PAINT(MyImageFrame::OnPaint) - dc.DrawText( "PNG handler", 30, 135 ); - if (my_horse_png && my_horse_png->Ok()) - { - dc.DrawBitmap( *my_horse_png, 30, 150 ); - wxRect rect(0,0,100,100); - wxBitmap sub( my_horse_png->GetSubBitmap(rect) ); - dc.DrawText( "GetSubBitmap()", 280, 190 ); - dc.DrawBitmap( sub, 280, 210 ); - } + EVT_MENU(wxID_SAVEAS, MyImageFrame::OnSave) + EVT_MENU_RANGE(ID_ROTATE_LEFT, ID_ROTATE_RIGHT, MyImageFrame::OnRotate) + EVT_MENU(ID_RESIZE, MyImageFrame::OnResize) - dc.DrawText( "JPEG handler", 30, 365 ); - if (my_horse_jpeg && my_horse_jpeg->Ok()) - dc.DrawBitmap( *my_horse_jpeg, 30, 380 ); + EVT_MENU(wxID_ZOOM_IN, MyImageFrame::OnZoom) + EVT_MENU(wxID_ZOOM_OUT, MyImageFrame::OnZoom) + EVT_MENU(wxID_ZOOM_100, MyImageFrame::OnZoom) +END_EVENT_TABLE() - dc.DrawText( "GIF handler", 30, 595 ); - if (my_horse_gif && my_horse_gif->Ok()) - dc.DrawBitmap( *my_horse_gif, 30, 610 ); +//----------------------------------------------------------------------------- +// MyRawBitmapFrame +//----------------------------------------------------------------------------- - dc.DrawText( "PCX handler", 30, 825 ); - if (my_horse_pcx && my_horse_pcx->Ok()) - dc.DrawBitmap( *my_horse_pcx, 30, 840 ); +#ifdef wxHAVE_RAW_BITMAP - dc.DrawText( "BMP handler", 30, 1055 ); - if (my_horse_bmp && my_horse_bmp->Ok()) - dc.DrawBitmap( *my_horse_bmp, 30, 1070 ); +BEGIN_EVENT_TABLE(MyRawBitmapFrame, wxFrame) + EVT_PAINT(MyRawBitmapFrame::OnPaint) +END_EVENT_TABLE() - dc.DrawText( "PNM handler", 30, 1285 ); - if (my_horse_pnm && my_horse_pnm->Ok()) - dc.DrawBitmap( *my_horse_pnm, 30, 1300 ); +#endif // wxHAVE_RAW_BITMAP - dc.DrawText( "TIFF handler", 30, 1515 ); - if (my_horse_tiff && my_horse_tiff->Ok()) - dc.DrawBitmap( *my_horse_tiff, 30, 1530 ); +//----------------------------------------------------------------------------- +// MyFrame +//----------------------------------------------------------------------------- - dc.DrawText( "XPM handler", 30, 1745 ); - if (my_horse_xpm && my_horse_xpm->Ok()) - dc.DrawBitmap( *my_horse_xpm, 30, 1760 ); +enum +{ + ID_QUIT = wxID_EXIT, + ID_ABOUT = wxID_ABOUT, + ID_NEW = 100, + ID_INFO, + ID_SHOWRAW, + ID_GRAPHICS, + ID_SHOWTHUMBNAIL +}; - if (my_smile_xbm && my_smile_xbm->Ok()) - { - dc.DrawText( "XBM bitmap", 30, 1975 ); - dc.DrawText( "(green on red)", 30, 1990 ); - dc.SetTextForeground( "GREEN" ); - dc.SetTextBackground( "RED" ); - dc.DrawBitmap( *my_smile_xbm, 30, 2010 ); - - dc.SetTextForeground( "BLACK" ); - dc.DrawText( "After wxImage conversion", 150, 1975 ); - dc.DrawText( "(red on white)", 150, 1990 ); - dc.SetTextForeground( "RED" ); - wxImage i = my_smile_xbm->ConvertToImage(); - i.SetMaskColour( 255, 255, 255 ); - i.Replace( 0, 0, 0, - wxRED_PEN->GetColour().Red(), - wxRED_PEN->GetColour().Green(), - wxRED_PEN->GetColour().Blue() ); - dc.DrawBitmap( i.ConvertToBitmap(), 150, 2010, TRUE ); - dc.SetTextForeground( "BLACK" ); - } +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) +#ifdef wxHAVE_RAW_BITMAP + EVT_MENU (ID_SHOWRAW, MyFrame::OnTestRawBitmap) +#endif +#if wxUSE_GRAPHICS_CONTEXT + EVT_MENU (ID_GRAPHICS, MyFrame::OnTestGraphics) +#endif // wxUSE_GRAPHICS_CONTEXT +#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, wxID_ANY, wxT("wxImage sample"), + wxPoint(20, 20), wxSize(950, 700) ) +{ + SetIcon(wxICON(sample)); - 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 ); - memdc.DrawText( "Hi!", 5, 5 ); - 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()) - { - dc.DrawText( "Mono bitmap", 30, 2095 ); - dc.DrawText( "(red on green)", 30, 2110 ); - dc.SetTextForeground( "RED" ); - dc.SetTextBackground( "GREEN" ); - dc.DrawBitmap( mono, 30, 2130 ); - - dc.SetTextForeground( "BLACK" ); - dc.DrawText( "After wxImage conversion", 150, 2095 ); - dc.DrawText( "(red on white)", 150, 2110 ); - dc.SetTextForeground( "RED" ); - wxImage i = mono.ConvertToImage(); - i.SetMaskColour( 255,255,255 ); - i.Replace( 0,0,0, - wxRED_PEN->GetColour().Red(), - wxRED_PEN->GetColour().Green(), - wxRED_PEN->GetColour().Blue() ); - dc.DrawBitmap( i.ConvertToBitmap(), 150, 2130, TRUE ); - dc.SetTextForeground( "BLACK" ); - } + wxMenuBar *menu_bar = new wxMenuBar(); - dc.DrawText("XPM bitmap", 30, 2230); - if ( m_bmpSmileXpm.Ok() ) - { - dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, TRUE); - } + wxMenu *menuImage = new wxMenu; + menuImage->Append( ID_NEW, wxT("&Show any image...\tCtrl-O")); + menuImage->Append( ID_INFO, wxT("Show image &information...\tCtrl-I")); +#ifdef wxHAVE_RAW_BITMAP + menuImage->AppendSeparator(); + menuImage->Append( ID_SHOWRAW, wxT("Test &raw bitmap...\tCtrl-R")); +#endif +#if wxUSE_GRAPHICS_CONTEXT + menuImage->AppendSeparator(); + menuImage->Append(ID_GRAPHICS, "Test &graphics context...\tCtrl-G"); +#endif // wxUSE_GRAPHICS_CONTEXT + menuImage->AppendSeparator(); + menuImage->Append( ID_SHOWTHUMBNAIL, wxT("Test &thumbnail...\tCtrl-T"), + "Test scaling the image during load (try with JPEG)"); + menuImage->AppendSeparator(); + menuImage->Append( ID_ABOUT, wxT("&About\tF1")); + menuImage->AppendSeparator(); + menuImage->Append( ID_QUIT, wxT("E&xit\tCtrl-Q")); + menu_bar->Append(menuImage, wxT("&Image")); + +#if wxUSE_CLIPBOARD + wxMenu *menuClipboard = new wxMenu; + menuClipboard->Append(wxID_COPY, wxT("&Copy test image\tCtrl-C")); + menuClipboard->Append(wxID_PASTE, wxT("&Paste image\tCtrl-V")); + menu_bar->Append(menuClipboard, wxT("&Clipboard")); +#endif // wxUSE_CLIPBOARD + + SetMenuBar( menu_bar ); + +#if wxUSE_STATUSBAR + 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) ); + + // 500 width * 2750 height + m_canvas->SetScrollbars( 10, 10, 50, 275 ); + m_canvas->SetCursor(wxImage("cursor.png")); +} - dc.DrawText("XPM icon", 150, 2230); - if ( m_iconSmileXpm.Ok() ) - { - dc.DrawIcon(m_iconSmileXpm, 150, 2250); - } +void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) +{ + Close( true ); } -void MyCanvas::CreateAntiAliasedBitmap() +#if wxUSE_ZLIB && wxUSE_STREAMS +#include "wx/zstream.h" +#endif + +void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) ) { - wxBitmap bitmap( 300, 300 ); + wxArrayString array; + + array.Add("wxImage demo"); + array.Add("(c) Robert Roebling 1998-2005"); + array.Add("(c) Vadim Zeitlin 2005-2009"); - wxMemoryDC dc; + array.Add(wxEmptyString); + array.Add("Version of the libraries used:"); - dc.SelectObject( bitmap ); +#if wxUSE_LIBPNG + array.Add(wxPNGHandler::GetLibraryVersionInfo().ToString()); +#endif +#if wxUSE_LIBJPEG + array.Add(wxJPEGHandler::GetLibraryVersionInfo().ToString()); +#endif +#if wxUSE_LIBTIFF + array.Add(wxTIFFHandler::GetLibraryVersionInfo().ToString()); +#endif +#if wxUSE_ZLIB && wxUSE_STREAMS + // zlib is used by libpng + array.Add(wxGetZlibVersionInfo().ToString()); +#endif + (void)wxMessageBox( wxJoin(array, '\n'), + "About wxImage Demo", + wxICON_INFORMATION | wxOK ); +} - dc.Clear(); +wxString MyFrame::LoadUserImage(wxImage& image) +{ + wxString filename; - dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) ); - dc.SetTextForeground( "RED" ); - dc.DrawText( "This is anti-aliased Text.", 20, 20 ); - dc.DrawText( "And a Rectangle.", 20, 60 ); +#if wxUSE_FILEDLG + filename = wxLoadFileSelector(wxT("image"), wxEmptyString); + if ( !filename.empty() ) + { + if ( !image.LoadFile(filename) ) + { + wxLogError(wxT("Couldn't load image from '%s'."), filename.c_str()); - dc.SetBrush( *wxRED_BRUSH ); - dc.SetPen( *wxTRANSPARENT_PEN ); - dc.DrawRoundedRectangle( 20, 100, 200, 180, 20 ); + return wxEmptyString; + } + } +#endif // wxUSE_FILEDLG - wxImage original= bitmap.ConvertToImage(); - wxImage anti( 150, 150 ); + return filename; +} - /* This is quite slow, but safe. Use wxImage::GetData() for speed instead. */ +void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) ) +{ + wxImage image; + wxString filename = LoadUserImage(image); + if ( !filename.empty() ) + new MyImageFrame(this, filename, image); +} - for (int y = 1; y < 149; y++) - for (int x = 1; x < 149; x++) +void MyFrame::OnImageInfo( wxCommandEvent &WXUNUSED(event) ) +{ + wxImage image; + if ( !LoadUserImage(image).empty() ) { - 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, red, green, blue ); + // TODO: show more information about the file + wxString info = wxString::Format("Image size: %dx%d", + image.GetWidth(), + image.GetHeight()); + + int xres = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX), + yres = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY); + if ( xres || yres ) + { + info += wxString::Format("\nResolution: %dx%d", xres, yres); + switch ( image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONUNIT) ) + { + default: + wxFAIL_MSG( "unknown image resolution units" ); + // fall through + + case wxIMAGE_RESOLUTION_NONE: + info += " in default units"; + break; + + case wxIMAGE_RESOLUTION_INCHES: + info += " in"; + break; + + case wxIMAGE_RESOLUTION_CM: + info += " cm"; + break; + } + } + + wxLogMessage("%s", info); } - my_anti = new wxBitmap( anti.ConvertToBitmap() ); } -// MyFrame +#ifdef wxHAVE_RAW_BITMAP -const int ID_QUIT = 108; -const int ID_ABOUT = 109; -const int ID_NEW = 110; +void MyFrame::OnTestRawBitmap( wxCommandEvent &WXUNUSED(event) ) +{ + (new MyRawBitmapFrame(this))->Show(); +} -IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame ) +#endif // wxHAVE_RAW_BITMAP -BEGIN_EVENT_TABLE(MyFrame,wxFrame) - EVT_MENU (ID_ABOUT, MyFrame::OnAbout) - EVT_MENU (ID_QUIT, MyFrame::OnQuit) - EVT_MENU (ID_NEW, MyFrame::OnNewFrame) -END_EVENT_TABLE() +#if wxUSE_GRAPHICS_CONTEXT -MyFrame::MyFrame() - : wxFrame( (wxFrame *)NULL, -1, "wxImage sample", - wxPoint(20,20), wxSize(470,360) ) +class MyGraphicsFrame : public wxFrame { - wxMenu *file_menu = new wxMenu(); - file_menu->Append( ID_NEW, "&Show image..."); - file_menu->AppendSeparator(); - file_menu->Append( ID_ABOUT, "&About..."); - file_menu->AppendSeparator(); - file_menu->Append( ID_QUIT, "E&xit"); +public: + enum + { + WIDTH = 256, + HEIGHT = 90 + }; - wxMenuBar *menu_bar = new wxMenuBar(); - menu_bar->Append(file_menu, "&File"); + MyGraphicsFrame(wxWindow* parent) : + wxFrame(parent, wxID_ANY, "Graphics context test"), + m_image(WIDTH, HEIGHT, false) + { + // Create a test image: it has 3 horizontal primary colour bands with + // alpha increasing from left to right. + m_image.SetAlpha(); + unsigned char* alpha = m_image.GetAlpha(); + unsigned char* data = m_image.GetData(); + + for ( int y = 0; y < HEIGHT; y++ ) + { + unsigned char r = 0, + g = 0, + b = 0; + if ( y < HEIGHT/3 ) + r = 0xff; + else if ( y < (2*HEIGHT)/3 ) + g = 0xff; + else + b = 0xff; + + for ( int x = 0; x < WIDTH; x++ ) + { + *alpha++ = x; + *data++ = r; + *data++ = g; + *data++ = b; + } + } + + m_bitmap = wxBitmap(m_image); + + Connect(wxEVT_PAINT, wxPaintEventHandler(MyGraphicsFrame::OnPaint)); + + Show(); + } - SetMenuBar( menu_bar ); +private: + void OnPaint(wxPaintEvent& WXUNUSED(event)) + { + wxPaintDC dc(this); + wxScopedPtr gc(wxGraphicsContext::Create(dc)); + wxGraphicsBitmap gb(gc->CreateBitmapFromImage(m_image)); + + gc->SetFont(*wxNORMAL_FONT, *wxBLACK); + gc->DrawText("Bitmap", 0, HEIGHT/2); + gc->DrawBitmap(m_bitmap, 0, 0, WIDTH, HEIGHT); + + wxGraphicsFont gf = gc->CreateFont(wxNORMAL_FONT->GetPixelSize().y, ""); + gc->SetFont(gf); + gc->DrawText("Graphics bitmap", 0, (3*HEIGHT)/2); + gc->DrawBitmap(gb, 0, HEIGHT, WIDTH, HEIGHT); + } - CreateStatusBar(2); - int widths[] = { -1, 100 }; - SetStatusWidths( 2, widths ); + wxImage m_image; + wxBitmap m_bitmap; - m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) ); + wxDECLARE_NO_COPY_CLASS(MyGraphicsFrame); +}; - // 500 width * 2100 height - m_canvas->SetScrollbars( 10, 10, 50, 220 ); +void MyFrame::OnTestGraphics(wxCommandEvent& WXUNUSED(event)) +{ + new MyGraphicsFrame(this); } -void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) +#endif // wxUSE_GRAPHICS_CONTEXT + +#if wxUSE_CLIPBOARD + +void MyFrame::OnCopy(wxCommandEvent& WXUNUSED(event)) { - Close( TRUE ); + wxBitmapDataObject *dobjBmp = new wxBitmapDataObject; + dobjBmp->SetBitmap(m_canvas->my_horse_png); + + wxTheClipboard->Open(); + + if ( !wxTheClipboard->SetData(dobjBmp) ) + { + wxLogError(wxT("Failed to copy bitmap to clipboard")); + } + + wxTheClipboard->Close(); } -void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) ) +void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event)) { - (void)wxMessageBox( "wxImage demo\n" - "Robert Roebling (c) 1998,2000", - "About wxImage Demo", wxICON_INFORMATION | wxOK ); + wxBitmapDataObject dobjBmp; + + wxTheClipboard->Open(); + if ( !wxTheClipboard->GetData(dobjBmp) ) + { + wxLogMessage(wxT("No bitmap data in the clipboard")); + } + else + { + new MyImageFrame(this, wxT("Clipboard"), dobjBmp.GetBitmap()); + } + wxTheClipboard->Close(); } -void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) ) +#endif // wxUSE_CLIPBOARD + +void MyFrame::OnThumbnail( wxCommandEvent &WXUNUSED(event) ) { - wxString filename = wxFileSelector(_T("Select image file")); - if ( !filename ) +#if wxUSE_FILEDLG + wxString filename = wxLoadFileSelector(wxT("image"), wxEmptyString, wxEmptyString, this); + if ( filename.empty() ) return; + static const int THUMBNAIL_WIDTH = 320; + static const int THUMBNAIL_HEIGHT = 240; + wxImage image; + image.SetOption(wxIMAGE_OPTION_MAX_WIDTH, THUMBNAIL_WIDTH); + image.SetOption(wxIMAGE_OPTION_MAX_HEIGHT, THUMBNAIL_HEIGHT); + + wxStopWatch sw; if ( !image.LoadFile(filename) ) { - wxLogError(_T("Couldn't load image from '%s'."), filename.c_str()); - + wxLogError(wxT("Couldn't load image from '%s'."), filename.c_str()); return; } - (new MyImageFrame(this, image.ConvertToBitmap()))->Show(); + int origWidth = image.GetOptionInt( wxIMAGE_OPTION_ORIGINAL_WIDTH ); + int origHeight = image.GetOptionInt( wxIMAGE_OPTION_ORIGINAL_HEIGHT ); + + const long loadTime = sw.Time(); + + MyImageFrame * const frame = new MyImageFrame(this, filename, image); + wxLogStatus(frame, "Loaded \"%s\" in %ldms; original size was (%d, %d)", + filename, loadTime, origWidth, origHeight); +#else + wxLogError( wxT("Couldn't create file selector dialog") ); + return; +#endif // wxUSE_FILEDLG } //----------------------------------------------------------------------------- // MyApp //----------------------------------------------------------------------------- +IMPLEMENT_APP(MyApp) + bool MyApp::OnInit() { -#if wxUSE_LIBPNG - wxImage::AddHandler( new wxPNGHandler ); -#endif - -#if wxUSE_LIBJPEG - wxImage::AddHandler( new wxJPEGHandler ); -#endif + if ( !wxApp::OnInit() ) + return false; -#if wxUSE_LIBTIFF - wxImage::AddHandler( new wxTIFFHandler ); -#endif - -#if wxUSE_GIF - wxImage::AddHandler( new wxGIFHandler ); -#endif - -#if wxUSE_PCX - wxImage::AddHandler( new wxPCXHandler ); -#endif + wxInitAllImageHandlers(); -#if wxUSE_PNM - wxImage::AddHandler( new wxPNMHandler ); -#endif + wxFrame *frame = new MyFrame(); + frame->Show( true ); -#if wxUSE_XPM - wxImage::AddHandler( new wxXPMHandler ); -#endif - - wxFrame *frame = new MyFrame(); - frame->Show( TRUE ); - - return TRUE; + return true; } -