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

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index b402989ce0c8f9ee8290e25f34f3fb6657d777e0..50a08c7f90582d7313da8ae21beeb3e82217126a 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -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;
 }
 
 //-----------------------------------------------------------------------------

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index 4500e6ebc21eca1a20f0dc80df3ee8307ee255b2..22646e641a976e21475eff4808fbf7d655448078 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -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

diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index 6688cfafeec12860d9f6ca1b32db97d29ae9f786..d89db5b45044556748523b4ca92055c7f3b34ea2 100644 (file)
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -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

diff --git a/src/x11/palette.cpp b/src/x11/palette.cpp
index 82c455bd807a0ac0dd981901c0f686572f89ae3a..dc3f06801defddfbbadb7bb3b0e16685eb767b24 100644 (file)
--- a/src/x11/palette.cpp
+++ b/src/x11/palette.cpp
@@ -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),