replace changes of r49890 by defining more compatibility operators in wxCmdLineArgsAr...

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

diff --git a/include/wx/overlay.h b/include/wx/overlay.h
index b99b850aa8ffa3f09437106978a41fd1332d2462..a5e2d97be6c3c044f3fa2782942ba80f37750a4e 100644 (file)
--- a/include/wx/overlay.h
+++ b/include/wx/overlay.h
@@ -14,14 +14,12 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#ifndef wxHAS_NATIVE_OVERLAY
-    #if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
-        #define wxHAS_NATIVE_OVERLAY 1
-    #elif defined(__WXDFB__)
-        #define wxHAS_NATIVE_OVERLAY 1
-    #else
-        #define wxHAS_NATIVE_OVERLAY 0
-    #endif
+#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
+    #define wxHAS_NATIVE_OVERLAY 1
+#elif defined(__WXDFB__)
+    #define wxHAS_NATIVE_OVERLAY 1
+#else
+    // don't define wxHAS_NATIVE_OVERLAY

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -30,8 +28,8 @@
 // internal code
 // ----------------------------------------------------------------------------
 
 // internal code
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxOverlayImpl;
-class WXDLLEXPORT wxWindowDC;
+class WXDLLIMPEXP_FWD_CORE wxOverlayImpl;
+class WXDLLIMPEXP_FWD_CORE wxWindowDC;

 
 class WXDLLEXPORT wxOverlay
 {
 
 class WXDLLEXPORT wxOverlay
 {


@@ -47,7 +45,7 @@ public:
     wxOverlayImpl *GetImpl() { return m_impl; }
 
 private:
     wxOverlayImpl *GetImpl() { return m_impl; }
 
 private:

-    friend class WXDLLEXPORT wxDCOverlay;
+    friend class WXDLLIMPEXP_FWD_CORE wxDCOverlay;

 
     // returns true if it has been setup
     bool IsOk();
 
     // returns true if it has been setup
     bool IsOk();