another GetInt/GetId bug fix

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

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 9ba3f5012580409d2b3696f4ab3cdec4879aa748..7369192305fbbe78871d9e3b9a9bb70cd83c9790 100644 (file)
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/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,106 +28,112 @@ class wxRegion;
 // constants
 //-----------------------------------------------------------------------------
 
 // constants
 //-----------------------------------------------------------------------------
 

-enum wxRegionContain 
+enum wxRegionContain

 {
 {

-  wxOutRegion = 0, wxPartRegion = 1, wxInRegion = 2
+    wxOutRegion = 0, 
+    wxPartRegion = 1, 
+    wxInRegion = 2

 };
 
 // So far, for internal use only
 };
 
 // So far, for internal use only

-enum wxRegionOp {
-wxRGN_AND,          // Creates the intersection of the two combined regions.
-wxRGN_COPY,         // Creates a copy of the region identified by hrgnSrc1.
-wxRGN_DIFF,         // Combines the parts of hrgnSrc1 that are not part of hrgnSrc2.
-wxRGN_OR,           // Creates the union of two combined regions.
-wxRGN_XOR           // Creates the union of two combined regions except for any overlapping areas.
+enum wxRegionOp 
+{
+   wxRGN_AND,          // Creates the intersection of the two combined regions.
+   wxRGN_COPY,         // Creates a copy of the region identified by hrgnSrc1.
+   wxRGN_DIFF,         // Combines the parts of hrgnSrc1 that are not part of hrgnSrc2.
+   wxRGN_OR,           // Creates the union of two combined regions.
+   wxRGN_XOR           // Creates the union of two combined regions except for any overlapping areas.

 };
 
 //-----------------------------------------------------------------------------
 // wxRegion
 //-----------------------------------------------------------------------------
 
 };
 
 //-----------------------------------------------------------------------------
 // wxRegion
 //-----------------------------------------------------------------------------
 

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxRegion);
-  
-  public:
-  
-    wxRegion( long x, long y, long w, long h );
+public:
+    wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h );

     wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight );
     wxRegion( const wxRect& rect );
     wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight );
     wxRegion( const wxRect& rect );

-    wxRegion(void);
-    ~wxRegion(void);
+    wxRegion();
+    ~wxRegion();

 
 

-    inline wxRegion( const wxRegion& r ) 
+    inline wxRegion( const wxRegion& r ): wxGDIObject()

       { Ref(r); }
     inline wxRegion& operator = ( const wxRegion& r )
       { Ref(r); return (*this); }
 
       { Ref(r); }
     inline wxRegion& operator = ( const wxRegion& r )
       { Ref(r); return (*this); }
 

-    void Clear(void);
+    bool operator == ( const wxRegion& region );
+    bool operator != ( const wxRegion& region );

 
 

-    bool Union( long x, long y, long width, long height );
+    void Clear();
+
+    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;
-    wxRect GetBox(void) const ;
+    void GetBox( wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h ) const;
+    wxRect GetBox() const ;

 
 

-    bool Empty(void) 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:
+    wxList    *GetRectList() const;
+    GdkRegion *GetRegion() const;

     
     

-  public:
-  
-    wxList    *GetRectList() const;    
-    GdkRegion *GetRegion(void) const;
+private:
+  DECLARE_DYNAMIC_CLASS(wxRegion);

 };
 
 };
 

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

 {
 {

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

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

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

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

-    operator bool (void) const;
-    bool HaveRects(void) const;
+    operator bool () const;
+    bool HaveRects() const;

 
 

-    void operator ++ (void);
+    void operator ++ ();

     void operator ++ (int);
 
     void operator ++ (int);
 

-    long GetX(void) const;
-    long GetY(void) const;
-    long GetW(void) const;
-    long GetWidth(void) const { return GetW(); }
-    long GetH(void) const;
-    long GetHeight(void) const { return GetH(); }
-
-  private:
-  
-   long       m_current;
-   wxRegion   m_region;
+    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()); }
+
+private:
+    size_t   m_current;
+    wxRegion m_region;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxRegionIterator);

 };
 
 
 #endif
 };
 
 
 #endif

-       // __REGIONH__
+        // _WX_GTK_REGION_H_