wxSize/wxPoint/wxRect versions of functions added to wxMSW, wxMotif;
wxScrollBar::Set/GetPosition changed to Set/GetThumbPosition to avoid clash; various other portability changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -768,6 +768,8 @@ wxVariant::wxVariant(const wxVariant& variant)
|
||||
m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject();
|
||||
variant.m_data->Copy(*m_data);
|
||||
}
|
||||
else
|
||||
m_data = (wxVariantData*) NULL;
|
||||
}
|
||||
|
||||
wxVariant::wxVariant(wxVariantData* data) // User-defined data
|
||||
@@ -804,7 +806,8 @@ void wxVariant::operator= (const wxVariant& variant)
|
||||
delete m_data;
|
||||
m_data = (wxVariantData*) variant.GetData()->GetClassInfo()->CreateObject();
|
||||
}
|
||||
GetData()->Copy(* variant.GetData());
|
||||
// GetData()->Copy(* variant.GetData());
|
||||
variant.GetData()->Copy(* GetData());
|
||||
}
|
||||
|
||||
// Assignment using data, e.g.
|
||||
|
Reference in New Issue
Block a user