work around Borland compilation errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -911,7 +911,10 @@ public:
|
|||||||
if ( &evt != this )
|
if ( &evt != this )
|
||||||
{
|
{
|
||||||
wxEvent::operator=(evt);
|
wxEvent::operator=(evt);
|
||||||
wxKeyboardState::operator=(evt);
|
|
||||||
|
// Borland C++ 5.82 doesn't compile an explicit call to an
|
||||||
|
// implicitly defined operator=() so need to do it this way:
|
||||||
|
*static_cast<wxKeyboardState *>(this) = evt;
|
||||||
|
|
||||||
m_x = evt.m_x;
|
m_x = evt.m_x;
|
||||||
m_y = evt.m_y;
|
m_y = evt.m_y;
|
||||||
|
@@ -561,7 +561,10 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType)
|
|||||||
void wxMouseEvent::Assign(const wxMouseEvent& event)
|
void wxMouseEvent::Assign(const wxMouseEvent& event)
|
||||||
{
|
{
|
||||||
wxEvent::operator=(event);
|
wxEvent::operator=(event);
|
||||||
wxMouseState::operator=(event);
|
|
||||||
|
// Borland C++ 5.82 doesn't compile an explicit call to an implicitly
|
||||||
|
// defined operator=() so need to do it this way:
|
||||||
|
*static_cast<wxMouseState *>(this) = event;
|
||||||
|
|
||||||
m_x = event.m_x;
|
m_x = event.m_x;
|
||||||
m_y = event.m_y;
|
m_y = event.m_y;
|
||||||
|
@@ -784,7 +784,7 @@ bool OutputString(wxOutputStream& stream,
|
|||||||
#if wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
wxUnusedVar(convMem);
|
wxUnusedVar(convMem);
|
||||||
|
|
||||||
const wxWX2MBbuf buf(str.mb_str(convFile ? *convFile : wxConvUTF8));
|
const wxWX2MBbuf buf(str.mb_str(*(convFile ? convFile : &wxConvUTF8)));
|
||||||
if ( !buf )
|
if ( !buf )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user