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 2e23876d447a0be33b85297c80be90b33277f317..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
 // 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
 
 #ifdef __GNUG__
 #pragma interface


@@ -28,7 +28,7 @@ class wxRegion;
 // constants
 //-----------------------------------------------------------------------------
 
 // constants
 //-----------------------------------------------------------------------------
 

-enum wxRegionContain 
+enum wxRegionContain

 {
   wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
 };
 {
   wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
 };


@@ -46,13 +46,13 @@ wxRGN_XOR           // Creates the union of two combined regions except for any
 // wxRegion
 //-----------------------------------------------------------------------------
 
 // wxRegion
 //-----------------------------------------------------------------------------
 

-class wxRegion : public wxGDIObject 
+class wxRegion : public wxGDIObject

 {
   DECLARE_DYNAMIC_CLASS(wxRegion);
 {
   DECLARE_DYNAMIC_CLASS(wxRegion);

-  
+

   public:
   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();
     wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight );
     wxRegion( const wxRect& rect );
     wxRegion();


@@ -65,52 +65,49 @@ class wxRegion : public wxGDIObject
 
     bool operator == ( const wxRegion& region );
     bool operator != ( const wxRegion& region );
 
     bool operator == ( const wxRegion& region );
     bool operator != ( const wxRegion& region );

-    
+

     void Clear();
 
     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 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 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 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 );
 
     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(); }
 
     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;
     wxRegionContain Contains(const wxPoint& pt) const;
     wxRegionContain Contains(const wxRect& rect) const;

-    
+

   public:
   public:

-  
-    wxList    *GetRectList() const;    
+
+    wxList    *GetRectList() const;

     GdkRegion *GetRegion() const;
 };
 
     GdkRegion *GetRegion() const;
 };
 

-class wxRegionIterator: public wxObject 
+class wxRegionIterator: public wxObject

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxRegionIterator);
-  
-  public:
-  
+public:

     wxRegionIterator();
     wxRegionIterator(const wxRegion& region);
 
     wxRegionIterator();
     wxRegionIterator(const wxRegion& region);
 

-    void Reset() { m_current = 0; }
+    void Reset() { m_current = 0u; }

     void Reset(const wxRegion& region);
 
     operator bool () const;
     void Reset(const wxRegion& region);
 
     operator bool () const;


@@ -119,20 +116,22 @@ class wxRegionIterator: public wxObject
     void operator ++ ();
     void operator ++ (int);
 
     void operator ++ ();
     void operator ++ (int);
 

-    long GetX() const;
-    long GetY() const;
-    long GetW() const;
-    long GetWidth() const { return GetW(); }
-    long GetH() const;
-    long GetHeight() const { return GetH(); }
+    wxCoord GetX() const;
+    wxCoord GetY() const;
+    wxCoord GetW() const;
+    wxCoord GetWidth() const { return GetW(); }
+    wxCoord GetH() const;
+    wxCoord GetHeight() const { return GetH(); }

     wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
 
     wxRect GetRect() const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
 

-  private:
-  
-   long       m_current;
-   wxRegion   m_region;
+private:
+    size_t   m_current;
+    wxRegion m_region;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator);

 };
 
 
 #endif
 };
 
 
 #endif

-       // __REGIONH__
+        // _WX_GTK_REGION_H_