X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbe0af5b15f8b8e95ed45abc2140fb3a1fac3c87..4c460b340f3f32621e83e6efd2f25c43005d60b0:/src/gtk1/region.cpp?ds=sidebyside

diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index 305967bc7d..a19730b0d0 100644
--- a/src/gtk1/region.cpp
+++ b/src/gtk1/region.cpp
@@ -13,15 +13,8 @@
 
 #include "wx/region.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-
-#ifdef __WXDEBUG__
-#ifdef NULL
-#undef NULL
-#endif
-#define NULL ((void*)0L)
-#endif
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // wxRegion
@@ -31,8 +24,8 @@ class wxRegionRefData: public wxObjectRefData
 {
   public:
   
-    wxRegionRefData(void);
-    ~wxRegionRefData(void);
+    wxRegionRefData();
+    ~wxRegionRefData();
   
   public:    
 
@@ -40,12 +33,12 @@ class wxRegionRefData: public wxObjectRefData
     wxList      m_rects;
 };
 
-wxRegionRefData::wxRegionRefData(void)
+wxRegionRefData::wxRegionRefData()
 {
     m_region = (GdkRegion *) NULL;
 }
 
-wxRegionRefData::~wxRegionRefData(void)
+wxRegionRefData::~wxRegionRefData()
 {
     if (m_region) gdk_region_destroy( m_region );
   
@@ -113,13 +106,13 @@ wxRegion::wxRegion( const wxRect& rect )
     }
 }
 
-wxRegion::wxRegion(void)
+wxRegion::wxRegion()
 {
     m_refData = new wxRegionRefData();
     M_REGIONDATA->m_region = gdk_region_new();
 }
 
-wxRegion::~wxRegion(void)
+wxRegion::~wxRegion()
 {
 }
 
@@ -133,7 +126,7 @@ bool wxRegion::operator != ( const wxRegion& region )
     return m_refData != region.m_refData; 
 }
 
-void wxRegion::Clear(void)
+void wxRegion::Clear()
 {
     UnRef();
     m_refData = new wxRegionRefData();
@@ -302,7 +295,7 @@ void wxRegion::GetBox( long& x, long& y, long&w, long &h ) const
     }
 }
 
-wxRect wxRegion::GetBox(void) const
+wxRect wxRegion::GetBox() const
 {
     long x = 0;
     long y = 0;
@@ -312,7 +305,7 @@ wxRect wxRegion::GetBox(void) const
     return wxRect( x, y, w, h );
 }
 
-bool wxRegion::Empty(void) const
+bool wxRegion::Empty() const
 {
     return gdk_region_empty( M_REGIONDATA->m_region );
 }
@@ -352,7 +345,7 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const
     return Contains( rect.x, rect.y, rect.width, rect.height );
 }
 
-GdkRegion *wxRegion::GetRegion(void) const
+GdkRegion *wxRegion::GetRegion() const
 {
     return M_REGIONDATA->m_region;
 }
@@ -368,7 +361,7 @@ wxList *wxRegion::GetRectList() const
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
   
-wxRegionIterator::wxRegionIterator(void)
+wxRegionIterator::wxRegionIterator()
 {
     m_current = 0;
 }
@@ -385,17 +378,17 @@ void wxRegionIterator::Reset( const wxRegion& region )
     m_current = 0;
 }
 
-wxRegionIterator::operator bool (void) const 
+wxRegionIterator::operator bool () const 
 { 
     return m_current < m_region.GetRectList()->Number(); 
 }
 
-bool wxRegionIterator::HaveRects(void) const 
+bool wxRegionIterator::HaveRects() const 
 { 
     return m_current < m_region.GetRectList()->Number(); 
 }
 
-void wxRegionIterator::operator ++ (void)
+void wxRegionIterator::operator ++ ()
 {
     if (m_current < m_region.GetRectList()->Number()) ++m_current;
 }
@@ -405,7 +398,7 @@ void wxRegionIterator::operator ++ (int)
     if (m_current < m_region.GetRectList()->Number()) ++m_current;
 }
 
-long wxRegionIterator::GetX(void) const
+wxCoord wxRegionIterator::GetX() const
 {
     wxNode *node = m_region.GetRectList()->Nth( m_current );
     if (!node) return 0;
@@ -413,7 +406,7 @@ long wxRegionIterator::GetX(void) const
     return r->x;
 }
 
-long wxRegionIterator::GetY(void) const
+wxCoord wxRegionIterator::GetY() const
 {
     wxNode *node = m_region.GetRectList()->Nth( m_current );
     if (!node) return 0;
@@ -421,7 +414,7 @@ long wxRegionIterator::GetY(void) const
     return r->y;
 }
 
-long wxRegionIterator::GetW(void) const
+wxCoord wxRegionIterator::GetW() const
 {
     wxNode *node = m_region.GetRectList()->Nth( m_current );
     if (!node) return 0;
@@ -429,7 +422,7 @@ long wxRegionIterator::GetW(void) const
     return r->width;
 }
 
-long wxRegionIterator::GetH(void) const
+wxCoord wxRegionIterator::GetH() const
 {
     wxNode *node = m_region.GetRectList()->Nth( m_current );
     if (!node) return 0;