moved wxOverlay into overlay.* files and out of dc.h/dcbase.cpp; implemented wxOverlay for wxDirectFB port
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -13,6 +13,12 @@
|
||||
#define _WX_CARET_H_
|
||||
|
||||
#include "wx/timer.h"
|
||||
#include "wx/dc.h"
|
||||
#include "wx/overlay.h"
|
||||
|
||||
#if wxHAS_NATIVE_OVERLAY
|
||||
#define wxHAS_CARET_USING_OVERLAYS 1
|
||||
#endif
|
||||
|
||||
class WXDLLIMPEXP_CORE wxCaret;
|
||||
|
||||
@@ -26,18 +32,6 @@ private:
|
||||
wxCaret *m_caret;
|
||||
};
|
||||
|
||||
#ifndef wxUSE_OVERLAY
|
||||
#if defined(wxMAC_USE_CORE_GRAPHICS) && wxMAC_USE_CORE_GRAPHICS
|
||||
#define wxUSE_OVERLAY 1
|
||||
#else
|
||||
#define wxUSE_OVERLAY 0
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if wxUSE_OVERLAY
|
||||
#include "wx/dc.h"
|
||||
#endif
|
||||
|
||||
class WXDLLIMPEXP_CORE wxCaret : public wxCaretBase
|
||||
{
|
||||
public:
|
||||
@@ -82,7 +76,7 @@ private:
|
||||
// GTK specific initialization
|
||||
void InitGeneric();
|
||||
|
||||
#if wxUSE_OVERLAY
|
||||
#if wxHAS_CARET_USING_OVERLAYS
|
||||
// the overlay for displaying the caret
|
||||
wxOverlay m_overlay;
|
||||
#else
|
||||
|
Reference in New Issue
Block a user