AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moved patterns to static structures, added resouce loader struct where needed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2002-01-20 16:27:34 +00:00
parent 53fd991c44
commit ffd678371d
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mac/carbon/dc.cpp
View File

@ -1790,11 +1790,21 @@ void wxDC::MacInstallFont() const
}
Pattern gHatchPatterns[] =
{
{ 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF } ,
{ 0x01 , 0x02 , 0x04 , 0x08 , 0x10 , 0x20 , 0x40 , 0x80 } ,
{ 0x80 , 0x40 , 0x20 , 0x10 , 0x08 , 0x04 , 0x02 , 0x01 } ,
{ 0x10 , 0x10 , 0x10 , 0xFF , 0x10 , 0x10 , 0x10 , 0x10 } ,
{ 0x00 , 0x00 , 0x00 , 0xFF , 0x00 , 0x00 , 0x00 , 0x00 } ,
{ 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 } ,
{ 0x81 , 0x42 , 0x24 , 0x18 , 0x18 , 0x24 , 0x42 , 0x81 } ,
} ;
static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
{
// we have our own pattern list now
int thePatListID = 128;
int theIndex;
int theIndex = 1 ;
switch(hatchStyle)
{
case wxBDIAGONAL_HATCH:
@ -1819,7 +1829,7 @@ static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
theIndex = 1; // solid pattern
break;
}
GetIndPattern( pattern, thePatListID, theIndex);
*pattern = gHatchPatterns[theIndex-1] ;
}
void wxDC::MacInstallPen() const

18
src/mac/dc.cpp
View File

@ -1790,11 +1790,21 @@ void wxDC::MacInstallFont() const
}
Pattern gHatchPatterns[] =
{
{ 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF } ,
{ 0x01 , 0x02 , 0x04 , 0x08 , 0x10 , 0x20 , 0x40 , 0x80 } ,
{ 0x80 , 0x40 , 0x20 , 0x10 , 0x08 , 0x04 , 0x02 , 0x01 } ,
{ 0x10 , 0x10 , 0x10 , 0xFF , 0x10 , 0x10 , 0x10 , 0x10 } ,
{ 0x00 , 0x00 , 0x00 , 0xFF , 0x00 , 0x00 , 0x00 , 0x00 } ,
{ 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 } ,
{ 0x81 , 0x42 , 0x24 , 0x18 , 0x18 , 0x24 , 0x42 , 0x81 } ,
} ;
static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
{
// we have our own pattern list now
int thePatListID = 128;
int theIndex;
int theIndex = 1 ;
switch(hatchStyle)
{
case wxBDIAGONAL_HATCH:
@ -1819,7 +1829,7 @@ static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
theIndex = 1; // solid pattern
break;
}
GetIndPattern( pattern, thePatListID, theIndex);
*pattern = gHatchPatterns[theIndex-1] ;
}
void wxDC::MacInstallPen() const