Added __WXMAC_OSX__ guards around the CFRunLoop calls, CFRunLoop not available on...

[wxWidgets.git] / include / wx / metafile.h

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index 7220f536012c98fdfba5eb71c6bb3d7658f3bd98..5f2ad07373f66950d279a38053ec7de83f6ae000 100644 (file)
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -6,7 +6,7 @@
 // Created:     13.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Created:     13.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_METAFILE_H_BASE_
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_METAFILE_H_BASE_


@@ -21,7 +21,11 @@
 
 #if defined(__WXMSW__)
     #if wxUSE_ENH_METAFILE
 
 #if defined(__WXMSW__)
     #if wxUSE_ENH_METAFILE

+        #if defined(__WXPALMOS__)
+            #include "wx/palmos/enhmeta.h"
+        #else

         #include "wx/msw/enhmeta.h"
         #include "wx/msw/enhmeta.h"

+        #endif

 
         // map all metafile classes to enh metafile
         #if !wxUSE_WIN_METAFILES_ALWAYS
 
         // map all metafile classes to enh metafile
         #if !wxUSE_WIN_METAFILES_ALWAYS


@@ -34,8 +38,12 @@
             #define wxMETAFILE_IS_ENH
         #endif // wxUSE_WIN_METAFILES_ALWAYS
     #else // !wxUSE_ENH_METAFILE
             #define wxMETAFILE_IS_ENH
         #endif // wxUSE_WIN_METAFILES_ALWAYS
     #else // !wxUSE_ENH_METAFILE

+        #if defined(__WXPALMOS__)
+            #include "wx/palmos/metafile.h"
+        #else

         #include "wx/msw/metafile.h"
     #endif
         #include "wx/msw/metafile.h"
     #endif

+    #endif

 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"
 #elif defined(__WXMAC__)