Don't call wxTextMeasure::BeginMeasuring() when using non-native wxDC.

[wxWidgets.git] / samples / image / canvas.h

diff --git a/samples/image/canvas.h b/samples/image/canvas.h
index 1c56b7dc55d929ef264997a3d1c10eaf5667bad5..a737ff51056dc3632e2dce8104675abc4de468a4 100644 (file)
--- a/samples/image/canvas.h
+++ b/samples/image/canvas.h
@@ -6,7 +6,7 @@
 // Created:     1998
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998-2005 Robert Roebling
 // Created:     1998
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998-2005 Robert Roebling

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/scrolwin.h"
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/scrolwin.h"


@@ -38,6 +38,8 @@ public:
     wxBitmap  my_horse_ico16;
     wxBitmap  my_horse_ico;
     wxBitmap  my_horse_cur;
     wxBitmap  my_horse_ico16;
     wxBitmap  my_horse_ico;
     wxBitmap  my_horse_cur;

+    wxBitmap  my_png_from_res,
+              my_png_from_mem;

 
     wxBitmap  my_smile_xbm;
     wxBitmap  my_square;
 
     wxBitmap  my_smile_xbm;
     wxBitmap  my_square;