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

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 5adf4edeb9e4e1b006f9fdaf7f330ab30cbfd3a1..1b7f06cf8509f679b2f646cedcad7f0f7dd1119a 100644 (file)
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -53,7 +53,7 @@ class wxRegion : public wxGDIObject
 {
 public:
     wxRegion() { }
 {
 public:
     wxRegion() { }

-
+    

     wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
     {
         InitRect(x, y, w, h);
     wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
     {
         InitRect(x, y, w, h);


@@ -115,6 +115,10 @@ public:
     wxRegionContain Contains(const wxRect& rect) const;
 
 public:
     wxRegionContain Contains(const wxRect& rect) const;
 
 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;
 
 protected:
     GdkRegion *GetRegion() const;
 
 protected:

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index bb882e7e7be07425f84eb579d67f27ed839008eb..730e840c4390008ac8fd0ac0f9a00fa0a85f72f3 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -201,8 +201,11 @@ public:
     GdkICAttr           *m_icattr;
 #endif
 
     GdkICAttr           *m_icattr;
 #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
     GtkAdjustment       *m_hAdjust,*m_vAdjust;
 
     // scrolling stuff
     GtkAdjustment       *m_hAdjust,*m_vAdjust;

diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h
index 5adf4edeb9e4e1b006f9fdaf7f330ab30cbfd3a1..1b7f06cf8509f679b2f646cedcad7f0f7dd1119a 100644 (file)
--- a/include/wx/gtk1/region.h
+++ b/include/wx/gtk1/region.h
@@ -53,7 +53,7 @@ class wxRegion : public wxGDIObject
 {
 public:
     wxRegion() { }
 {
 public:
     wxRegion() { }

-
+    

     wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
     {
         InitRect(x, y, w, h);
     wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
     {
         InitRect(x, y, w, h);


@@ -115,6 +115,10 @@ public:
     wxRegionContain Contains(const wxRect& rect) const;
 
 public:
     wxRegionContain Contains(const wxRect& rect) const;
 
 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;
 
 protected:
     GdkRegion *GetRegion() const;
 
 protected:

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index bb882e7e7be07425f84eb579d67f27ed839008eb..730e840c4390008ac8fd0ac0f9a00fa0a85f72f3 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -201,8 +201,11 @@ public:
     GdkICAttr           *m_icattr;
 #endif
 
     GdkICAttr           *m_icattr;
 #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
     GtkAdjustment       *m_hAdjust,*m_vAdjust;
 
     // scrolling stuff
     GtkAdjustment       *m_hAdjust,*m_vAdjust;