disallow creation of wxDC objects and made wxDC an ABC; use wxDCTemp instead of wxDC in wx code; fixed WinCE bug with deleting a DC which should be released in wxListBox::MSWOnMeasure()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -258,23 +258,6 @@ wxColourChanger::~wxColourChanger()
|
||||
// wxDC
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
// Default constructor
|
||||
wxDC::wxDC()
|
||||
{
|
||||
m_canvas = NULL;
|
||||
|
||||
m_oldBitmap = 0;
|
||||
m_oldPen = 0;
|
||||
m_oldBrush = 0;
|
||||
m_oldFont = 0;
|
||||
#if wxUSE_PALETTE
|
||||
m_oldPalette = 0;
|
||||
#endif // wxUSE_PALETTE
|
||||
|
||||
m_bOwnsDC = false;
|
||||
m_hDC = 0;
|
||||
}
|
||||
|
||||
wxDC::~wxDC()
|
||||
{
|
||||
if ( m_hDC != 0 )
|
||||
@@ -2285,12 +2268,14 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
|
||||
return success;
|
||||
}
|
||||
|
||||
void wxDC::DoGetSize(int *w, int *h) const
|
||||
void wxDC::GetDeviceSize(int *width, int *height) const
|
||||
{
|
||||
WXMICROWIN_CHECK_HDC
|
||||
|
||||
if ( w ) *w = ::GetDeviceCaps(GetHdc(), HORZRES);
|
||||
if ( h ) *h = ::GetDeviceCaps(GetHdc(), VERTRES);
|
||||
if ( width )
|
||||
*width = ::GetDeviceCaps(GetHdc(), HORZRES);
|
||||
if ( height )
|
||||
*height = ::GetDeviceCaps(GetHdc(), VERTRES);
|
||||
}
|
||||
|
||||
void wxDC::DoGetSizeMM(int *w, int *h) const
|
||||
|
Reference in New Issue
Block a user