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

[wxWidgets.git] / samples / flash / flash.cpp

diff --git a/samples/flash/flash.cpp b/samples/flash/flash.cpp
index e0467ef5b9ec93bfc222758e2a73de35f168a5b2..80f45b3ca2c452730baedfb22b5f2072a87c947d 100644 (file)
--- a/samples/flash/flash.cpp
+++ b/samples/flash/flash.cpp
@@ -21,9 +21,9 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
- 
+
 #include "wx/wxprec.h"
- 
+
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
@@ -39,7 +39,7 @@
 #include "wx/cmdline.h"
 #include "wx/filename.h"
 
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
 
@@ -120,7 +120,7 @@ public:
 private:
     wxString m_swf;
 
-    DECLARE_NO_COPY_CLASS(FlashApp)
+    wxDECLARE_NO_COPY_CLASS(FlashApp);
 };
 
 // Define a new frame type: this is going to be our main frame
@@ -187,7 +187,7 @@ private:
                *m_funcarg;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(FlashFrame)
+    wxDECLARE_NO_COPY_CLASS(FlashFrame);
 };
 
 // ----------------------------------------------------------------------------