projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unselect all wxDataViewCtrl items when clicking outside of the item area.
[wxWidgets.git]
/
include
/
wx
/
gtk
/
region.h
diff --git
a/include/wx/gtk/region.h
b/include/wx/gtk/region.h
index 1886952495a9724e20c54b13b7118f4e557eeb86..2069305b7104ad962c4401ee34cc0f9f53fafac3 100644
(file)
--- a/
include/wx/gtk/region.h
+++ b/
include/wx/gtk/region.h
@@
-10,6
+10,10
@@
#ifndef _WX_GTK_REGION_H_
#define _WX_GTK_REGION_H_
#ifndef _WX_GTK_REGION_H_
#define _WX_GTK_REGION_H_
+#ifdef __WXGTK3__
+typedef struct _cairo_region cairo_region_t;
+#endif
+
// ----------------------------------------------------------------------------
// wxRegion
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxRegion
// ----------------------------------------------------------------------------
@@
-35,8
+39,10
@@
public:
InitRect(rect.x, rect.y, rect.width, rect.height);
}
InitRect(rect.x, rect.y, rect.width, rect.height);
}
- wxRegion( size_t n, const wxPoint *points, int fillStyle = wxODDEVEN_RULE );
+ wxRegion( size_t n, const wxPoint *points,
+ wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
+#if wxUSE_IMAGE
wxRegion( const wxBitmap& bmp)
{
Union(bmp);
wxRegion( const wxBitmap& bmp)
{
Union(bmp);
@@
-46,6
+52,7
@@
public:
{
Union(bmp, transColour, tolerance);
}
{
Union(bmp, transColour, tolerance);
}
+#endif // wxUSE_IMAGE
virtual ~wxRegion();
virtual ~wxRegion();
@@
-53,17
+60,16
@@
public:
virtual void Clear();
virtual bool IsEmpty() const;
virtual void Clear();
virtual bool IsEmpty() const;
-public:
- // Init with GdkRegion, set ref count to 2 so that
- // the C++ class will not destroy the region!
- wxRegion( GdkRegion *region );
-
+#ifdef __WXGTK3__
+ cairo_region_t* GetRegion() const;
+#else
+ wxRegion(const GdkRegion* region);
GdkRegion *GetRegion() const;
GdkRegion *GetRegion() const;
+#endif
protected:
protected:
- // ref counting code
- virtual wxObjectRefData *CreateRefData() const;
- virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+ virtual wxGDIRefData *CreateGDIRefData() const;
+ virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
// wxRegionBase pure virtuals
virtual bool DoIsEqual(const wxRegion& region) const;
// wxRegionBase pure virtuals
virtual bool DoIsEqual(const wxRegion& region) const;
@@
-120,13
+126,11
@@
private:
void Init();
void CreateRects( const wxRegion& r );
void Init();
void CreateRects( const wxRegion& r );
- size_t m_current;
wxRegion m_region;
wxRegion m_region;
-
wxRect *m_rects;
wxRect *m_rects;
- size_t m_numRects;
+ int m_numRects;
+ int m_current;
-private:
DECLARE_DYNAMIC_CLASS(wxRegionIterator)
};
DECLARE_DYNAMIC_CLASS(wxRegionIterator)
};