inline functions with if moved to .cpp

[wxWidgets.git] / include / wx / gtk1 / region.h

diff --git a/include/wx/gtk1/region.h b/include/wx/gtk1/region.h
index 0a8848293731d91b72c09a1084d05fbfc3975d61..ff139cb0f5b7b8b422a7455c859819c9dcc4d606 100644 (file)
--- a/include/wx/gtk1/region.h
+++ b/include/wx/gtk1/region.h
@@ -1,14 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        region.h
+// Name:        wx/gtk/region.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __REGIONH__
-#define __REGIONH__
+#ifndef _WX_GTK_REGION_H_
+#define _WX_GTK_REGION_H_
 
 #ifdef __GNUG__
 #pragma interface
@@ -28,7 +28,7 @@ class wxRegion;
 // constants
 //-----------------------------------------------------------------------------
 
-enum wxRegionContain 
+enum wxRegionContain
 {
   wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
 };
@@ -46,13 +46,13 @@ wxRGN_XOR           // Creates the union of two combined regions except for any
 // wxRegion
 //-----------------------------------------------------------------------------
 
-class wxRegion : public wxGDIObject 
+class wxRegion : public wxGDIObject
 {
   DECLARE_DYNAMIC_CLASS(wxRegion);
-  
+
   public:
-  
-    wxRegion( long x, long y, long w, long h );
+
+    wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h );
     wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight );
     wxRegion( const wxRect& rect );
     wxRegion();
@@ -65,49 +65,49 @@ class wxRegion : public wxGDIObject
 
     bool operator == ( const wxRegion& region );
     bool operator != ( const wxRegion& region );
-    
+
     void Clear();
 
-    bool Union( long x, long y, long width, long height );
+    bool Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
     bool Union( const wxRect& rect );
     bool Union( const wxRegion& region );
 
-    bool Intersect( long x, long y, long width, long height );
+    bool Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
     bool Intersect( const wxRect& rect );
     bool Intersect( const wxRegion& region );
 
-    bool Subtract( long x, long y, long width, long height );
+    bool Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
     bool Subtract( const wxRect& rect );
     bool Subtract( const wxRegion& region );
 
-    bool Xor( long x, long y, long width, long height );
+    bool Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
     bool Xor( const wxRect& rect );
     bool Xor( const wxRegion& region );
 
-    void GetBox( long& x, long& y, long&w, long &h ) const;
+    void GetBox( wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h ) const;
     wxRect GetBox() const ;
 
     bool Empty() const;
     bool IsEmpty() const { return Empty(); }
 
-    wxRegionContain Contains( long x, long y ) const;
-    wxRegionContain Contains( long x, long y, long w, long h ) const;
+    wxRegionContain Contains( wxCoord x, wxCoord y ) const;
+    wxRegionContain Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) const;
     wxRegionContain Contains(const wxPoint& pt) const;
     wxRegionContain Contains(const wxRect& rect) const;
-    
+
   public:
-  
-    wxList    *GetRectList() const;    
+
+    wxList    *GetRectList() const;
     GdkRegion *GetRegion() const;
 };
 
-class wxRegionIterator: public wxObject 
+class wxRegionIterator: public wxObject
 {
 public:
     wxRegionIterator();
     wxRegionIterator(const wxRegion& region);
 
-    void Reset() { m_current = 0; }
+    void Reset() { m_current = 0u; }
     void Reset(const wxRegion& region);
 
     operator bool () const;
@@ -125,8 +125,8 @@ public:
     wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
 
 private:
-    long       m_current;
-    wxRegion   m_region;
+    size_t   m_current;
+    wxRegion m_region;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxRegionIterator);
@@ -134,4 +134,4 @@ private:
 
 
 #endif
-       // __REGIONH__
+        // _WX_GTK_REGION_H_