use #if instead of #ifdef for WX_COMPAT

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 2357fb12e5cbd68fef16683645860b20de8395c6..eb12f06efbfd91b9d1acafee135a8e9c9d326e2e 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -61,7 +61,7 @@ enum wxRasterOperationMode
     wxNAND,        // (NOT src) OR (NOT dst)
     wxOR,          // src OR dst
     wxSET          // 1
     wxNAND,        // (NOT src) OR (NOT dst)
     wxOR,          // src OR dst
     wxSET          // 1

-#ifdef WXWIN_COMPATIBILITY_2_8
+#if WXWIN_COMPATIBILITY_2_8

     ,wxROP_BLACK = wxCLEAR,
     wxBLIT_BLACKNESS = wxCLEAR,
     wxROP_XORPEN = wxXOR,
     ,wxROP_BLACK = wxCLEAR,
     wxBLIT_BLACKNESS = wxCLEAR,
     wxROP_XORPEN = wxXOR,

diff --git a/include/wx/graphics.h b/include/wx/graphics.h
index 14c007ec28921e38f7f69857f8e7a28553f8c41d..aba3af1aa40d8b09d608414e3b497cec3c6c915c 100644 (file)
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -18,6 +18,7 @@
 
 #include "wx/geometry.h"
 #include "wx/dynarray.h"
 
 #include "wx/geometry.h"
 #include "wx/dynarray.h"

+#include "wx/dc.h"

 
 class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
 
 class WXDLLIMPEXP_FWD_CORE wxWindowDC;
 class WXDLLIMPEXP_FWD_CORE wxMemoryDC;