fix wxBitmapComboBox Gtk-CRITICAL assertion `GTK_IS_ENTRY (entry)' failed

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

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index 5005c42c3a161030e58aa4d409599eddd3c0fa4e..2e0064d18cd383a827b7ecad2ad571d26a33fcfb 100644 (file)
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -25,11 +25,7 @@
 
 #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"
-        #endif
+        #include "wx/msw/enhmeta.h"

 
         #if wxUSE_WIN_METAFILES_ALWAYS
             // use normal metafiles as well
 
         #if wxUSE_WIN_METAFILES_ALWAYS
             // use normal metafiles as well


@@ -45,16 +41,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
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"
 #elif defined(__WXMAC__)
     #endif
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/metafile.h"
+    #include "wx/osx/metafile.h"

 #endif
 
 #endif // wxUSE_METAFILE
 #endif
 
 #endif // wxUSE_METAFILE