fix bug VC6 with returning void function

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

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index 2e5d0516c4ece1a5a40c944eeef3488325ac8beb..5005c42c3a161030e58aa4d409599eddd3c0fa4e 100644 (file)
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -28,16 +28,19 @@
         #if defined(__WXPALMOS__)
             #include "wx/palmos/enhmeta.h"
         #else
         #if defined(__WXPALMOS__)
             #include "wx/palmos/enhmeta.h"
         #else

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

         #endif
 
         #endif
 

-        // map all metafile classes to enh metafile
-        #if !wxUSE_WIN_METAFILES_ALWAYS
+        #if wxUSE_WIN_METAFILES_ALWAYS
+            // use normal metafiles as well
+            #include "wx/msw/metafile.h"
+        #else // also map all metafile classes to enh metafile

             typedef wxEnhMetaFile wxMetafile;
             typedef wxEnhMetaFileDC wxMetafileDC;
             typedef wxEnhMetaFile wxMetafile;
             typedef wxEnhMetaFileDC wxMetafileDC;

-#if wxUSE_DRAG_AND_DROP
-            typedef wxEnhMetaFileDataObject wxMetafileDataObject;
-#endif
+            #if wxUSE_DRAG_AND_DROP
+                typedef wxEnhMetaFileDataObject wxMetafileDataObject;
+            #endif
+

             // this flag will be set if wxMetafile class is wxEnhMetaFile
             #define wxMETAFILE_IS_ENH
         #endif // wxUSE_WIN_METAFILES_ALWAYS
             // this flag will be set if wxMetafile class is wxEnhMetaFile
             #define wxMETAFILE_IS_ENH
         #endif // wxUSE_WIN_METAFILES_ALWAYS


@@ -45,8 +48,8 @@
         #if defined(__WXPALMOS__)
             #include "wx/palmos/metafile.h"
         #else
         #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"
     #endif
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"


@@ -55,5 +58,5 @@
 #endif
 
 #endif // wxUSE_METAFILE
 #endif
 
 #endif // wxUSE_METAFILE

-#endif
-    // _WX_METAFILE_H_BASE_
+
+#endif // _WX_METAFILE_H_BASE_