New code for Update() under GTK 2.0. Added
native GdkRegion() constructor to wxRegion. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -53,7 +53,7 @@ class wxRegion : public wxGDIObject
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxRegion() { }
|
wxRegion() { }
|
||||||
|
|
||||||
wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
|
wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
|
||||||
{
|
{
|
||||||
InitRect(x, y, w, h);
|
InitRect(x, y, w, h);
|
||||||
@@ -115,6 +115,10 @@ public:
|
|||||||
wxRegionContain Contains(const wxRect& rect) const;
|
wxRegionContain Contains(const wxRect& rect) const;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
// Init with GdkRegion, set ref count to 2 so that
|
||||||
|
// the C++ class will not destroy the region!
|
||||||
|
wxRegion( GdkRegion *region );
|
||||||
|
|
||||||
GdkRegion *GetRegion() const;
|
GdkRegion *GetRegion() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@@ -201,8 +201,11 @@ public:
|
|||||||
GdkICAttr *m_icattr;
|
GdkICAttr *m_icattr;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __WXGTK20__
|
||||||
// The area to be cleared (and not just refreshed)
|
// The area to be cleared (and not just refreshed)
|
||||||
|
// We cannot make this distinction under GTK 2.0.
|
||||||
wxRegion m_clearRegion;
|
wxRegion m_clearRegion;
|
||||||
|
#endif
|
||||||
|
|
||||||
// scrolling stuff
|
// scrolling stuff
|
||||||
GtkAdjustment *m_hAdjust,*m_vAdjust;
|
GtkAdjustment *m_hAdjust,*m_vAdjust;
|
||||||
|
@@ -53,7 +53,7 @@ class wxRegion : public wxGDIObject
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxRegion() { }
|
wxRegion() { }
|
||||||
|
|
||||||
wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
|
wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
|
||||||
{
|
{
|
||||||
InitRect(x, y, w, h);
|
InitRect(x, y, w, h);
|
||||||
@@ -115,6 +115,10 @@ public:
|
|||||||
wxRegionContain Contains(const wxRect& rect) const;
|
wxRegionContain Contains(const wxRect& rect) const;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
// Init with GdkRegion, set ref count to 2 so that
|
||||||
|
// the C++ class will not destroy the region!
|
||||||
|
wxRegion( GdkRegion *region );
|
||||||
|
|
||||||
GdkRegion *GetRegion() const;
|
GdkRegion *GetRegion() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@@ -201,8 +201,11 @@ public:
|
|||||||
GdkICAttr *m_icattr;
|
GdkICAttr *m_icattr;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __WXGTK20__
|
||||||
// The area to be cleared (and not just refreshed)
|
// The area to be cleared (and not just refreshed)
|
||||||
|
// We cannot make this distinction under GTK 2.0.
|
||||||
wxRegion m_clearRegion;
|
wxRegion m_clearRegion;
|
||||||
|
#endif
|
||||||
|
|
||||||
// scrolling stuff
|
// scrolling stuff
|
||||||
GtkAdjustment *m_hAdjust,*m_vAdjust;
|
GtkAdjustment *m_hAdjust,*m_vAdjust;
|
||||||
|
Reference in New Issue
Block a user