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

Additions to help Fonts compile clean and add SetPS impelementation to wxRegion for OS2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-12-18 20:06:39 +00:00
parent e7ffb21b6b
commit 442275372d
2 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/os2/data.cpp
View File

@@ -96,6 +96,7 @@ wxBrush wxNullBrush;
wxPalette wxNullPalette; wxPalette wxNullPalette;
wxFont wxNullFont; wxFont wxNullFont;
wxColour wxNullColour; wxColour wxNullColour;
wxNativeFontInfo wxNullNativeFontInfo;
// Default window names // Default window names
const wxChar *wxButtonNameStr = wxT("button"); const wxChar *wxButtonNameStr = wxT("button");

45
src/os2/region.cpp
View File

@@ -555,6 +555,51 @@ WXHRGN wxRegion::GetHRGN() const
return (WXHRGN) M_REGION; return (WXHRGN) M_REGION;
} }
//
// Set a new PS, this means we have to recreate the old region in the new
// PS
//
void wxRegion::SetPS(
HPS hPS
)
{
RGNRECT vRgnData;
PRECTL pRect = NULL;
if (::GpiQueryRegionRects( ((wxRegionRefData*)m_refData)->m_hPS
,((wxRegionRefData*)m_refData)->m_hRegion
,NULL
,&vRgnData
,NULL
))
{
pRect = new RECTL[vRgnData.crcReturned];
vRgnData.crc = vRgnData.crcReturned;
vRgnData.ircStart = 1;
if (::GpiQueryRegionRects( ((wxRegionRefData*)m_refData)->m_hPS
,((wxRegionRefData*)m_refData)->m_hRegion
,NULL
,&vRgnData
,pRect
))
{
//
// First destroy the region out of the old PS
// and then create it in the new and set the new to current
//
::GpiDestroyRegion( ((wxRegionRefData*)m_refData)->m_hPS
,M_REGION
);
((wxRegionRefData*)m_refData)->m_hRegion = ::GpiCreateRegion( hPS
,vRgnData.crcReturned
,pRect
);
((wxRegionRefData*)m_refData)->m_hPS = hPS;
}
delete [] pRect;
}
} // end of wxRegion::SetPS
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// // // //
// wxRegionIterator // // wxRegionIterator //