-/*
- * 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
+// License: wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#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/mstream.h"
#include "wx/wfstream.h"
#include "wx/quantize.h"
+#include "wx/stopwatch.h"
-#include "smile.xbm"
-#include "smile.xpm"
+#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
-// derived classes
-
-class MyFrame;
-class MyApp;
-
-// MyCanvas
+#if defined(__WXMAC__) || defined(__WXGTK__)
+ #define wxHAVE_RAW_BITMAP
+ #include "wx/rawbmp.h"
+#endif
-class MyCanvas: public wxScrolledWindow
-{
-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;
+#include "canvas.h"
-private:
- DECLARE_DYNAMIC_CLASS(MyCanvas)
- DECLARE_EVENT_TABLE()
-};
+#ifndef __WXMSW__
+ #include "../sample.xpm"
+#endif
+// ============================================================================
+// declarations
+// ============================================================================
-const int nChoices = 8 ;
-static const wxString bppchoices[nChoices] =
-{
- "1 bpp color",
- "1 bpp B&W",
- "4 bpp color",
- "8 bpp color",
- "8 bpp greyscale",
- "8 bpp red",
- "8 bpp own palette",
- "24 bpp"
-};
+//-----------------------------------------------------------------------------
+// MyApp
+//-----------------------------------------------------------------------------
-static const int bppvalues[nChoices] =
+class MyApp: public wxApp
{
- wxBMP_1BPP,
- wxBMP_1BPP_BW,
- wxBMP_4BPP,
- wxBMP_8BPP,
- wxBMP_8BPP_GREY,
- wxBMP_8BPP_RED,
- wxBMP_8BPP_PALETTE,
- wxBMP_24BPP
+public:
+ virtual bool OnInit();
};
+// ----------------------------------------------------------------------------
// MyFrame
-
+// ----------------------------------------------------------------------------
class MyFrame: public wxFrame
{
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
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("Double click to save"),
- wxDefaultPosition, wxDefaultSize,
- wxCAPTION | wxSYSTEM_MENU),
- m_bitmap(bitmap)
+ MyImageFrame(wxFrame *parent, const wxString& desc, const wxImage& image)
{
+ Create(parent, desc, wxBitmap(image), image.GetImageCount(desc));
+ }
+
+ MyImageFrame(wxFrame *parent, const wxString& desc, const wxBitmap& bitmap)
+ {
+ Create(parent, desc, bitmap);
+ }
+
+private:
+ bool Create(wxFrame *parent,
+ const wxString& desc,
+ const wxBitmap& bitmap,
+ int numImages = 1)
+ {
+ if ( !wxFrame::Create(parent, wxID_ANY,
+ wxString::Format(_T("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_SAVE);
+ menu->AppendSeparator();
+ menu->AppendCheckItem(ID_PAINT_BG, _T("&Paint background"),
+ "Uncheck this for transparent images");
+ menu->AppendSeparator();
+ menu->Append(ID_RESIZE, _T("&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, _T("Rotate &left\tCtrl-L"));
+ menu->Append(ID_ROTATE_RIGHT, _T("Rotate &right\tCtrl-R"));
+
+ wxMenuBar *mbar = new wxMenuBar;
+ mbar->Append(menu, _T("&Image"));
+ SetMenuBar(mbar);
+
+ mbar->Check(ID_PAINT_BG, true);
+
+ CreateStatusBar(2);
+ if ( numImages != 1 )
+ SetStatusText(wxString::Format("%d images", numImages), 1);
+
SetClientSize(bitmap.GetWidth(), bitmap.GetHeight());
+
+ UpdateStatusBar();
+
+ Show();
+
+ return true;
+ }
+
+ void OnEraseBackground(wxEraseEvent& WXUNUSED(event))
+ {
+ // do nothing here to be able to see how transparent images are shown
}
void OnPaint(wxPaintEvent& WXUNUSED(event))
{
- wxPaintDC dc( this );
- dc.DrawBitmap( m_bitmap, 0, 0 );
+ wxPaintDC dc(this);
+
+ if ( GetMenuBar()->IsChecked(ID_PAINT_BG) )
+ ClearBackground();
+
+ dc.SetUserScale(m_zoom, m_zoom);
+
+ 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 */
+ );
}
void OnSave(wxCommandEvent& WXUNUSED(event))
{
- wxImage image(m_bitmap);
-
- int bppselection = wxGetSingleChoiceIndex("Set BMP BPP",
- "Set BMP BPP",
- nChoices,
- bppchoices,
- this);
- if ( bppselection == -1 )
- {
- // cancelled
- return;
- }
-
- image.SetOption(wxBMP_FORMAT, bppvalues[bppselection]);
+#if wxUSE_FILEDLG
+ wxImage image = m_bitmap.ConvertToImage();
- wxString deffilename = bppchoices[bppselection];
- deffilename.Replace(wxT(" "), wxT("_"));
- deffilename += wxT(".bmp");
wxString savefilename = wxFileSelector( wxT("Save Image"),
- wxT(""),
- deffilename,
+ wxEmptyString,
+ wxEmptyString,
(const wxChar *)NULL,
- wxT("BMP files (*.bmp)|*.bmp|")
- wxT("PNG files (*.png)|*.png|")
- wxT("JPEG files (*.jpg)|*.jpg|")
- wxT("GIF files (*.gif)|*.gif|")
- wxT("TIFF files (*.tif)|*.tif|")
- wxT("PCX files (*.pcx)|*.pcx"),
- wxSAVE);
+ wxT("BMP files (*.bmp)|*.bmp|")
+ wxT("PNG files (*.png)|*.png|")
+ wxT("JPEG files (*.jpg)|*.jpg|")
+ wxT("GIF files (*.gif)|*.gif|")
+ wxT("TIFF files (*.tif)|*.tif|")
+ wxT("PCX files (*.pcx)|*.pcx|")
+ wxT("ICO files (*.ico)|*.ico|")
+ wxT("CUR files (*.cur)|*.cur"),
+ wxFD_SAVE,
+ this);
if ( savefilename.empty() )
return;
- if ( image.GetOptionInt(wxBMP_FORMAT) == wxBMP_8BPP_PALETTE )
+ wxString extension;
+ wxFileName::SplitPath(savefilename, NULL, NULL, &extension);
+
+ bool saved = false;
+ if ( extension == _T("bmp") )
{
- unsigned char *cmap = new unsigned char [256];
- for ( int i = 0; i < 256; i++ )
- cmap[i] = i;
- image.SetPalette(wxPalette(256, cmap, cmap, cmap));
+ static const int bppvalues[] =
+ {
+ wxBMP_1BPP,
+ wxBMP_1BPP_BW,
+ wxBMP_4BPP,
+ wxBMP_8BPP,
+ wxBMP_8BPP_GREY,
+ wxBMP_8BPP_RED,
+ wxBMP_8BPP_PALETTE,
+ wxBMP_24BPP
+ };
+
+ const wxString bppchoices[] =
+ {
+ _T("1 bpp color"),
+ _T("1 bpp B&W"),
+ _T("4 bpp color"),
+ _T("8 bpp color"),
+ _T("8 bpp greyscale"),
+ _T("8 bpp red"),
+ _T("8 bpp own palette"),
+ _T("24 bpp")
+ };
+
+ int bppselection = wxGetSingleChoiceIndex(_T("Set BMP BPP"),
+ _T("Image sample: save file"),
+ WXSIZEOF(bppchoices),
+ bppchoices,
+ this);
+ if ( bppselection != -1 )
+ {
+ int format = bppvalues[bppselection];
+ image.SetOption(wxIMAGE_OPTION_BMP_FORMAT, format);
+
+ if ( format == wxBMP_8BPP_PALETTE )
+ {
+ unsigned char *cmap = new unsigned char [256];
+ for ( int i = 0; i < 256; i++ )
+ cmap[i] = (unsigned char)i;
+ image.SetPalette(wxPalette(256, cmap, cmap, cmap));
+
+ delete[] cmap;
+ }
+ }
+ }
+ else if ( extension == _T("png") )
+ {
+ static const int pngvalues[] =
+ {
+ wxPNG_TYPE_COLOUR,
+ wxPNG_TYPE_COLOUR,
+ wxPNG_TYPE_GREY,
+ wxPNG_TYPE_GREY,
+ wxPNG_TYPE_GREY_RED,
+ wxPNG_TYPE_GREY_RED,
+ };
+
+ const wxString pngchoices[] =
+ {
+ _T("Colour 8bpp"),
+ _T("Colour 16bpp"),
+ _T("Grey 8bpp"),
+ _T("Grey 16bpp"),
+ _T("Grey red 8bpp"),
+ _T("Grey red 16bpp"),
+ };
+
+ int sel = wxGetSingleChoiceIndex(_T("Set PNG format"),
+ _T("Image sample: save file"),
+ WXSIZEOF(pngchoices),
+ pngchoices,
+ this);
+ if ( sel != -1 )
+ {
+ image.SetOption(wxIMAGE_OPTION_PNG_FORMAT, pngvalues[sel]);
+ image.SetOption(wxIMAGE_OPTION_PNG_BITDEPTH, sel % 2 ? 16 : 8);
+
+ // these values are taken from OptiPNG with -o3 switch
+ const wxString compressionChoices[] =
+ {
+ _T("compression = 9, memory = 8, strategy = 0, filter = 0"),
+ _T("compression = 9, memory = 9, strategy = 0, filter = 0"),
+ _T("compression = 9, memory = 8, strategy = 1, filter = 0"),
+ _T("compression = 9, memory = 9, strategy = 1, filter = 0"),
+ _T("compression = 1, memory = 8, strategy = 2, filter = 0"),
+ _T("compression = 1, memory = 9, strategy = 2, filter = 0"),
+ _T("compression = 9, memory = 8, strategy = 0, filter = 5"),
+ _T("compression = 9, memory = 9, strategy = 0, filter = 5"),
+ _T("compression = 9, memory = 8, strategy = 1, filter = 5"),
+ _T("compression = 9, memory = 9, strategy = 1, filter = 5"),
+ _T("compression = 1, memory = 8, strategy = 2, filter = 5"),
+ _T("compression = 1, memory = 9, strategy = 2, filter = 5"),
+ };
+
+ int sel = wxGetSingleChoiceIndex(_T("Select compression option (Cancel to use default)\n"),
+ _T("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
+ }
+ }
+ }
+ else if ( extension == _T("cur") )
+ {
+ image.Rescale(32,32);
+ image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, 0);
+ image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, 0);
+ // This shows how you can save an image with explicitly
+ // specified image format:
+ saved = image.SaveFile(savefilename, wxBITMAP_TYPE_CUR);
+ }
- delete cmap;
+ 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
+ }
- bool saved = FALSE;
-
- wxString extension = savefilename.AfterLast('.').Lower();
-
- if (extension == "bmp")
- saved=image.SaveFile(savefilename, wxBITMAP_TYPE_BMP);
- else if (extension == "png")
- saved=image.SaveFile(savefilename, wxBITMAP_TYPE_PNG);
- else if (extension == "pcx")
- saved=image.SaveFile(savefilename, wxBITMAP_TYPE_PCX);
- else if ((extension == "tif") || (extension == "tiff"))
- saved=image.SaveFile(savefilename, wxBITMAP_TYPE_TIF);
- else if (extension == "jpg")
- saved=image.SaveFile(savefilename, wxBITMAP_TYPE_JPEG);
- else if (extension == "pnm")
- saved=image.SaveFile(savefilename, wxBITMAP_TYPE_PNM);
- else
- wxMessageBox("Unknown file type, see options in file selector.",
- "Unknown file type",
- wxOK|wxCENTRE, this);
+ void OnResize(wxCommandEvent& WXUNUSED(event))
+ {
+ wxImage img(m_bitmap.ConvertToImage());
+
+ const wxSize size = GetClientSize();
+ img.Rescale(size.x, size.y, wxIMAGE_QUALITY_HIGH);
+ m_bitmap = wxBitmap(img);
+
+ UpdateStatusBar();
+ }
+
+ 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();
+ }
+
+ void OnRotate(wxCommandEvent& event)
+ {
+ double angle = 5;
+ if ( event.GetId() == ID_ROTATE_LEFT )
+ angle = -angle;
+
+ wxImage img(m_bitmap.ConvertToImage());
+ img = img.Rotate(angle, wxPoint(img.GetWidth() / 2, img.GetHeight() / 2));
+ if ( !img.Ok() )
+ {
+ wxLogWarning(_T("Rotation failed"));
+ return;
+ }
+
+ m_bitmap = wxBitmap(img);
+
+ UpdateStatusBar();
+ }
+
+ void UpdateStatusBar()
+ {
+ wxLogStatus(this, _T("Image size: (%d, %d), zoom %.2f"),
+ m_bitmap.GetWidth(),
+ m_bitmap.GetHeight(),
+ m_zoom);
+ Refresh();
}
-private:
wxBitmap m_bitmap;
+ double m_zoom;
DECLARE_EVENT_TABLE()
};
-// MyApp
+#ifdef wxHAVE_RAW_BITMAP
-class MyApp: public wxApp
+#include "wx/rawbmp.h"
+
+class MyRawBitmapFrame : public wxFrame
{
public:
- virtual bool OnInit();
-};
-
-// main program
-
-IMPLEMENT_APP(MyApp)
+ enum
+ {
+ BORDER = 15,
+ SIZE = 150,
+ REAL_SIZE = SIZE - 2*BORDER
+ };
+
+ MyRawBitmapFrame(wxFrame *parent)
+ : wxFrame(parent, wxID_ANY, _T("Raw bitmaps (how exciting)")),
+ m_bitmap(SIZE, SIZE, 24),
+ m_alphaBitmap(SIZE, SIZE, 32)
+ {
+ SetClientSize(SIZE, SIZE*2+25);
-// MyCanvas
+ InitAlphaBitmap();
+ InitBitmap();
-IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow)
+ }
-BEGIN_EVENT_TABLE(MyImageFrame, wxFrame)
- EVT_PAINT(MyImageFrame::OnPaint)
- EVT_LEFT_DCLICK(MyImageFrame::OnSave)
-END_EVENT_TABLE()
+ void InitAlphaBitmap()
+ {
+ // First, clear the whole bitmap by making it alpha
+ {
+ wxAlphaPixelData data( m_alphaBitmap, wxPoint(0,0), wxSize(SIZE, SIZE) );
+ if ( !data )
+ {
+ wxLogError(_T("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);
+ }
+ }
-BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
- EVT_PAINT(MyCanvas::OnPaint)
-END_EVENT_TABLE()
+ // Then, draw colourful alpha-blended stripes
+ wxAlphaPixelData data(m_alphaBitmap, wxPoint(BORDER, BORDER),
+ wxSize(REAL_SIZE, REAL_SIZE));
+ if ( !data )
+ {
+ wxLogError(_T("Failed to gain raw access to bitmap data"));
+ return;
+ }
-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)
-#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( 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 = "./";
- else if ( wxFile::Exists(wxT("../horse.png")) )
- dir = "../";
- else
- wxLogWarning(wxT("Can't find image files in either '.' or '..'!"));
+ wxAlphaPixelData::Iterator p(data);
- wxImage image = bitmap.ConvertToImage();
+ 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_LIBPNG
- if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ))
- wxLogError(wxT("Can't save file"));
+ void InitBitmap()
+ {
+ // draw some colourful stripes without alpha
+ wxNativePixelData data(m_bitmap);
+ if ( !data )
+ {
+ wxLogError(_T("Failed to gain raw access to bitmap data"));
+ return;
+ }
- image.Destroy();
+ 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);
+ }
+ }
- image.LoadFile( dir + wxString("test.png") );
- my_square = new wxBitmap( image );
+ void OnPaint(wxPaintEvent& WXUNUSED(event))
+ {
+ wxPaintDC dc( this );
+ dc.DrawText(_T("This is alpha and raw bitmap test"), 0, BORDER);
+ dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE/2 - BORDER);
+ dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE - 2*BORDER);
+ dc.DrawBitmap( m_alphaBitmap, 0, 0, true /* use mask */ );
- image.Destroy();
+ dc.DrawText(_T("Raw bitmap access without alpha"), 0, SIZE+5);
+ dc.DrawBitmap( m_bitmap, 0, SIZE+5+dc.GetCharHeight());
+ }
- if ( !image.LoadFile( dir + wxString("horse.png")) )
- wxLogError(wxT("Can't load PNG image"));
- else
- my_horse_png = new wxBitmap( image );
-#endif // wxUSE_LIBPNG
+private:
+ wxBitmap m_bitmap;
+ wxBitmap m_alphaBitmap;
-#if wxUSE_LIBJPEG
- image.Destroy();
+ DECLARE_EVENT_TABLE()
+};
- if ( !image.LoadFile( dir + wxString("horse.jpg")) )
- wxLogError(wxT("Can't load JPG image"));
- else
- my_horse_jpeg = new wxBitmap( image );
-#endif // wxUSE_LIBJPEG
+#endif // wxHAVE_RAW_BITMAP
-#if wxUSE_GIF
- image.Destroy();
- if ( !image.LoadFile( dir + wxString("horse.gif")) )
- wxLogError(wxT("Can't load GIF image"));
- else
- my_horse_gif = new wxBitmap( image );
-#endif
+// ============================================================================
+// implementations
+// ============================================================================
-#if wxUSE_PCX
- image.Destroy();
+//-----------------------------------------------------------------------------
+// MyImageFrame
+//-----------------------------------------------------------------------------
- if ( !image.LoadFile( dir + wxString("horse.pcx"), wxBITMAP_TYPE_PCX ) )
- wxLogError(wxT("Can't load PCX image"));
- else
- my_horse_pcx = new wxBitmap( image );
-#endif
+BEGIN_EVENT_TABLE(MyImageFrame, wxFrame)
+ EVT_ERASE_BACKGROUND(MyImageFrame::OnEraseBackground)
+ EVT_PAINT(MyImageFrame::OnPaint)
- image.Destroy();
+ EVT_MENU(wxID_SAVE, MyImageFrame::OnSave)
+ EVT_MENU_RANGE(ID_ROTATE_LEFT, ID_ROTATE_RIGHT, MyImageFrame::OnRotate)
+ EVT_MENU(ID_RESIZE, MyImageFrame::OnResize)
- if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) )
- wxLogError(wxT("Can't load BMP image"));
- else
- my_horse_bmp = new wxBitmap( image );
+ EVT_MENU(wxID_ZOOM_IN, MyImageFrame::OnZoom)
+ EVT_MENU(wxID_ZOOM_OUT, MyImageFrame::OnZoom)
+ EVT_MENU(wxID_ZOOM_100, MyImageFrame::OnZoom)
+END_EVENT_TABLE()
-#if wxUSE_XPM
- image.Destroy();
+//-----------------------------------------------------------------------------
+// MyRawBitmapFrame
+//-----------------------------------------------------------------------------
- if ( !image.LoadFile( dir + wxString("horse.xpm"), wxBITMAP_TYPE_XPM ) )
- wxLogError(wxT("Can't load XPM image"));
- else
- my_horse_xpm = new wxBitmap( image );
+#ifdef wxHAVE_RAW_BITMAP
- if ( !image.SaveFile( dir + wxString("test.xpm"), wxBITMAP_TYPE_XPM ))
- wxLogError(wxT("Can't save file"));
-#endif
+BEGIN_EVENT_TABLE(MyRawBitmapFrame, wxFrame)
+ EVT_PAINT(MyRawBitmapFrame::OnPaint)
+END_EVENT_TABLE()
-#if wxUSE_PNM
- image.Destroy();
+#endif // wxHAVE_RAW_BITMAP
- if ( !image.LoadFile( dir + wxString("horse.pnm"), wxBITMAP_TYPE_PNM ) )
- wxLogError(wxT("Can't load PNM image"));
- else
- my_horse_pnm = new wxBitmap( image );
-#endif
+//-----------------------------------------------------------------------------
+// MyFrame
+//-----------------------------------------------------------------------------
-#if wxUSE_LIBTIFF
- image.Destroy();
+enum
+{
+ ID_QUIT = wxID_EXIT,
+ ID_ABOUT = wxID_ABOUT,
+ ID_NEW = 100,
+ ID_INFO,
+ ID_SHOWRAW,
+ ID_SHOWTHUMBNAIL
+};
- if ( !image.LoadFile( dir + wxString("horse.tif"), wxBITMAP_TYPE_TIF ) )
- wxLogError(wxT("Can't load TIFF image"));
- else
- my_horse_tiff = new wxBitmap( image );
+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_CLIPBOARD
+ EVT_MENU(wxID_COPY, MyFrame::OnCopy)
+ EVT_MENU(wxID_PASTE, MyFrame::OnPaste)
+#endif // wxUSE_CLIPBOARD
+END_EVENT_TABLE()
- CreateAntiAliasedBitmap();
+MyFrame::MyFrame()
+ : wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxImage sample"),
+ wxPoint(20, 20), wxSize(950, 700) )
+{
+ SetIcon(wxICON(sample));
- my_smile_xbm = new wxBitmap( (const char*)smile_bits, smile_width,
- smile_height, 1 );
+ wxMenuBar *menu_bar = new wxMenuBar();
-#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);
+ 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"));
#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"));
+
+#if wxUSE_CLIPBOARD
+ wxMenu *menuClipboard = new wxMenu;
+ menuClipboard->Append(wxID_COPY, _T("&Copy test image\tCtrl-C"));
+ menuClipboard->Append(wxID_PASTE, _T("&Paste image\tCtrl-V"));
+ menu_bar->Append(menuClipboard, _T("&Clipboard"));
+#endif // wxUSE_CLIPBOARD
+
+ SetMenuBar( menu_bar );
+
+#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 );
}
-MyCanvas::~MyCanvas()
+void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
{
- 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;
+ Close( true );
}
-void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
+void MyFrame::OnAbout( wxCommandEvent &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 );
-
- dc.DrawText( "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 && my_anti->Ok())
- dc.DrawBitmap( *my_anti, 280, 30 );
-
- 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 );
- }
-
- dc.DrawText( "JPEG handler", 30, 365 );
- if (my_horse_jpeg && my_horse_jpeg->Ok())
- dc.DrawBitmap( *my_horse_jpeg, 30, 380 );
-
- dc.DrawText( "GIF handler", 30, 595 );
- if (my_horse_gif && my_horse_gif->Ok())
- dc.DrawBitmap( *my_horse_gif, 30, 610 );
-
- dc.DrawText( "PCX handler", 30, 825 );
- if (my_horse_pcx && my_horse_pcx->Ok())
- dc.DrawBitmap( *my_horse_pcx, 30, 840 );
-
- dc.DrawText( "BMP handler", 30, 1055 );
- if (my_horse_bmp && my_horse_bmp->Ok())
- dc.DrawBitmap( *my_horse_bmp, 30, 1070 );
-
- dc.DrawText( "PNM handler", 30, 1285 );
- if (my_horse_pnm && my_horse_pnm->Ok())
- dc.DrawBitmap( *my_horse_pnm, 30, 1300 );
-
- dc.DrawText( "TIFF handler", 30, 1515 );
- if (my_horse_tiff && my_horse_tiff->Ok())
- dc.DrawBitmap( *my_horse_tiff, 30, 1530 );
-
- dc.DrawText( "XPM handler", 30, 1745 );
- if (my_horse_xpm && my_horse_xpm->Ok())
- dc.DrawBitmap( *my_horse_xpm, 30, 1760 );
-
- if (my_smile_xbm && my_smile_xbm->Ok())
- {
- dc.DrawText( "XBM bitmap", 30, 1975 );
- dc.DrawText( "(green on red)", 30, 1990 );
- dc.SetTextForeground( wxT("GREEN") );
- dc.SetTextBackground( wxT("RED") );
- dc.DrawBitmap( *my_smile_xbm, 30, 2010 );
-
- dc.SetTextForeground( wxT("BLACK") );
- dc.DrawText( "After wxImage conversion", 150, 1975 );
- dc.DrawText( "(red on white)", 150, 1990 );
- dc.SetTextForeground( wxT("RED") );
- wxImage i = my_smile_xbm->ConvertToImage();
- i.SetMaskColour( 255, 255, 255 );
- i.Replace( 0, 0, 0,
- wxRED_PEN->GetColour().Red(),
- wxRED_PEN->GetColour().Green(),
- wxRED_PEN->GetColour().Blue() );
- dc.DrawBitmap( i.ConvertToBitmap(), 150, 2010, TRUE );
- dc.SetTextForeground( wxT("BLACK") );
- }
+ (void)wxMessageBox( "wxImage demo\n"
+ "(c) Robert Roebling 1998-2005"
+ "(c) Vadim Zeitlin 2005-2009",
+ "About wxImage Demo",
+ wxICON_INFORMATION | wxOK );
+}
+wxString MyFrame::LoadUserImage(wxImage& image)
+{
+ wxString filename;
- 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())
+#if wxUSE_FILEDLG
+ filename = wxFileSelector(_T("Select image file"));
+ if ( !filename.empty() )
{
- dc.DrawText( "Mono bitmap", 30, 2095 );
- dc.DrawText( "(red on green)", 30, 2110 );
- dc.SetTextForeground( wxT("RED") );
- dc.SetTextBackground( wxT("GREEN") );
- dc.DrawBitmap( mono, 30, 2130 );
-
- dc.SetTextForeground( wxT("BLACK") );
- dc.DrawText( "After wxImage conversion", 150, 2095 );
- dc.DrawText( "(red on white)", 150, 2110 );
- dc.SetTextForeground( wxT("RED") );
- wxImage i = mono.ConvertToImage();
- i.SetMaskColour( 255,255,255 );
- i.Replace( 0,0,0,
- wxRED_PEN->GetColour().Red(),
- wxRED_PEN->GetColour().Green(),
- wxRED_PEN->GetColour().Blue() );
- dc.DrawBitmap( i.ConvertToBitmap(), 150, 2130, TRUE );
- dc.SetTextForeground( wxT("BLACK") );
- }
+ if ( !image.LoadFile(filename) )
+ {
+ wxLogError(_T("Couldn't load image from '%s'."), filename.c_str());
- dc.DrawText("XPM bitmap", 30, 2230);
- if ( m_bmpSmileXpm.Ok() )
- {
- dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, TRUE);
+ return wxEmptyString;
+ }
}
+#endif // wxUSE_FILEDLG
- dc.DrawText("XPM icon", 150, 2230);
- if ( m_iconSmileXpm.Ok() )
- {
- dc.DrawIcon(m_iconSmileXpm, 150, 2250);
- }
+ return filename;
}
-void MyCanvas::CreateAntiAliasedBitmap()
+void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
{
- wxBitmap bitmap( 300, 300 );
-
- wxMemoryDC dc;
-
- dc.SelectObject( bitmap );
-
- dc.Clear();
-
- dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) );
- dc.SetTextForeground( wxT("RED") );
- dc.DrawText( "This is anti-aliased Text.", 20, 20 );
- dc.DrawText( "And a Rectangle.", 20, 60 );
-
- dc.SetBrush( *wxRED_BRUSH );
- dc.SetPen( *wxTRANSPARENT_PEN );
- dc.DrawRoundedRectangle( 20, 100, 200, 180, 20 );
-
- wxImage original= bitmap.ConvertToImage();
- wxImage anti( 150, 150 );
-
- /* This is quite slow, but safe. Use wxImage::GetData() for speed instead. */
+ 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_CLIPBOARD
-MyFrame::MyFrame()
- : wxFrame( (wxFrame *)NULL, -1, "wxImage sample",
- wxPoint(20,20), wxSize(470,360) )
+void MyFrame::OnCopy(wxCommandEvent& WXUNUSED(event))
{
- wxMenu *file_menu = new wxMenu();
- file_menu->Append( ID_NEW, "&Show image...");
- file_menu->AppendSeparator();
- file_menu->Append( ID_ABOUT, "&About...");
- file_menu->AppendSeparator();
- file_menu->Append( ID_QUIT, "E&xit");
-
- wxMenuBar *menu_bar = new wxMenuBar();
- menu_bar->Append(file_menu, "&File");
+ wxBitmapDataObject *dobjBmp = new wxBitmapDataObject;
+ dobjBmp->SetBitmap(m_canvas->my_horse_png);
- SetMenuBar( menu_bar );
+ wxTheClipboard->Open();
- CreateStatusBar(2);
- int widths[] = { -1, 100 };
- SetStatusWidths( 2, widths );
-
- m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
+ if ( !wxTheClipboard->SetData(dobjBmp) )
+ {
+ wxLogError(_T("Failed to copy bitmap to clipboard"));
+ }
- // 500 width * 2100 height
- m_canvas->SetScrollbars( 10, 10, 50, 220 );
+ wxTheClipboard->Close();
}
-void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
+void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
{
- Close( TRUE );
-}
+ wxBitmapDataObject dobjBmp;
-void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
-{
- (void)wxMessageBox( "wxImage demo\n"
- "Robert Roebling (c) 1998,2000",
- "About wxImage Demo", wxICON_INFORMATION | wxOK );
+ wxTheClipboard->Open();
+ if ( !wxTheClipboard->GetData(dobjBmp) )
+ {
+ wxLogMessage(_T("No bitmap data in the clipboard"));
+ }
+ else
+ {
+ new MyImageFrame(this, _T("Clipboard"), dobjBmp.GetBitmap());
+ }
+ wxTheClipboard->Close();
}
-void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
+#endif // wxUSE_CLIPBOARD
+
+void MyFrame::OnThumbnail( wxCommandEvent &WXUNUSED(event) )
{
+#if wxUSE_FILEDLG
wxString filename = wxFileSelector(_T("Select image file"));
- if ( !filename )
+ 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());
-
return;
}
- (new MyImageFrame(this, image.ConvertToBitmap()))->Show();
+ const long loadTime = sw.Time();
+
+ MyImageFrame * const frame = new MyImageFrame(this, filename, image);
+ wxLogStatus(frame, "Loaded \"%s\" in %ldms", filename, loadTime);
+#else
+ wxLogError( _T("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 wxUSE_LIBTIFF
- wxImage::AddHandler( new wxTIFFHandler );
-#endif
-
-#if wxUSE_GIF
- wxImage::AddHandler( new wxGIFHandler );
-#endif
+ if ( !wxApp::OnInit() )
+ return false;
-#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;
}
-
projects / wxWidgets.git / blobdiff