Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxRegion should work with wxCoord, not long

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-05 15:16:57 +00:00
parent 0f2f4986cb
commit 5fc7ede910
4 changed files with 106 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/wx/gtk/region.h
View File

@@ -1,14 +1,14 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: region.h // Name: wx/gtk/region.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __REGIONH__ #ifndef _WX_GTK_REGION_H_
#define __REGIONH__ #define _WX_GTK_REGION_H_
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface #pragma interface
@@ -52,7 +52,7 @@ class wxRegion : public wxGDIObject
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 wxPoint& topLeft, const wxPoint& bottomRight );
wxRegion( const wxRect& rect ); wxRegion( const wxRect& rect );
wxRegion(); wxRegion();
@@ -68,30 +68,30 @@ class wxRegion : public wxGDIObject
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 wxRect& rect );
bool Union( const wxRegion& region ); 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 wxRect& rect );
bool Intersect( const wxRegion& region ); 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 wxRect& rect );
bool Subtract( const wxRegion& region ); 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 wxRect& rect );
bool Xor( const wxRegion& region ); 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 ; wxRect GetBox() const ;
bool Empty() const; bool Empty() const;
bool IsEmpty() const { return Empty(); } bool IsEmpty() const { return Empty(); }
wxRegionContain Contains( long x, long y ) const; wxRegionContain Contains( wxCoord x, wxCoord y ) const;
wxRegionContain Contains( long x, long y, long w, long h ) const; wxRegionContain Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) const;
wxRegionContain Contains(const wxPoint& pt) const; wxRegionContain Contains(const wxPoint& pt) const;
wxRegionContain Contains(const wxRect& rect) const; wxRegionContain Contains(const wxRect& rect) const;
@@ -134,4 +134,4 @@ private:
#endif #endif
// __REGIONH__ // _WX_GTK_REGION_H_

26
include/wx/gtk1/region.h
View File

@@ -1,14 +1,14 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: region.h // Name: wx/gtk/region.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __REGIONH__ #ifndef _WX_GTK_REGION_H_
#define __REGIONH__ #define _WX_GTK_REGION_H_
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface #pragma interface
@@ -52,7 +52,7 @@ class wxRegion : public wxGDIObject
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 wxPoint& topLeft, const wxPoint& bottomRight );
wxRegion( const wxRect& rect ); wxRegion( const wxRect& rect );
wxRegion(); wxRegion();
@@ -68,30 +68,30 @@ class wxRegion : public wxGDIObject
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 wxRect& rect );
bool Union( const wxRegion& region ); 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 wxRect& rect );
bool Intersect( const wxRegion& region ); 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 wxRect& rect );
bool Subtract( const wxRegion& region ); 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 wxRect& rect );
bool Xor( const wxRegion& region ); 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 ; wxRect GetBox() const ;
bool Empty() const; bool Empty() const;
bool IsEmpty() const { return Empty(); } bool IsEmpty() const { return Empty(); }
wxRegionContain Contains( long x, long y ) const; wxRegionContain Contains( wxCoord x, wxCoord y ) const;
wxRegionContain Contains( long x, long y, long w, long h ) const; wxRegionContain Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) const;
wxRegionContain Contains(const wxPoint& pt) const; wxRegionContain Contains(const wxPoint& pt) const;
wxRegionContain Contains(const wxRect& rect) const; wxRegionContain Contains(const wxRect& rect) const;
@@ -134,4 +134,4 @@ private:
#endif #endif
// __REGIONH__ // _WX_GTK_REGION_H_

28
src/gtk/region.cpp
View File

