X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78ce938eb8d3c9bca866802151ed2fc6da2bf945..23dd0dcea96a6ac281cda9e861c6675b4ae53d15:/include/wx/private/overlay.h?ds=inline diff --git a/include/wx/private/overlay.h b/include/wx/private/overlay.h index c38ed99036..fa6b3dbe07 100644 --- a/include/wx/private/overlay.h +++ b/include/wx/private/overlay.h @@ -14,10 +14,10 @@ #include "wx/overlay.h" -#if wxHAS_NATIVE_OVERLAY +#ifdef wxHAS_NATIVE_OVERLAY #if defined(__WXMAC__) - #include "wx/mac/carbon/private/overlay.h" + #include "wx/osx/carbon/private/overlay.h" #elif defined(__WXDFB__) #include "wx/dfb/private/overlay.h" #else @@ -27,7 +27,8 @@ #else // !wxHAS_NATIVE_OVERLAY #include "wx/bitmap.h" -#include "wx/window.h" + +class WXDLLIMPEXP_FWD_CORE wxWindow; // generic implementation of wxOverlay class wxOverlayImpl @@ -44,13 +45,13 @@ public: // 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); private: wxBitmap m_bmpSaved ; @@ -58,13 +59,8 @@ private: int m_y ; int m_width ; int m_height ; -// this is to enable wxMOTIF and UNIV to compile.... -// currently (10 oct 06) we don't use m_window -// ce - how do we fix this -#if defined(__WXGTK__) || defined(__WXMSW__) wxWindow* m_window ; -#endif -} ; +}; #endif // wxHAS_NATIVE_OVERLAY/!wxHAS_NATIVE_OVERLAY