Some wxComboCtrlBase member functions were enclosed within incorrect compatibility...

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

diff --git a/include/wx/overlay.h b/include/wx/overlay.h
index b99b850aa8ffa3f09437106978a41fd1332d2462..2c00fcb89766e7ac91dc5ce38219349c5b5b0875 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__) && wxOSX_USE_CARBON
+    #define wxHAS_NATIVE_OVERLAY 1
+#elif defined(__WXDFB__)
+    #define wxHAS_NATIVE_OVERLAY 1
+#else
+    // don't define wxHAS_NATIVE_OVERLAY

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


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

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

 
 

-class WXDLLEXPORT wxOverlay
+class WXDLLIMPEXP_CORE wxOverlay

 {
 public:
     wxOverlay();
 {
 public:
     wxOverlay();


@@ -47,37 +45,37 @@ 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();
 

-    void Init(wxWindowDC* dc, int x , int y , int width , int height);
+    void Init(wxDC* dc, int x , int y , int width , int height);

 
 

-    void BeginDrawing(wxWindowDC* dc);
+    void BeginDrawing(wxDC* dc);

 
 

-    void EndDrawing(wxWindowDC* dc);
+    void EndDrawing(wxDC* dc);

 
 

-    void Clear(wxWindowDC* dc);
+    void Clear(wxDC* dc);

 
     wxOverlayImpl* m_impl;
 
     bool m_inDrawing;
 
 
 
     wxOverlayImpl* m_impl;
 
     bool m_inDrawing;
 
 

-    DECLARE_NO_COPY_CLASS(wxOverlay)
+    wxDECLARE_NO_COPY_CLASS(wxOverlay);

 };
 
 
 };
 
 

-class WXDLLEXPORT wxDCOverlay
+class WXDLLIMPEXP_CORE wxDCOverlay

 {
 public:
     // connects this overlay to the corresponding drawing dc, if the overlay is
     // not initialized yet this call will do so
 {
 public:
     // connects this overlay to the corresponding drawing dc, if the overlay is
     // not initialized yet this call will do so

-    wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc, int x , int y , int width , int height);
+    wxDCOverlay(wxOverlay &overlay, wxDC *dc, int x , int y , int width , int height);

 
     // convenience wrapper that behaves the same using the entire area of the dc
 
     // convenience wrapper that behaves the same using the entire area of the dc

-    wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc);
+    wxDCOverlay(wxOverlay &overlay, wxDC *dc);

 
     // removes the connection between the overlay and the dc
     virtual ~wxDCOverlay();
 
     // removes the connection between the overlay and the dc
     virtual ~wxDCOverlay();


@@ -86,14 +84,14 @@ public:
     void Clear();
 
 private:
     void Clear();
 
 private:

-    void Init(wxWindowDC *dc, int x , int y , int width , int height);
+    void Init(wxDC *dc, int x , int y , int width , int height);

 
     wxOverlay& m_overlay;
 
 
     wxOverlay& m_overlay;
 

-    wxWindowDC* m_dc;
+    wxDC* m_dc;

 
 
 
 

-    DECLARE_NO_COPY_CLASS(wxDCOverlay)
+    wxDECLARE_NO_COPY_CLASS(wxDCOverlay);

 };
 
 #endif // _WX_OVERLAY_H_
 };
 
 #endif // _WX_OVERLAY_H_