1. wxBitmap copy ctor and operator=() taking wxIcon added

2. wxBitmapButton focus rect looks a bit better and it respects the icon
   mask
3. wxWizard::GetPageSize() added


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-11-14 02:22:27 +00:00
parent 954269e6dd
commit 4fe5383d6c
8 changed files with 218 additions and 141 deletions

View File

@@ -355,13 +355,15 @@ void wxObject::Ref(const wxObject& clone)
void wxObject::UnRef()
{
if (m_refData) {
assert(m_refData->m_count > 0);
--(m_refData->m_count);
if (m_refData->m_count == 0)
if ( m_refData )
{
wxASSERT_MSG( m_refData->m_count > 0, _T("invalid ref data count") );
if ( !--m_refData->m_count )
delete m_refData;
m_refData = (wxObjectRefData *) NULL;
}
m_refData = (wxObjectRefData *) NULL;
}
/*