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

removing register keyword

Browse Source 
needed for c++17 compatibility, this file is only used in iOS builds
This commit is contained in:
Stefan Csomor
2020-05-07 10:36:51 +02:00
parent f6bb4aa6e2
commit 0edda02847
1 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
src/generic/regiong.cpp
View File

@@ -60,13 +60,13 @@ public:
Region r, Region r,
wxRect *rect); wxRect *rect);
static bool XOffsetRegion( static bool XOffsetRegion(
register Region pRegion, Region pRegion,
register int x, int x,
register int y); int y);
static bool XIntersectRegion( static bool XIntersectRegion(
Region reg1, Region reg1,
Region reg2, /* source regions */ Region reg2, /* source regions */
register Region newReg); /* destination Region */ Region newReg); /* destination Region */
static bool XUnionRegion( static bool XUnionRegion(
Region reg1, Region reg1,
Region reg2, /* source regions */ Region reg2, /* source regions */
@@ -74,7 +74,7 @@ public:
static bool XSubtractRegion( static bool XSubtractRegion(
Region regM, Region regM,
Region regS, Region regS,
register Region regD); Region regD);
static bool XXorRegion(Region sra, Region srb, Region dr); static bool XXorRegion(Region sra, Region srb, Region dr);
static bool XEmptyRegion( static bool XEmptyRegion(
Region r); Region r);
@@ -83,7 +83,7 @@ public:
Region pRegion, Region pRegion,
int x, int y); int x, int y);
static wxRegionContain XRectInRegion( static wxRegionContain XRectInRegion(
register Region region, Region region,
int rx, int ry, int rx, int ry,
unsigned int rwidth, unsigned int rheight); unsigned int rwidth, unsigned int rheight);
@@ -93,77 +93,77 @@ protected:
Region pReg); Region pReg);
static bool XDestroyRegion(Region r); static bool XDestroyRegion(Region r);
static int miIntersectO ( static int miIntersectO (
register Region pReg, Region pReg,
register BoxPtr r1, BoxPtr r1,
BoxPtr r1End, BoxPtr r1End,
register BoxPtr r2, BoxPtr r2,
BoxPtr r2End, BoxPtr r2End,
wxCoord y1, wxCoord y1,
wxCoord y2); wxCoord y2);
static void miRegionCopy( static void miRegionCopy(
register Region dstrgn, Region dstrgn,
register Region rgn); Region rgn);
static int miCoalesce( static int miCoalesce(
register Region pReg, /* Region to coalesce */ Region pReg, /* Region to coalesce */
int prevStart, /* Index of start of previous band */ int prevStart, /* Index of start of previous band */
int curStart); /* Index of start of current band */ int curStart); /* Index of start of current band */
static void miRegionOp( static void miRegionOp(
register Region newReg, /* Place to store result */ Region newReg, /* Place to store result */
Region reg1, /* First region in operation */ Region reg1, /* First region in operation */
Region reg2, /* 2d region in operation */ Region reg2, /* 2d region in operation */
int (*overlapFunc)( int (*overlapFunc)(
register Region pReg, Region pReg,
register BoxPtr r1, BoxPtr r1,
BoxPtr r1End, BoxPtr r1End,
register BoxPtr r2, BoxPtr r2,
BoxPtr r2End, BoxPtr r2End,
wxCoord y1, wxCoord y1,
wxCoord y2), /* Function to call for over- wxCoord y2), /* Function to call for over-
* lapping bands */ * lapping bands */
int (*nonOverlap1Func)( int (*nonOverlap1Func)(
register Region pReg, Region pReg,
register BoxPtr r, BoxPtr r,
BoxPtr rEnd, BoxPtr rEnd,
register wxCoord y1, wxCoord y1,
register wxCoord y2), /* Function to call for non- wxCoord y2), /* Function to call for non-
* overlapping bands in region * overlapping bands in region
* 1 */ * 1 */
int (*nonOverlap2Func)( int (*nonOverlap2Func)(
register Region pReg, Region pReg,
register BoxPtr r, BoxPtr r,
BoxPtr rEnd, BoxPtr rEnd,
register wxCoord y1, wxCoord y1,
register wxCoord y2)); /* Function to call for non- wxCoord y2)); /* Function to call for non-
* overlapping bands in region * overlapping bands in region
* 2 */ * 2 */
static int miUnionNonO ( static int miUnionNonO (
register Region pReg, Region pReg,
register BoxPtr r, BoxPtr r,
BoxPtr rEnd, BoxPtr rEnd,
register wxCoord y1, wxCoord y1,
register wxCoord y2); wxCoord y2);
static int miUnionO ( static int miUnionO (
register Region pReg, Region pReg,
register BoxPtr r1, BoxPtr r1,
BoxPtr r1End, BoxPtr r1End,
register BoxPtr r2, BoxPtr r2,
BoxPtr r2End, BoxPtr r2End,
register wxCoord y1, wxCoord y1,
register wxCoord y2); wxCoord y2);
static int miSubtractNonO1 ( static int miSubtractNonO1 (
register Region pReg, Region pReg,
register BoxPtr r, BoxPtr r,
BoxPtr rEnd, BoxPtr rEnd,
register wxCoord y1, wxCoord y1,
register wxCoord y2); wxCoord y2);
static int miSubtractO ( static int miSubtractO (
register Region pReg, Region pReg,
register BoxPtr r1, BoxPtr r1,
BoxPtr r1End, BoxPtr r1End,
register BoxPtr r2, BoxPtr r2,
BoxPtr r2End, BoxPtr r2End,
register wxCoord y1, wxCoord y1,
register wxCoord y2); wxCoord y2);
protected: protected:
long size; long size;
long numRects; long numRects;
@@ -714,9 +714,9 @@ XDestroyRegion(
bool REGION:: bool REGION::
XOffsetRegion( XOffsetRegion(
register Region pRegion, Region pRegion,
register int x, int x,
register int y) int y)
{ {
int nbox; int nbox;
BOX *pbox; BOX *pbox;
@@ -758,10 +758,10 @@ XOffsetRegion(
/* static void*/ /* static void*/
int REGION:: int REGION::
miIntersectO ( miIntersectO (
register Region pReg, Region pReg,
register BoxPtr r1, BoxPtr r1,
BoxPtr r1End, BoxPtr r1End,
register BoxPtr r2, BoxPtr r2,
BoxPtr r2End, BoxPtr r2End,
wxCoord y1, wxCoord y1,
wxCoord y2) wxCoord y2)
@@ -824,7 +824,7 @@ bool REGION::
XIntersectRegion( XIntersectRegion(
Region reg1, Region reg1,
Region reg2, /* source regions */ Region reg2, /* source regions */
register Region newReg) /* destination Region */ Region newReg) /* destination Region */
{ {
/* check for trivial reject */ /* check for trivial reject */
if ( (!(reg1->numRects)) || (!(reg2->numRects)) || if ( (!(reg1->numRects)) || (!(reg2->numRects)) ||
@@ -847,8 +847,8 @@ XIntersectRegion(
void REGION:: void REGION::
miRegionCopy( miRegionCopy(
register Region dstrgn, Region dstrgn,
register Region rgn) Region rgn)
{ {
if (dstrgn != rgn) /* don't want to copy to itself */ if (dstrgn != rgn) /* don't want to copy to itself */
@@ -905,7 +905,7 @@ miRegionCopy(
/* static int*/ /* static int*/
int REGION:: int REGION::
miCoalesce( miCoalesce(
register Region pReg, /* Region to coalesce */ Region pReg, /* Region to coalesce */
int prevStart, /* Index of start of previous band */ int prevStart, /* Index of start of previous band */
int curStart) /* Index of start of current band */ int curStart) /* Index of start of current band */
{ {
@@ -1057,32 +1057,32 @@ miCoalesce(
/* static void*/ /* static void*/
void REGION:: void REGION::
miRegionOp( miRegionOp(
register Region newReg, /* Place to store result */ Region newReg, /* Place to store result */
Region reg1, /* First region in operation */ Region reg1, /* First region in operation */
Region reg2, /* 2d region in operation */ Region reg2, /* 2d region in operation */
int (*overlapFunc)( int (*overlapFunc)(
register Region pReg, Region pReg,
register BoxPtr r1, BoxPtr r1,
BoxPtr r1End, BoxPtr r1End,
register BoxPtr r2, BoxPtr r2,
BoxPtr r2End, BoxPtr r2End,
wxCoord y1, wxCoord y1,
wxCoord y2), /* Function to call for over- wxCoord y2), /* Function to call for over-
* lapping bands */ * lapping bands */
int (*nonOverlap1Func)( int (*nonOverlap1Func)(
register Region pReg, Region pReg,
register BoxPtr r, BoxPtr r,
BoxPtr rEnd, BoxPtr rEnd,
register wxCoord y1, wxCoord y1,
register wxCoord y2), /* Function to call for non- wxCoord y2), /* Function to call for non-
* overlapping bands in region * overlapping bands in region
* 1 */ * 1 */
int (*nonOverlap2Func)( int (*nonOverlap2Func)(
register Region pReg, Region pReg,
register BoxPtr r, BoxPtr r,
BoxPtr rEnd, BoxPtr rEnd,
register wxCoord y1, wxCoord y1,
register wxCoord y2)) /* Function to call for non- wxCoord y2)) /* Function to call for non-
* overlapping bands in region * overlapping bands in region
* 2 */ * 2 */
{ {
@@ -1366,11 +1366,11 @@ miRegionOp(
/* static void*/ /* static void*/
int REGION:: int REGION::
miUnionNonO ( miUnionNonO (
register Region pReg, Region pReg,
register BoxPtr r, BoxPtr r,
BoxPtr rEnd, BoxPtr rEnd,
register wxCoord y1, wxCoord y1,
register wxCoord y2) wxCoord y2)
{ {
BoxPtr pNextRect; BoxPtr pNextRect;
@@ -1415,13 +1415,13 @@ miUnionNonO (
/* static void*/ /* static void*/
int REGION:: int REGION::
miUnionO ( miUnionO (
register Region pReg, Region pReg,
register BoxPtr r1, BoxPtr r1,
BoxPtr r1End, BoxPtr r1End,
register BoxPtr r2, BoxPtr r2,
BoxPtr r2End, BoxPtr r2End,
register wxCoord y1, wxCoord y1,
register wxCoord y2) wxCoord y2)
{ {
BoxPtr pNextRect; BoxPtr pNextRect;
@@ -1567,11 +1567,11 @@ XUnionRegion(
/* static void*/ /* static void*/
int REGION:: int REGION::
miSubtractNonO1 ( miSubtractNonO1 (
register Region pReg, Region pReg,
register BoxPtr r, BoxPtr r,
BoxPtr rEnd, BoxPtr rEnd,
register wxCoord y1, wxCoord y1,
register wxCoord y2) wxCoord y2)
{ {
BoxPtr pNextRect; BoxPtr pNextRect;
@@ -1614,13 +1614,13 @@ miSubtractNonO1 (
/* static void*/ /* static void*/
int REGION:: int REGION::
miSubtractO ( miSubtractO (
register Region pReg, Region pReg,
register BoxPtr r1, BoxPtr r1,
BoxPtr r1End, BoxPtr r1End,
register BoxPtr r2, BoxPtr r2,
BoxPtr r2End, BoxPtr r2End,
register wxCoord y1, wxCoord y1,
register wxCoord y2) wxCoord y2)
{ {
BoxPtr pNextRect; BoxPtr pNextRect;
int x1; int x1;
@@ -1761,7 +1761,7 @@ miSubtractO (
*----------------------------------------------------------------------- *-----------------------------------------------------------------------
*/ */
bool REGION::XSubtractRegion(Region regM, Region regS, register Region regD) bool REGION::XSubtractRegion(Region regM, Region regS, Region regD)
{ {
/* check for trivial reject */ /* check for trivial reject */
if ( (!(regM->numRects)) || (!(regS->numRects)) || if ( (!(regM->numRects)) || (!(regS->numRects)) ||
@@ -1851,7 +1851,7 @@ bool REGION::XPointInRegion(Region pRegion, int x, int y)
return false; return false;
} }
wxRegionContain REGION::XRectInRegion(register Region region, wxRegionContain REGION::XRectInRegion(Region region,
int rx, int ry, int rx, int ry,
unsigned int rwidth, unsigned int rwidth,
unsigned int rheight) unsigned int rheight)