@@ -1,10 +1,10 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: region.cpp // Name: gtk/region.cpp
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -55,7 +55,7 @@ wxRegionRefData::~wxRegionRefData()
IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject); IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject);
wxRegion::wxRegion( long x, long y, long w, long h ) wxRegion::wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
{ {
m_refData = new wxRegionRefData(); m_refData = new wxRegionRefData();
GdkRegion *reg = gdk_region_new(); GdkRegion *reg = gdk_region_new();
@@ -131,7 +131,7 @@ void wxRegion::Clear()
M_REGIONDATA->m_region = gdk_region_new(); M_REGIONDATA->m_region = gdk_region_new();
} }
bool wxRegion::Union( long x, long y, long width, long height ) bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{ {
GdkRectangle rect; GdkRectangle rect;
rect.x = x; rect.x = x;
@@ -176,7 +176,7 @@ bool wxRegion::Union( const wxRegion& region )
return TRUE; return TRUE;
} }
bool wxRegion::Intersect( long x, long y, long width, long height ) bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{ {
wxRegion reg( x, y, width, height ); wxRegion reg( x, y, width, height );
Intersect( reg ); Intersect( reg );
@@ -198,7 +198,7 @@ bool wxRegion::Intersect( const wxRegion& region )
return TRUE; return TRUE;
} }
bool wxRegion::Subtract( long x, long y, long width, long height ) bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{ {
wxRegion reg( x, y, width, height ); wxRegion reg( x, y, width, height );
Subtract( reg ); Subtract( reg );
@@ -220,7 +220,7 @@ bool wxRegion::Subtract( const wxRegion& region )
return TRUE; return TRUE;
} }
bool wxRegion::Xor( long x, long y, long width, long height ) bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{ {
wxRegion reg( x, y, width, height ); wxRegion reg( x, y, width, height );
Xor( reg ); Xor( reg );
@@ -251,7 +251,7 @@ bool wxRegion::Xor( const wxRegion& region )
return TRUE; return TRUE;
} }
void wxRegion::GetBox( long& x, long& y, long&w, long &h ) const void wxRegion::GetBox( wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h ) const
{ {
x = 0; x = 0;
y = 0; y = 0;
@@ -267,10 +267,10 @@ void wxRegion::GetBox( long& x, long& y, long&w, long &h ) const
wxRect wxRegion::GetBox() const wxRect wxRegion::GetBox() const
{ {
long x = 0; wxCoord x = 0;
long y = 0; wxCoord y = 0;
long w = -1; wxCoord w = -1;
long h = -1; wxCoord h = -1;
GetBox( x, y, w, h ); GetBox( x, y, w, h );
return wxRect( x, y, w, h ); return wxRect( x, y, w, h );
} }
@@ -280,7 +280,7 @@ bool wxRegion::Empty() const
return gdk_region_empty( M_REGIONDATA->m_region ); return gdk_region_empty( M_REGIONDATA->m_region );
} }
wxRegionContain wxRegion::Contains( long x, long y ) const wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
{ {
if (gdk_region_point_in( M_REGIONDATA->m_region, x, y )) if (gdk_region_point_in( M_REGIONDATA->m_region, x, y ))
return wxInRegion; return wxInRegion;
@@ -288,7 +288,7 @@ wxRegionContain wxRegion::Contains( long x, long y ) const
return wxOutRegion; return wxOutRegion;
} }
wxRegionContain wxRegion::Contains( long x, long y, long w, long h ) const wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) const
{ {
GdkRectangle rect; GdkRectangle rect;
rect.x = x; rect.x = x;

28
src/gtk1/region.cpp
View File

@@ -1,10 +1,10 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: region.cpp // Name: gtk/region.cpp
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -55,7 +55,7 @@ wxRegionRefData::~wxRegionRefData()
IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject); IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject);
wxRegion::wxRegion( long x, long y, long w, long h ) wxRegion::wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
{ {
m_refData = new wxRegionRefData(); m_refData = new wxRegionRefData();
GdkRegion *reg = gdk_region_new(); GdkRegion *reg = gdk_region_new();
@@ -131,7 +131,7 @@ void wxRegion::Clear()
M_REGIONDATA->m_region = gdk_region_new(); M_REGIONDATA->m_region = gdk_region_new();
} }
bool wxRegion::Union( long x, long y, long width, long height ) bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{ {
GdkRectangle rect; GdkRectangle rect;
rect.x = x; rect.x = x;
@@ -176,7 +176,7 @@ bool wxRegion::Union( const wxRegion& region )
return TRUE; return TRUE;
} }
bool wxRegion::Intersect( long x, long y, long width, long height ) bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{ {
wxRegion reg( x, y, width, height ); wxRegion reg( x, y, width, height );
Intersect( reg ); Intersect( reg );
@@ -198,7 +198,7 @@ bool wxRegion::Intersect( const wxRegion& region )
return TRUE; return TRUE;
} }
bool wxRegion::Subtract( long x, long y, long width, long height ) bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{ {
wxRegion reg( x, y, width, height ); wxRegion reg( x, y, width, height );
Subtract( reg ); Subtract( reg );
@@ -220,7 +220,7 @@ bool wxRegion::Subtract( const wxRegion& region )
return TRUE; return TRUE;
} }
bool wxRegion::Xor( long x, long y, long width, long height ) bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{ {
wxRegion reg( x, y, width, height ); wxRegion reg( x, y, width, height );
Xor( reg ); Xor( reg );
@@ -251,7 +251,7 @@ bool wxRegion::Xor( const wxRegion& region )
return TRUE; return TRUE;
} }
void wxRegion::GetBox( long& x, long& y, long&w, long &h ) const void wxRegion::GetBox( wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h ) const
{ {
x = 0; x = 0;
y = 0; y = 0;
@@ -267,10 +267,10 @@ void wxRegion::GetBox( long& x, long& y, long&w, long &h ) const
wxRect wxRegion::GetBox() const wxRect wxRegion::GetBox() const
{ {
long x = 0; wxCoord x = 0;
long y = 0; wxCoord y = 0;
long w = -1; wxCoord w = -1;
long h = -1; wxCoord h = -1;
GetBox( x, y, w, h ); GetBox( x, y, w, h );
return wxRect( x, y, w, h ); return wxRect( x, y, w, h );
} }
@@ -280,7 +280,7 @@ bool wxRegion::Empty() const
return gdk_region_empty( M_REGIONDATA->m_region ); return gdk_region_empty( M_REGIONDATA->m_region );
} }
wxRegionContain wxRegion::Contains( long x, long y ) const wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
{ {
if (gdk_region_point_in( M_REGIONDATA->m_region, x, y )) if (gdk_region_point_in( M_REGIONDATA->m_region, x, y ))
return wxInRegion; return wxInRegion;
@@ -288,7 +288,7 @@ wxRegionContain wxRegion::Contains( long x, long y ) const
return wxOutRegion; return wxOutRegion;
} }
wxRegionContain wxRegion::Contains( long x, long y, long w, long h ) const wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) const
{ {
GdkRectangle rect; GdkRectangle rect;
rect.x = x; rect.x = x;