Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

[wxWidgets.git] / src / x11 / cursor.cpp

diff --git a/src/x11/cursor.cpp b/src/x11/cursor.cpp
index 354e8dc8dd06a0120650b292ff347dda596538aa..c314e4f387a53d530517bc56745fae8568b21984 100644 (file)
--- a/src/x11/cursor.cpp
+++ b/src/x11/cursor.cpp
@@ -41,6 +41,11 @@ public:
 
     WXCursor     m_cursor;
     WXDisplay   *m_display;
 
     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()
 };
 
 wxCursorRefData::wxCursorRefData()


@@ -124,9 +129,9 @@ void wxCursor::InitFromStock( wxStockCursor cursorId )
 #endif
 }
 
 #endif
 }
 

-wxCursor::wxCursor(const wxString& name,
-                    wxBitmapType type,
-                    int hotSpotX, int hotSpotY)
+wxCursor::wxCursor(const wxString& WXUNUSED(name),
+                    wxBitmapType WXUNUSED(type),
+                    int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY))

 {
    wxFAIL_MSG( wxT("wxCursor creation from file not yet implemented") );
 }
 {
    wxFAIL_MSG( wxT("wxCursor creation from file not yet implemented") );
 }


@@ -147,9 +152,12 @@ wxGDIRefData *wxCursor::CreateGDIRefData() const
     return new wxCursorRefData;
 }
 
     return new wxCursorRefData;
 }
 

-wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
+wxGDIRefData *
+wxCursor::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const

 {
 {

-    return new wxCursorRefData(*wx_static_cast(const wxCursorRefData *, data));
+    wxFAIL_MSG( wxS("Cloning cursors is not implemented in wxX11.") );
+
+    return new wxCursorRefData;

 }
 
 WXCursor wxCursor::GetCursor() const
 }
 
 WXCursor wxCursor::GetCursor() const


@@ -193,7 +201,7 @@ void wxBeginBusyCursor( const wxCursor *WXUNUSED(cursor) )
     if (gs_busyCount++ > 0)
         return;
 
     if (gs_busyCount++ > 0)
         return;
 

-    wxASSERT_MSG( !gs_savedCursor.Ok(),
+    wxASSERT_MSG( !gs_savedCursor.IsOk(),

                   wxT("forgot to call wxEndBusyCursor, will leak memory") );
 
     gs_savedCursor = g_globalCursor;
                   wxT("forgot to call wxEndBusyCursor, will leak memory") );
 
     gs_savedCursor = g_globalCursor;