moved SetBestSize() to .cpp file; set min size from it

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

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index 48cd91d5977a3a40a0dc2eff37979a6190dbe881..ba83cfa3e29d7dad645c9d64ce900b93e9bf1baf 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) wxWindows team
 // Created:     13.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

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


@@ -20,23 +20,26 @@
 #define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
 
 #if defined(__WXMSW__)
 #define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
 
 #if defined(__WXMSW__)

-    #if defined(__WIN32__) && wxUSE_ENH_METAFILE
+    #if wxUSE_ENH_METAFILE

         #include "wx/msw/enhmeta.h"
 
         // map all metafile classes to enh metafile
         #if !wxUSE_WIN_METAFILES_ALWAYS
             typedef wxEnhMetaFile wxMetafile;
             typedef wxEnhMetaFileDC wxMetafileDC;
         #include "wx/msw/enhmeta.h"
 
         // map all metafile classes to enh metafile
         #if !wxUSE_WIN_METAFILES_ALWAYS
             typedef wxEnhMetaFile wxMetafile;
             typedef wxEnhMetaFileDC wxMetafileDC;

+#if wxUSE_DRAG_AND_DROP

             typedef wxEnhMetaFileDataObject wxMetafileDataObject;
             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

-    #else // Win16
+    #else // !wxUSE_ENH_METAFILE

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

+#elif defined(__WXMAC__)
+    #include "wx/mac/metafile.h"

 #endif
 
 #endif
 #endif
 
 #endif