-/*
- * 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"
#include "wx/image.h"
#include "wx/file.h"
+#include "wx/filename.h"
#include "wx/mstream.h"
#include "wx/wfstream.h"
#include "wx/quantize.h"
#endif // wxUSE_CLIPBOARD
#include "smile.xbm"
+#include "smile.xpm"
-#if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
- #include "smile.xpm"
+#if defined(__WXMSW__)
+ #ifdef wxHAVE_RAW_BITMAP
+ #include "wx/rawbmp.h"
+ #endif
#endif
-#if defined(__WXMSW__)
+#if defined(__WXMAC__) || defined(__WXGTK__)
#define wxHAVE_RAW_BITMAP
+ #include "wx/rawbmp.h"
#endif
// derived classes
wxBitmap *my_square;
wxBitmap *my_anti;
+ wxBitmap *my_horse_asciigrey_pnm;
+ wxBitmap *my_horse_rawgrey_pnm;
+
+ wxBitmap *colorized_horse_jpeg;
+
int xH, yH ;
int m_ani_images ;
};
-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
{
public:
MyImageFrame(wxFrame *parent, const wxBitmap& bitmap)
- : wxFrame(parent, -1, _T("Double click to save"),
+ : wxFrame(parent, wxID_ANY, _T("Double click to save"),
wxDefaultPosition, wxDefaultSize,
- wxCAPTION | wxSYSTEM_MENU),
+ wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX),
m_bitmap(bitmap)
{
SetClientSize(bitmap.GetWidth(), bitmap.GetHeight());
void OnPaint(wxPaintEvent& WXUNUSED(event))
{
wxPaintDC dc( this );
- dc.DrawBitmap( m_bitmap, 0, 0, TRUE /* use mask */ );
+ dc.DrawBitmap( m_bitmap, 0, 0, true /* use mask */ );
}
void OnSave(wxMouseEvent& 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"),
+ wxSAVE,
+ 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("bpp") )
+ {
+ 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);
}
-
- if ( !loaded )
- wxMessageBox(_T("No handler for this file type."),
- _T("File was not saved"),
- wxOK|wxCENTRE, this);
+#endif // wxUSE_FILEDLG
}
private:
};
MyRawBitmapFrame(wxFrame *parent)
- : wxFrame(parent, -1, _T("Raw bitmaps (how exciting)")),
+ : wxFrame(parent, wxID_ANY, _T("Raw bitmaps (how exciting)")),
m_bitmap(SIZE, SIZE, 32)
{
SetClientSize(SIZE, SIZE);
- wxRawBitmapData data(m_bitmap);
+ // another possibility: wxNativePixelData (don't forget to remove code
+ // setting alpha in the loop below then)
+ typedef wxAlphaPixelData Data;
+
+ Data data(m_bitmap, wxPoint(BORDER, BORDER), wxSize(REAL_SIZE, REAL_SIZE));
if ( !data )
{
wxLogError(_T("Failed to gain raw access to bitmap data"));
return;
}
- wxRawBitmapIterator p(data);
+ data.UseAlpha();
- p.Offset(BORDER, BORDER);
+ Data::Iterator p(data);
for ( int y = 0; y < REAL_SIZE; ++y )
{
- wxRawBitmapIterator rowStart = p;
+ Data::Iterator rowStart = p;
int r = y < REAL_SIZE/3 ? 255 : 0,
g = (REAL_SIZE/3 <= y) && (y < 2*(REAL_SIZE/3)) ? 255 : 0,
for ( int x = 0; x < REAL_SIZE; ++x )
{
- p.Red() = r;
- p.Green() = g;
- p.Blue() = b;
- p.Alpha() = x;
+ // note that RGB must be premultiplied by alpha
+ unsigned a = (Data::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(1);
+ p.OffsetY(data, 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_bitmap, 0, 0, true /* use mask */ );
}
private:
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_ico = (wxBitmap*) NULL;
my_horse_cur = (wxBitmap*) NULL;
my_horse_ani = (wxBitmap*) NULL;
+ colorized_horse_jpeg = (wxBitmap*) NULL;
my_smile_xbm = (wxBitmap*) NULL;
my_square = (wxBitmap*) NULL;
my_anti = (wxBitmap*) NULL;
+ my_horse_asciigrey_pnm = (wxBitmap*) NULL;
+ my_horse_rawgrey_pnm = (wxBitmap*) NULL;
+
m_ani_images = 0 ;
SetBackgroundColour(* wxWHITE);
image.Destroy();
- image.LoadFile( dir + _T("test.png") );
- my_square = new wxBitmap( image );
+ if ( image.LoadFile( dir + _T("test.png") ) )
+ my_square = new wxBitmap( image );
image.Destroy();
if ( !image.LoadFile( dir + _T("horse.jpg")) )
wxLogError(wxT("Can't load JPG image"));
else
+ {
my_horse_jpeg = new 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 = new wxBitmap( image );
+ }
#endif // wxUSE_LIBJPEG
#if wxUSE_GIF
wxLogError(wxT("Can't load PNM image"));
else
my_horse_pnm = new 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 = new 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 = new wxBitmap( image );
#endif
#if wxUSE_LIBTIFF
my_smile_xbm = new wxBitmap( (const char*)smile_bits, smile_width,
smile_height, 1 );
-#if !defined(__WINDOWS__) || wxUSE_XPM_IN_MSW
// demonstrates XPM automatically using the mask when saving
if ( m_bmpSmileXpm.Ok() )
m_bmpSmileXpm.SaveFile(_T("saved.xpm"), wxBITMAP_TYPE_XPM);
-#endif
#if wxUSE_ICO_CUR
image.Destroy();
tmp << i ;
wxLogError(tmp);
}
- else
+ else
my_horse_ani [i] = wxBitmap( image );
}
#endif // wxUSE_ICO_CUR
// test image loading from stream
wxFile file(dir + _T("horse.bmp"));
- off_t len = file.Length();
- void *data = malloc(len);
- if ( file.Read(data, len) != len )
- wxLogError(_T("Reading bitmap file failed"));
- else
+ if ( file.IsOpened() )
{
- wxMemoryInputStream mis(data, len);
- if ( !image.LoadFile(mis) )
- wxLogError(wxT("Can't load BMP image from stream"));
+ 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
- my_horse_bmp2 = new wxBitmap( image );
- }
+ {
+ wxMemoryInputStream mis(data, dataSize);
+ if ( !image.LoadFile(mis) )
+ wxLogError(wxT("Can't load BMP image from stream"));
+ else
+ my_horse_bmp2 = new wxBitmap( image );
+ }
- free(data);
+ free(data);
+ }
}
MyCanvas::~MyCanvas()
delete my_smile_xbm;
delete my_square;
delete my_anti;
+ delete my_horse_asciigrey_pnm;
+ delete my_horse_rawgrey_pnm;
+ delete colorized_horse_jpeg;
}
void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
if (my_horse_pnm && 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 && 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 && 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 );
wxRED_PEN->GetColour().Red(),
wxRED_PEN->GetColour().Green(),
wxRED_PEN->GetColour().Blue() );
- dc.DrawBitmap( wxBitmap(i), 150, 2010, TRUE );
+ dc.DrawBitmap( wxBitmap(i), 150, 2010, true );
dc.SetTextForeground( wxT("BLACK") );
}
memdc.SetBrush( *wxWHITE_BRUSH );
memdc.DrawRectangle( 0,0,60,50 );
memdc.SetTextForeground( *wxBLACK );
+#ifndef __WXGTK20__
+ // I cannot convince GTK2 to draw into mono bitmaps
memdc.DrawText( _T("Hi!"), 5, 5 );
+#endif
memdc.SetBrush( *wxBLACK_BRUSH );
memdc.DrawRectangle( 33,5,20,20 );
memdc.SetPen( *wxRED_PEN );
wxRED_PEN->GetColour().Red(),
wxRED_PEN->GetColour().Green(),
wxRED_PEN->GetColour().Blue() );
- dc.DrawBitmap( wxBitmap(i), 150, 2130, TRUE );
+ dc.DrawBitmap( wxBitmap(i), 150, 2130, true );
dc.SetTextForeground( wxT("BLACK") );
}
- dc.DrawText(_T("XPM bitmap"), 30, 2230);
+ // For testing transparency
+ dc.SetBrush( *wxRED_BRUSH );
+ dc.DrawRectangle( 20, 2220, 560, 68 );
+
+ dc.DrawText(_T("XPM bitmap"), 30, 2230 );
if ( m_bmpSmileXpm.Ok() )
- {
- dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, TRUE);
- }
+ dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, true);
- dc.DrawText(_T("XPM icon"), 150, 2230);
+ dc.DrawText(_T("XPM icon"), 110, 2230 );
if ( m_iconSmileXpm.Ok() )
+ dc.DrawIcon(m_iconSmileXpm, 110, 2250);
+
+ // testing icon -> bitmap conversion
+ wxBitmap to_blit( m_iconSmileXpm );
+ if (to_blit.Ok())
{
- dc.DrawIcon(m_iconSmileXpm, 150, 2250);
+ dc.DrawText( _T("SubBitmap"), 170, 2230 );
+ wxBitmap sub = to_blit.GetSubBitmap( wxRect(0,0,15,15) );
+ if (sub.Ok())
+ dc.DrawBitmap( sub, 170, 2250, true );
+
+ dc.DrawText( _T("Enlarged"), 250, 2230 );
+ dc.SetUserScale( 1.5, 1.5 );
+ dc.DrawBitmap( to_blit, (int)(250/1.5), (int)(2250/1.5), true );
+ dc.SetUserScale( 2, 2 );
+ dc.DrawBitmap( to_blit, (int)(300/2), (int)(2250/2), true );
+ dc.SetUserScale( 1.0, 1.0 );
+
+ dc.DrawText( _T("Blit"), 400, 2230);
+ wxMemoryDC blit_dc;
+ blit_dc.SelectObject( to_blit );
+ dc.Blit( 400, 2250, to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, true );
+ dc.SetUserScale( 1.5, 1.5 );
+ dc.Blit( (int)(450/1.5), (int)(2250/1.5), to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, true );
+ dc.SetUserScale( 2, 2 );
+ dc.Blit( (int)(500/2), (int)(2250/2), to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, true );
+ dc.SetUserScale( 1.0, 1.0 );
}
dc.DrawText( _T("ICO handler (1st image)"), 30, 2290 );
if (my_horse_ico32 && my_horse_ico32->Ok())
- dc.DrawBitmap( *my_horse_ico32, 30, 2330, TRUE );
+ 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 );
+ 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 );
+ dc.DrawBitmap( *my_horse_ico, 430, 2330, true );
dc.DrawText( _T("CUR handler"), 30, 2390 );
if (my_horse_cur && 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);
for (i=0; i < m_ani_images; i ++)
if (my_horse_ani[i].Ok())
{
- dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, TRUE );
+ dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, true );
}
+#if wxUSE_LIBJPEG
+ if (colorized_horse_jpeg)
+ {
+ dc.DrawText( _T("Colorize image by rotating green hue to red"), 30, 2490 );
+ dc.DrawBitmap( *colorized_horse_jpeg, 30, 2520 );
+ }
+#endif // wxUSE_LIBJPEG
+
}
void MyCanvas::CreateAntiAliasedBitmap()
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);
}
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"),
+ : wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxImage sample"),
wxPoint(20,20), wxSize(470,360) )
{
wxMenuBar *menu_bar = new wxMenuBar();
wxMenu *menuImage = new wxMenu;
menuImage->Append( ID_NEW, _T("&Show any image...\tCtrl-O"));
+
#ifdef wxHAVE_RAW_BITMAP
menuImage->Append( ID_SHOWRAW, _T("Test &raw bitmap...\tCtrl-R"));
#endif
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;
}
(new MyImageFrame(this, wxBitmap(image)))->Show();
+#endif // wxUSE_FILEDLG
}
#ifdef wxHAVE_RAW_BITMAP
-void MyFrame::OnTestRawBitmap( wxCommandEvent &event )
+void MyFrame::OnTestRawBitmap( wxCommandEvent &WXUNUSED(event) )
{
(new MyRawBitmapFrame(this))->Show();
}
wxBitmapDataObject *dobjBmp = new wxBitmapDataObject;
dobjBmp->SetBitmap(*m_canvas->my_horse_png);
+ wxTheClipboard->Open();
+
if ( !wxTheClipboard->SetData(dobjBmp) )
{
wxLogError(_T("Failed to copy bitmap to clipboard"));
}
+
+ wxTheClipboard->Close();
}
void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event))
{
wxBitmapDataObject dobjBmp;
+
+ wxTheClipboard->Open();
if ( !wxTheClipboard->GetData(dobjBmp) )
{
wxLogMessage(_T("No bitmap data in the clipboard"));
{
(new MyImageFrame(this, dobjBmp.GetBitmap()))->Show();
}
+ wxTheClipboard->Close();
}
#endif // wxUSE_CLIPBOARD
#endif
wxFrame *frame = new MyFrame();
- frame->Show( TRUE );
+ frame->Show( true );
- return TRUE;
+ return true;
}
-
projects / wxWidgets.git / blobdiff