X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..66f2aa61c3c7bc326f3287739eded70ca61f775d:/include/wx/overlay.h?ds=inline diff --git a/include/wx/overlay.h b/include/wx/overlay.h index a5e2d97be6..2c00fcb897 100644 --- a/include/wx/overlay.h +++ b/include/wx/overlay.h @@ -14,7 +14,7 @@ #include "wx/defs.h" -#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS +#if defined(__WXMAC__) && wxOSX_USE_CARBON #define wxHAS_NATIVE_OVERLAY 1 #elif defined(__WXDFB__) #define wxHAS_NATIVE_OVERLAY 1 @@ -29,9 +29,9 @@ // ---------------------------------------------------------------------------- class WXDLLIMPEXP_FWD_CORE wxOverlayImpl; -class WXDLLIMPEXP_FWD_CORE wxWindowDC; +class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLEXPORT wxOverlay +class WXDLLIMPEXP_CORE wxOverlay { public: wxOverlay(); @@ -50,32 +50,32 @@ private: // 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; - 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 - 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 - wxDCOverlay(wxOverlay &overlay, wxWindowDC *dc); + wxDCOverlay(wxOverlay &overlay, wxDC *dc); // removes the connection between the overlay and the dc virtual ~wxDCOverlay(); @@ -84,14 +84,14 @@ public: 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; - wxWindowDC* m_dc; + wxDC* m_dc; - DECLARE_NO_COPY_CLASS(wxDCOverlay) + wxDECLARE_NO_COPY_CLASS(wxDCOverlay); }; #endif // _WX_OVERLAY_H_