Compilation fixes for wx{X11,GTK1,Motif} after making ref data non copyable.

Don't use wrong compiler-generated copy ctors in the other ports neither (see
r66371..66373 for wxGTK fixes). This fixes compilation after r66374 without
reducing functionality but just making it more clear where it is missing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-12-15 12:04:13 +00:00
parent 10c49955ad
commit 66f7556189
4 changed files with 35 additions and 8 deletions

View File

@@ -38,6 +38,11 @@ public:
virtual ~wxCursorRefData();
GdkCursor *m_cursor;
private:
// There is no way to copy m_cursor so we can't implement a copy ctor
// properly.
wxDECLARE_NO_COPY_CLASS(wxCursorRefData);
};
wxCursorRefData::wxCursorRefData()
@@ -325,9 +330,12 @@ wxGDIRefData *wxCursor::CreateGDIRefData() const
return new wxCursorRefData;
}
wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
wxGDIRefData *
wxCursor::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const
{
return new wxCursorRefData(*static_cast<const wxCursorRefData *>(data));
wxFAIL_MSG( wxS("Cloning cursors is not implemented in wxGTK.") );
return new wxCursorRefData;
}
//-----------------------------------------------------------------------------

View File

@@ -59,6 +59,11 @@ public:
wxXCursorList m_cursors; // wxXCursor objects, one per display
wxStockCursor m_cursorId; // wxWidgets standard cursor id
private:
// There is no way to copy m_cursor so we can't implement a copy ctor
// properly.
wxDECLARE_NO_COPY_CLASS(wxCursorRefData);
friend class wxCursor;
};
@@ -304,9 +309,12 @@ wxGDIRefData *wxCursor::CreateGDIRefData() const
return new wxCursorRefData;
}
wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
wxGDIRefData *
wxCursor::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const
{
return new wxCursorRefData(*static_cast<const wxCursorRefData *>(data));
wxFAIL_MSG( wxS("Cloning cursors is not implemented in wxMotif.") );
return new wxCursorRefData;
}
// Motif-specific: create/get a cursor for the current display

View File

@@ -41,6 +41,11 @@ public:
WXCursor m_cursor;
WXDisplay *m_display;
private:
// There is no way to copy m_cursor so we can't implement a copy ctor
// properly.
wxDECLARE_NO_COPY_CLASS(wxCursorRefData);
};
wxCursorRefData::wxCursorRefData()
@@ -147,9 +152,12 @@ wxGDIRefData *wxCursor::CreateGDIRefData() const
return new wxCursorRefData;
}
wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
wxGDIRefData *
wxCursor::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const
{
return new wxCursorRefData(*static_cast<const wxCursorRefData *>(data));
wxFAIL_MSG( wxS("Cloning cursors is not implemented in wxX11.") );
return new wxCursorRefData;
}
WXCursor wxCursor::GetCursor() const

View File

@@ -175,9 +175,12 @@ wxGDIRefData *wxPalette::CreateGDIRefData() const
return new wxPaletteRefData;
}
wxGDIRefData *wxPalette::CloneGDIRefData(const wxGDIRefData *data) const
wxGDIRefData *
wxPalette::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const
{
return new wxPaletteRefData(*static_cast<const wxPaletteRefData *>(data));
wxFAIL_MSG( wxS("Cloning palettes is not implemented in wxX11.") );
return new wxPaletteRefData;
}
int wxPalette::GetPixel(unsigned char WXUNUSED(red),