-/*
- * Program: image
- *
- * Author: Robert Roebling
- *
- * Copyright: (C) 1998, Robert Roebling
- *
- */
+///////////////////////////////////////////////////////////////////////////////
+// Name: samples/image/image.cpp
+// Purpose: sample showing operations with wxImage
+// Author: Robert Roebling
+// Modified by:
+// Created: 1998
+// RCS-ID: $Id$
+// Copyright: (c) 1998-2005 Robert Roebling
+// License: wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#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 "smile.xbm"
#include "smile.xpm"
-#if defined(__WXMSW__) || defined(__WXMAC__)
+#if defined(__WXMSW__)
#ifdef wxHAVE_RAW_BITMAP
#include "wx/rawbmp.h"
#endif
#endif
+#if defined(__WXMAC__) || defined(__WXGTK__)
+ #define wxHAVE_RAW_BITMAP
+ #include "wx/rawbmp.h"
+#endif
+
// derived classes
class MyFrame;
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_bmp2;
- wxBitmap *my_horse_pcx;
- wxBitmap *my_horse_pnm;
- wxBitmap *my_horse_tiff;
- wxBitmap *my_horse_xpm;
- wxBitmap *my_horse_ico32;
- wxBitmap *my_horse_ico16;
- wxBitmap *my_horse_ico;
- wxBitmap *my_horse_cur;
- wxBitmap *my_horse_ani;
-
- wxBitmap *my_smile_xbm;
- wxBitmap *my_square;
- wxBitmap *my_anti;
+ wxBitmap my_horse_png;
+ wxBitmap my_horse_jpeg;
+ wxBitmap my_horse_gif;
+ wxBitmap my_horse_bmp;
+ wxBitmap my_horse_bmp2;
+ wxBitmap my_horse_pcx;
+ wxBitmap my_horse_pnm;
+ wxBitmap my_horse_tiff;
+ wxBitmap my_horse_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 ;
+ int m_ani_images;
+ wxBitmap *my_horse_ani;
-protected:
+private:
wxBitmap m_bmpSmileXpm;
wxIcon m_iconSmileXpm;
-private:
- DECLARE_DYNAMIC_CLASS(MyCanvas)
DECLARE_EVENT_TABLE()
};
-const int nChoices = 8 ;
-static const wxString bppchoices[nChoices] =
-{
- _T("1 bpp color"),
- _T("1 bpp B&W"),
- _T("4 bpp color"),
- _T("8 bpp color"),
- _T("8 bpp greyscale"),
- _T("8 bpp red"),
- _T("8 bpp own palette"),
- _T("24 bpp")
-};
-
-static const int bppvalues[nChoices] =
-{
- wxBMP_1BPP,
- wxBMP_1BPP_BW,
- wxBMP_4BPP,
- wxBMP_8BPP,
- wxBMP_8BPP_GREY,
- wxBMP_8BPP_RED,
- wxBMP_8BPP_PALETTE,
- wxBMP_24BPP
-};
-
// MyFrame
DECLARE_EVENT_TABLE()
};
+// ----------------------------------------------------------------------------
+// Frame used for showing a standalone image
+// ----------------------------------------------------------------------------
+
+enum
+{
+ ID_ROTATE_LEFT = 100,
+ ID_ROTATE_RIGHT,
+ ID_RESIZE
+};
+
class MyImageFrame : public wxFrame
{
public:
- MyImageFrame(wxFrame *parent, const wxBitmap& bitmap)
- : wxFrame(parent, -1, _T("Double click to save"),
+ MyImageFrame(wxFrame *parent, const wxString& desc, const wxBitmap& bitmap)
+ : wxFrame(parent, wxID_ANY,
+ wxString::Format(_T("Image from %s"), desc.c_str()),
wxDefaultPosition, wxDefaultSize,
- wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX),
+ wxDEFAULT_FRAME_STYLE | wxFULL_REPAINT_ON_RESIZE),
m_bitmap(bitmap)
{
+ wxMenu *menu = new wxMenu;
+ menu->Append(wxID_SAVE);
+ menu->AppendSeparator();
+ menu->Append(ID_RESIZE, _T("&Fit to window\tCtrl-F"));
+ 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);
+
+ CreateStatusBar();
+
SetClientSize(bitmap.GetWidth(), bitmap.GetHeight());
+
+ UpdateStatusBar();
}
void OnEraseBackground(wxEraseEvent& WXUNUSED(event))
void OnPaint(wxPaintEvent& WXUNUSED(event))
{
- wxPaintDC dc( this );
- dc.DrawBitmap( m_bitmap, 0, 0, TRUE /* use mask */ );
+ wxPaintDC dc(this);
+ const wxSize size = GetClientSize();
+ dc.DrawBitmap(m_bitmap,
+ (size.x - m_bitmap.GetWidth())/2,
+ (size.y - m_bitmap.GetHeight())/2,
+ true /* use mask */);
}
- void OnSave(wxMouseEvent& WXUNUSED(event))
+ void OnSave(wxCommandEvent& WXUNUSED(event))
{
+#if wxUSE_FILEDLG
wxImage image = m_bitmap.ConvertToImage();
- int bppselection = wxGetSingleChoiceIndex(_T("Set BMP BPP"),
- _T("Set BMP BPP"),
- nChoices,
- bppchoices,
- this);
- if ( bppselection == -1 )
- {
- // cancelled
- return;
- }
-
- image.SetOption(wxIMAGE_OPTION_BMP_FORMAT, bppvalues[bppselection]);
-
- wxString deffilename = bppchoices[bppselection];
- deffilename.Replace(wxT(" "), wxT("_"));
- deffilename += wxT(".bmp");
wxString savefilename = wxFileSelector( wxT("Save Image"),
- 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|")
- wxT("ICO files (*.ico)|*.ico|")
- wxT("CUR files (*.cur)|*.cur"),
- wxSAVE);
+ wxT("BMP files (*.bmp)|*.bmp|")
+ wxT("PNG files (*.png)|*.png|")
+ wxT("JPEG files (*.jpg)|*.jpg|")
+ wxT("GIF files (*.gif)|*.gif|")
+ wxT("TIFF files (*.tif)|*.tif|")
+ wxT("PCX files (*.pcx)|*.pcx|")
+ wxT("ICO files (*.ico)|*.ico|")
+ wxT("CUR files (*.cur)|*.cur"),
+ wxFD_SAVE,
+ this);
if ( savefilename.empty() )
return;
- if ( image.GetOptionInt(wxIMAGE_OPTION_BMP_FORMAT) == wxBMP_8BPP_PALETTE )
- {
- unsigned char *cmap = new unsigned char [256];
- for ( int i = 0; i < 256; i++ )
- cmap[i] = i;
- image.SetPalette(wxPalette(256, cmap, cmap, cmap));
+ wxString extension;
+ wxFileName::SplitPath(savefilename, NULL, NULL, &extension);
- delete cmap;
+ bool saved = false;
+ if ( extension == _T("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[] =
+ {
+ _T("1 bpp color"),
+ _T("1 bpp B&W"),
+ _T("4 bpp color"),
+ _T("8 bpp color"),
+ _T("8 bpp greyscale"),
+ _T("8 bpp red"),
+ _T("8 bpp own palette"),
+ _T("24 bpp")
+ };
+
+ int bppselection = wxGetSingleChoiceIndex(_T("Set BMP BPP"),
+ _T("Image sample: save file"),
+ WXSIZEOF(bppchoices),
+ bppchoices,
+ this);
+ if ( bppselection != -1 )
+ {
+ int format = bppvalues[bppselection];
+ image.SetOption(wxIMAGE_OPTION_BMP_FORMAT, format);
+
+ if ( format == wxBMP_8BPP_PALETTE )
+ {
+ unsigned char *cmap = new unsigned char [256];
+ for ( int i = 0; i < 256; i++ )
+ cmap[i] = (unsigned char)i;
+ image.SetPalette(wxPalette(256, cmap, cmap, cmap));
+
+ delete[] cmap;
+ }
+ }
}
-
- bool loaded;
- wxString extension = savefilename.AfterLast('.').Lower();
-
- if (extension == _T("cur"))
+ else if ( extension == _T("png") )
+ {
+ static const int pngvalues[] =
+ {
+ wxPNG_TYPE_COLOUR,
+ wxPNG_TYPE_COLOUR,
+ wxPNG_TYPE_GREY,
+ wxPNG_TYPE_GREY,
+ wxPNG_TYPE_GREY_RED,
+ wxPNG_TYPE_GREY_RED,
+ };
+
+ const wxString pngchoices[] =
+ {
+ _T("Colour 8bpp"),
+ _T("Colour 16bpp"),
+ _T("Grey 8bpp"),
+ _T("Grey 16bpp"),
+ _T("Grey red 8bpp"),
+ _T("Grey red 16bpp"),
+ };
+
+ int sel = wxGetSingleChoiceIndex(_T("Set PNG format"),
+ _T("Image sample: save file"),
+ WXSIZEOF(pngchoices),
+ pngchoices,
+ this);
+ if ( sel != -1 )
+ {
+ image.SetOption(wxIMAGE_OPTION_PNG_FORMAT, pngvalues[sel]);
+ image.SetOption(wxIMAGE_OPTION_PNG_BITDEPTH, sel % 2 ? 16 : 8);
+ }
+ }
+ else if ( extension == _T("cur") )
{
image.Rescale(32,32);
image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, 0);
image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, 0);
// This shows how you can save an image with explicitly
// specified image format:
- loaded = image.SaveFile(savefilename, wxBITMAP_TYPE_CUR);
+ saved = image.SaveFile(savefilename, wxBITMAP_TYPE_CUR);
}
- else
+
+ if ( !saved )
{
// This one guesses image format from filename extension
// (it may fail if the extension is not recognized):
- loaded = image.SaveFile(savefilename);
+ image.SaveFile(savefilename);
+ }
+#endif // wxUSE_FILEDLG
+ }
+
+ 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();
+ Refresh();
+ }
+
+ 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;
}
- if ( !loaded )
- wxMessageBox(_T("No handler for this file type."),
- _T("File was not saved"),
- wxOK|wxCENTRE, this);
+ m_bitmap = wxBitmap(img);
+
+ UpdateStatusBar();
+ Refresh();
}
private:
+ void UpdateStatusBar()
+ {
+ wxLogStatus(this, _T("Image size: (%d, %d)"),
+ m_bitmap.GetWidth(),
+ m_bitmap.GetHeight());
+ }
+
wxBitmap m_bitmap;
DECLARE_EVENT_TABLE()
};
MyRawBitmapFrame(wxFrame *parent)
- : wxFrame(parent, -1, _T("Raw bitmaps (how exciting)")),
- m_bitmap(SIZE, SIZE, 32)
+ : wxFrame(parent, wxID_ANY, _T("Raw bitmaps (how exciting)")),
+ m_bitmap(SIZE, SIZE, 24),
+ m_alphaBitmap(SIZE, SIZE, 32)
{
- SetClientSize(SIZE, SIZE);
+ SetClientSize(SIZE, SIZE*2+25);
+
+ InitAlphaBitmap();
+ InitBitmap();
+
+ }
- // another possibility: wxNativePixelData (don't forget to remove code
- // setting alpha in the loop below then)
- typedef wxAlphaPixelData Data;
+ 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;
+ }
+ data.UseAlpha();
+ 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);
+ }
+ }
- Data data(m_bitmap, wxPoint(BORDER, BORDER), wxSize(REAL_SIZE, REAL_SIZE));
+ // 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"));
}
data.UseAlpha();
-
- Data::Iterator p(data);
+ wxAlphaPixelData::Iterator p(data);
for ( int y = 0; y < REAL_SIZE; ++y )
{
- Data::Iterator rowStart = p;
+ 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);
+ }
+ }
+
+ 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;
+ }
+
+ 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.Alpha() = (Data::Iterator::ChannelType)((x*255.)/REAL_SIZE);
-
++p; // same as p.OffsetX(1)
}
dc.DrawText(_T("This is alpha and raw bitmap test"), 0, BORDER);
dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE/2 - BORDER);
dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE - 2*BORDER);
- dc.DrawBitmap( m_bitmap, 0, 0, TRUE /* use mask */ );
+ dc.DrawBitmap( m_alphaBitmap, 0, 0, true /* use mask */ );
+
+ dc.DrawText(_T("Raw bitmap access without alpha"), 0, SIZE+5);
+ dc.DrawBitmap( m_bitmap, 0, SIZE+5+dc.GetCharHeight());
}
private:
wxBitmap m_bitmap;
+ wxBitmap m_alphaBitmap;
DECLARE_EVENT_TABLE()
};
// MyCanvas
-IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow)
-
BEGIN_EVENT_TABLE(MyImageFrame, wxFrame)
EVT_ERASE_BACKGROUND(MyImageFrame::OnEraseBackground)
EVT_PAINT(MyImageFrame::OnPaint)
- EVT_LEFT_DCLICK(MyImageFrame::OnSave)
+
+ EVT_MENU(wxID_SAVE, MyImageFrame::OnSave)
+ EVT_MENU_RANGE(ID_ROTATE_LEFT, ID_ROTATE_RIGHT, MyImageFrame::OnRotate)
+ EVT_MENU(ID_RESIZE, MyImageFrame::OnResize)
END_EVENT_TABLE()
#ifdef wxHAVE_RAW_BITMAP
#endif // wxHAVE_RAW_BITMAP
BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
- EVT_PAINT(MyCanvas::OnPaint)
+ 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((const char **) smile_xpm)
- , m_iconSmileXpm((const char **) smile_xpm)
+ : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
+ , m_bmpSmileXpm(smile_xpm)
+ , m_iconSmileXpm(smile_xpm)
{
- my_horse_png = (wxBitmap*) NULL;
- my_horse_jpeg = (wxBitmap*) NULL;
- my_horse_gif = (wxBitmap*) NULL;
- my_horse_bmp = (wxBitmap*) NULL;
- my_horse_bmp2 = (wxBitmap*) NULL;
- my_horse_pcx = (wxBitmap*) NULL;
- my_horse_pnm = (wxBitmap*) NULL;
- my_horse_tiff = (wxBitmap*) NULL;
- my_horse_xpm = (wxBitmap*) NULL;
- my_horse_ico32 = (wxBitmap*) NULL;
- my_horse_ico16 = (wxBitmap*) NULL;
- my_horse_ico = (wxBitmap*) NULL;
- my_horse_cur = (wxBitmap*) NULL;
- my_horse_ani = (wxBitmap*) NULL;
-
- my_smile_xbm = (wxBitmap*) NULL;
- my_square = (wxBitmap*) NULL;
- my_anti = (wxBitmap*) NULL;
-
+ my_horse_ani = NULL;
m_ani_images = 0 ;
SetBackgroundColour(* wxWHITE);
image.Destroy();
if ( image.LoadFile( dir + _T("test.png") ) )
- my_square = new wxBitmap( image );
+ my_square = wxBitmap( image );
image.Destroy();
if ( !image.LoadFile( dir + _T("horse.png")) )
wxLogError(wxT("Can't load PNG image"));
else
- my_horse_png = new wxBitmap( image );
+ my_horse_png = wxBitmap( image );
+
+ if ( !image.LoadFile( dir + _T("toucan.png")) )
+ wxLogError(wxT("Can't load PNG image"));
+ else
+ my_toucan = wxBitmap(image);
+
+ my_toucan_flipped_horiz = wxBitmap(image.Mirror(true));
+ my_toucan_flipped_vert = wxBitmap(image.Mirror(false));
+ my_toucan_flipped_both = wxBitmap(image.Mirror(true).Mirror(false));
+ my_toucan_grey = wxBitmap(image.ConvertToGreyscale());
+ my_toucan_head = wxBitmap(image.GetSubImage(wxRect(40, 7, 80, 60)));
+ 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
if ( !image.LoadFile( dir + _T("horse.jpg")) )
wxLogError(wxT("Can't load JPG image"));
else
- my_horse_jpeg = new wxBitmap( image );
+ {
+ my_horse_jpeg = wxBitmap( image );
+
+ // Colorize by rotating green hue to red
+ wxImage::HSVValue greenHSV = wxImage::RGBtoHSV(wxImage::RGBValue(0, 255, 0));
+ wxImage::HSVValue redHSV = wxImage::RGBtoHSV(wxImage::RGBValue(255, 0, 0));
+ image.RotateHue(redHSV.hue - greenHSV.hue);
+ colorized_horse_jpeg = wxBitmap( image );
+ }
+
+ if ( !image.LoadFile( dir + _T("cmyk.jpg")) )
+ wxLogError(_T("Can't load CMYK JPG image"));
+ else
+ my_cmyk_jpeg = wxBitmap(image);
#endif // wxUSE_LIBJPEG
#if wxUSE_GIF
if ( !image.LoadFile( dir + _T("horse.gif" )) )
wxLogError(wxT("Can't load GIF image"));
else
- my_horse_gif = new wxBitmap( image );
+ my_horse_gif = wxBitmap( image );
#endif
#if wxUSE_PCX
if ( !image.LoadFile( dir + _T("horse.pcx"), wxBITMAP_TYPE_PCX ) )
wxLogError(wxT("Can't load PCX image"));
else
- my_horse_pcx = new wxBitmap( image );
+ my_horse_pcx = wxBitmap( image );
#endif
image.Destroy();
if ( !image.LoadFile( dir + _T("horse.bmp"), wxBITMAP_TYPE_BMP ) )
wxLogError(wxT("Can't load BMP image"));
else
- my_horse_bmp = new wxBitmap( image );
+ my_horse_bmp = wxBitmap( image );
#if wxUSE_XPM
image.Destroy();
if ( !image.LoadFile( dir + _T("horse.xpm"), wxBITMAP_TYPE_XPM ) )
wxLogError(wxT("Can't load XPM image"));
else
- my_horse_xpm = new wxBitmap( image );
+ my_horse_xpm = wxBitmap( image );
if ( !image.SaveFile( dir + _T("test.xpm"), wxBITMAP_TYPE_XPM ))
wxLogError(wxT("Can't save file"));
if ( !image.LoadFile( dir + _T("horse.pnm"), wxBITMAP_TYPE_PNM ) )
wxLogError(wxT("Can't load PNM image"));
else
- my_horse_pnm = new wxBitmap( image );
+ my_horse_pnm = wxBitmap( image );
+
+ image.Destroy();
+
+ if ( !image.LoadFile( dir + _T("horse_ag.pnm"), wxBITMAP_TYPE_PNM ) )
+ wxLogError(wxT("Can't load PNM image"));
+ else
+ my_horse_asciigrey_pnm = wxBitmap( image );
+
+ image.Destroy();
+
+ if ( !image.LoadFile( dir + _T("horse_rg.pnm"), wxBITMAP_TYPE_PNM ) )
+ wxLogError(wxT("Can't load PNM image"));
+ else
+ my_horse_rawgrey_pnm = wxBitmap( image );
#endif
#if wxUSE_LIBTIFF
if ( !image.LoadFile( dir + _T("horse.tif"), wxBITMAP_TYPE_TIF ) )
wxLogError(wxT("Can't load TIFF image"));
else
- my_horse_tiff = new wxBitmap( image );
+ my_horse_tiff = wxBitmap( image );
+#endif
+
+#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 = new wxBitmap( (const char*)smile_bits, smile_width,
+ my_smile_xbm = wxBitmap( (const char*)smile_bits, smile_width,
smile_height, 1 );
// demonstrates XPM automatically using the mask when saving
if ( !image.LoadFile( dir + _T("horse.ico"), wxBITMAP_TYPE_ICO, 0 ) )
wxLogError(wxT("Can't load first ICO image"));
else
- my_horse_ico32 = new wxBitmap( image );
+ my_horse_ico32 = wxBitmap( image );
image.Destroy();
if ( !image.LoadFile( dir + _T("horse.ico"), wxBITMAP_TYPE_ICO, 1 ) )
wxLogError(wxT("Can't load second ICO image"));
else
- my_horse_ico16 = new wxBitmap( image );
+ my_horse_ico16 = wxBitmap( image );
image.Destroy();
if ( !image.LoadFile( dir + _T("horse.ico") ) )
wxLogError(wxT("Can't load best ICO image"));
else
- my_horse_ico = new wxBitmap( image );
+ my_horse_ico = wxBitmap( image );
image.Destroy();
wxLogError(wxT("Can't load best ICO image"));
else
{
- my_horse_cur = new wxBitmap( image );
+ my_horse_cur = wxBitmap( image );
xH = 30 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) ;
yH = 2420 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ;
}
tmp << i ;
wxLogError(tmp);
}
- else
+ else
my_horse_ani [i] = wxBitmap( image );
}
#endif // wxUSE_ICO_CUR
wxFile file(dir + _T("horse.bmp"));
if ( file.IsOpened() )
{
- off_t len = file.Length();
- void *data = malloc(len);
- if ( file.Read(data, len) != len )
+ 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, len);
+ wxMemoryInputStream mis(data, dataSize);
if ( !image.LoadFile(mis) )
wxLogError(wxT("Can't load BMP image from stream"));
else
- my_horse_bmp2 = new wxBitmap( image );
+ my_horse_bmp2 = wxBitmap( image );
}
free(data);
MyCanvas::~MyCanvas()
{
- delete my_horse_pnm;
- delete my_horse_png;
- delete my_horse_jpeg;
- delete my_horse_gif;
- delete my_horse_bmp;
- delete my_horse_bmp2;
- delete my_horse_pcx;
- delete my_horse_tiff;
- delete my_horse_xpm;
- delete my_horse_ico32;
- delete my_horse_ico16;
- delete my_horse_ico;
- delete my_horse_cur;
delete [] my_horse_ani;
- delete my_smile_xbm;
- delete my_square;
- delete my_anti;
}
void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
PrepareDC( dc );
dc.DrawText( _T("Loaded image"), 30, 10 );
- if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 );
+ if (my_square.Ok())
+ dc.DrawBitmap( my_square, 30, 30 );
dc.DrawText( _T("Drawn directly"), 150, 10 );
dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );
dc.SetBrush( *wxWHITE_BRUSH );
dc.DrawRectangle( 170, 50, 60, 60 );
- if (my_anti && my_anti->Ok())
- dc.DrawBitmap( *my_anti, 280, 30 );
+ if (my_anti.Ok())
+ dc.DrawBitmap( my_anti, 280, 30 );
dc.DrawText( _T("PNG handler"), 30, 135 );
- if (my_horse_png && my_horse_png->Ok())
+ if (my_horse_png.Ok())
{
- dc.DrawBitmap( *my_horse_png, 30, 150 );
+ dc.DrawBitmap( my_horse_png, 30, 150 );
wxRect rect(0,0,100,100);
- wxBitmap sub( my_horse_png->GetSubBitmap(rect) );
- dc.DrawText( _T("GetSubBitmap()"), 280, 190 );
- dc.DrawBitmap( sub, 280, 210 );
+ wxBitmap sub( my_horse_png.GetSubBitmap(rect) );
+ dc.DrawText( _T("GetSubBitmap()"), 280, 175 );
+ dc.DrawBitmap( sub, 280, 195 );
}
dc.DrawText( _T("JPEG handler"), 30, 365 );
- if (my_horse_jpeg && my_horse_jpeg->Ok())
- dc.DrawBitmap( *my_horse_jpeg, 30, 380 );
+ if (my_horse_jpeg.Ok())
+ dc.DrawBitmap( my_horse_jpeg, 30, 380 );
+
+ dc.DrawText( _T("Green rotated to red"), 280, 365 );
+ if (colorized_horse_jpeg.Ok())
+ dc.DrawBitmap( colorized_horse_jpeg, 280, 380 );
+
+ dc.DrawText( _T("CMYK JPEG image"), 530, 365 );
+ if (my_cmyk_jpeg.Ok())
+ dc.DrawBitmap( my_cmyk_jpeg, 530, 380 );
dc.DrawText( _T("GIF handler"), 30, 595 );
- if (my_horse_gif && my_horse_gif->Ok())
- dc.DrawBitmap( *my_horse_gif, 30, 610 );
+ if (my_horse_gif.Ok())
+ dc.DrawBitmap( my_horse_gif, 30, 610 );
dc.DrawText( _T("PCX handler"), 30, 825 );
- if (my_horse_pcx && my_horse_pcx->Ok())
- dc.DrawBitmap( *my_horse_pcx, 30, 840 );
+ if (my_horse_pcx.Ok())
+ dc.DrawBitmap( my_horse_pcx, 30, 840 );
dc.DrawText( _T("BMP handler"), 30, 1055 );
- if (my_horse_bmp && my_horse_bmp->Ok())
- dc.DrawBitmap( *my_horse_bmp, 30, 1070 );
+ if (my_horse_bmp.Ok())
+ dc.DrawBitmap( my_horse_bmp, 30, 1070 );
dc.DrawText( _T("BMP read from memory"), 280, 1055 );
- if (my_horse_bmp2 && my_horse_bmp2->Ok())
- dc.DrawBitmap( *my_horse_bmp2, 280, 1070 );
+ if (my_horse_bmp2.Ok())
+ dc.DrawBitmap( my_horse_bmp2, 280, 1070 );
dc.DrawText( _T("PNM handler"), 30, 1285 );
- if (my_horse_pnm && my_horse_pnm->Ok())
- dc.DrawBitmap( *my_horse_pnm, 30, 1300 );
+ if (my_horse_pnm.Ok())
+ dc.DrawBitmap( my_horse_pnm, 30, 1300 );
+
+ dc.DrawText( _T("PNM handler (ascii grey)"), 280, 1285 );
+ if (my_horse_asciigrey_pnm.Ok())
+ dc.DrawBitmap( my_horse_asciigrey_pnm, 280, 1300 );
+
+ dc.DrawText( _T("PNM handler (raw grey)"), 530, 1285 );
+ if (my_horse_rawgrey_pnm.Ok())
+ dc.DrawBitmap( my_horse_rawgrey_pnm, 530, 1300 );
dc.DrawText( _T("TIFF handler"), 30, 1515 );
- if (my_horse_tiff && my_horse_tiff->Ok())
- dc.DrawBitmap( *my_horse_tiff, 30, 1530 );
+ if (my_horse_tiff.Ok())
+ dc.DrawBitmap( my_horse_tiff, 30, 1530 );
- dc.DrawText( _T("XPM handler"), 30, 1745 );
- if (my_horse_xpm && my_horse_xpm->Ok())
- dc.DrawBitmap( *my_horse_xpm, 30, 1760 );
+ 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 );
- if (my_smile_xbm && my_smile_xbm->Ok())
+ // toucans
{
- dc.DrawText( _T("XBM bitmap"), 30, 1975 );
- dc.DrawText( _T("(green on red)"), 30, 1990 );
+ 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, 30, 2010 );
+ dc.DrawBitmap( my_smile_xbm, x, y + 30 );
- dc.SetTextForeground( wxT("BLACK") );
- dc.DrawText( _T("After wxImage conversion"), 150, 1975 );
- dc.DrawText( _T("(red on white)"), 150, 1990 );
+ 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();
+ 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), 150, 2010, TRUE );
- dc.SetTextForeground( wxT("BLACK") );
+ dc.DrawBitmap( wxBitmap(i), x + 120, y + 30, true );
+ dc.SetTextForeground( *wxBLACK );
}
if (mono.Ok())
{
- dc.DrawText( _T("Mono bitmap"), 30, 2095 );
- dc.DrawText( _T("(red on green)"), 30, 2110 );
+ 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, 30, 2130 );
+ dc.DrawBitmap( mono, x, y + 30 );
- dc.SetTextForeground( wxT("BLACK") );
- dc.DrawText( _T("After wxImage conversion"), 150, 2095 );
- dc.DrawText( _T("(red on white)"), 150, 2110 );
+ 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 );
wxRED_PEN->GetColour().Red(),
wxRED_PEN->GetColour().Green(),
wxRED_PEN->GetColour().Blue() );
- dc.DrawBitmap( wxBitmap(i), 150, 2130, TRUE );
- dc.SetTextForeground( wxT("BLACK") );
+ dc.DrawBitmap( wxBitmap(i), 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.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
+
+ // 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.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.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.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.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.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.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 && my_horse_ico32->Ok())
- dc.DrawBitmap( *my_horse_ico32, 30, 2330, TRUE );
+ if (my_horse_ico32.Ok())
+ dc.DrawBitmap( my_horse_ico32, 30, 2330, true );
dc.DrawText( _T("ICO handler (2nd image)"), 230, 2290 );
- if (my_horse_ico16 && my_horse_ico16->Ok())
- dc.DrawBitmap( *my_horse_ico16, 230, 2330, TRUE );
+ if (my_horse_ico16.Ok())
+ dc.DrawBitmap( my_horse_ico16, 230, 2330, true );
dc.DrawText( _T("ICO handler (best image)"), 430, 2290 );
- if (my_horse_ico && my_horse_ico->Ok())
- dc.DrawBitmap( *my_horse_ico, 430, 2330, TRUE );
+ if (my_horse_ico.Ok())
+ dc.DrawBitmap( my_horse_ico, 430, 2330, true );
dc.DrawText( _T("CUR handler"), 30, 2390 );
- if (my_horse_cur && my_horse_cur->Ok())
+ if (my_horse_cur.Ok())
{
- dc.DrawBitmap( *my_horse_cur, 30, 2420, TRUE );
+ dc.DrawBitmap( my_horse_cur, 30, 2420, true );
dc.SetPen (*wxRED_PEN);
dc.DrawLine (xH-10,yH,xH+10,yH);
dc.DrawLine (xH,yH-10,xH,yH+10);
}
+
dc.DrawText( _T("ANI handler"), 230, 2390 );
- int i ;
- for (i=0; i < m_ani_images; i ++)
+ for ( int i=0; i < m_ani_images; i++ )
+ {
if (my_horse_ani[i].Ok())
{
- dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, TRUE );
+ dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, true );
}
+ }
}
void MyCanvas::CreateAntiAliasedBitmap()
dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) );
dc.SetTextForeground( wxT("RED") );
- dc.DrawText( _T("This is anti-aliased Text."), 20, 20 );
- dc.DrawText( _T("And a Rectangle."), 20, 60 );
+ dc.DrawText( _T("This is anti-aliased Text."), 20, 5 );
+ dc.DrawText( _T("And a Rectangle."), 20, 45 );
dc.SetBrush( *wxRED_BRUSH );
dc.SetPen( *wxTRANSPARENT_PEN );
- dc.DrawRoundedRectangle( 20, 100, 200, 180, 20 );
+ dc.DrawRoundedRectangle( 20, 85, 200, 180, 20 );
wxImage original= bitmap.ConvertToImage();
wxImage anti( 150, 150 );
original.GetBlue( x*2, y*2+1 ) +
original.GetBlue( x*2+1, y*2+1 );
blue = blue/4;
- anti.SetRGB( x, y, red, green, blue );
+ anti.SetRGB( x, y, (unsigned char)red, (unsigned char)green, (unsigned char)blue );
}
- my_anti = new wxBitmap(anti);
+ my_anti = wxBitmap(anti);
}
// MyFrame
enum
{
- ID_QUIT = 108,
- ID_ABOUT,
- ID_NEW,
- ID_SHOWRAW
+ ID_QUIT = wxID_EXIT,
+ ID_ABOUT = wxID_ABOUT,
+ ID_NEW = 100,
+ ID_SHOWRAW = 101
};
IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
END_EVENT_TABLE()
MyFrame::MyFrame()
- : wxFrame( (wxFrame *)NULL, -1, _T("wxImage sample"),
- wxPoint(20,20), wxSize(470,360) )
+ : wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxImage sample"),
+ wxPoint(20, 20), wxSize(950, 700) )
{
wxMenuBar *menu_bar = new wxMenuBar();
SetMenuBar( menu_bar );
+#if wxUSE_STATUSBAR
CreateStatusBar(2);
int widths[] = { -1, 100 };
SetStatusWidths( 2, widths );
+#endif // wxUSE_STATUSBAR
- m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
+ m_canvas = new MyCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) );
- // 500 width * 2500 height
- m_canvas->SetScrollbars( 10, 10, 50, 250 );
+ // 500 width * 2750 height
+ m_canvas->SetScrollbars( 10, 10, 50, 275 );
}
void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
{
- Close( TRUE );
+ Close( true );
}
void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
{
+#if wxUSE_FILEDLG
wxString filename = wxFileSelector(_T("Select image file"));
if ( !filename )
return;
return;
}
- (new MyImageFrame(this, wxBitmap(image)))->Show();
+ (new MyImageFrame(this, filename, wxBitmap(image)))->Show();
+#endif // wxUSE_FILEDLG
}
#ifdef wxHAVE_RAW_BITMAP
void MyFrame::OnCopy(wxCommandEvent& WXUNUSED(event))
{
wxBitmapDataObject *dobjBmp = new wxBitmapDataObject;
- dobjBmp->SetBitmap(*m_canvas->my_horse_png);
+ dobjBmp->SetBitmap(m_canvas->my_horse_png);
wxTheClipboard->Open();
}
else
{
- (new MyImageFrame(this, dobjBmp.GetBitmap()))->Show();
+ (new MyImageFrame(this, _T("Clipboard"), dobjBmp.GetBitmap()))->Show();
}
wxTheClipboard->Close();
}
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 wxUSE_PCX
- wxImage::AddHandler( new wxPCXHandler );
-#endif
-
-#if wxUSE_PNM
- wxImage::AddHandler( new wxPNMHandler );
-#endif
-
-#if wxUSE_XPM
- wxImage::AddHandler( new wxXPMHandler );
-#endif
+ if ( !wxApp::OnInit() )
+ return false;
-#if wxUSE_ICO_CUR
- wxImage::AddHandler( new wxICOHandler );
- wxImage::AddHandler( new wxCURHandler );
- wxImage::AddHandler( new wxANIHandler );
-#endif
+ wxInitAllImageHandlers();
- wxFrame *frame = new MyFrame();
- frame->Show( TRUE );
+ wxFrame *frame = new MyFrame();
+ frame->Show( true );
- return TRUE;
+ return true;
}
-
projects / wxWidgets.git / blobdiff