/////////////////////////////////////////////////////////////////////////////
-// Name: cursor.cpp
+// Name: src/x11/cursor.cpp
// Purpose: wxCursor class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#include "wx/cursor.h"
-#include "wx/gdicmn.h"
-#include "wx/icon.h"
-#include "wx/app.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/icon.h"
+ #include "wx/gdicmn.h"
+ #include "wx/image.h"
+#endif
#include "wx/x11/private.h"
// wxCursor
//-----------------------------------------------------------------------------
-class wxCursorRefData: public wxObjectRefData
+class wxCursorRefData: public wxGDIRefData
{
public:
wxCursorRefData();
- ~wxCursorRefData();
+ virtual ~wxCursorRefData();
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()
}
-wxCursor::wxCursor( int cursorId )
+void wxCursor::InitFromStock( wxStockCursor cursorId )
{
m_refData = new wxCursorRefData();
#if wxUSE_NANOX
// TODO Create some standard cursors from bitmaps.
-
-
+
+
#else
// !wxUSE_NANOX
-
+
M_CURSORDATA->m_display = wxGlobalDisplay();
wxASSERT_MSG( M_CURSORDATA->m_display, wxT("No display") );
-
+
int x_cur = XC_left_ptr;
switch (cursorId)
{
#endif
}
-wxCursor::wxCursor(const char bits[], int width, int height,
- int hotSpotX, int hotSpotY,
- const char maskBits[], wxColour *fg, wxColour *bg)
+wxCursor::wxCursor(const wxString& WXUNUSED(name),
+ wxBitmapType WXUNUSED(type),
+ int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY))
{
- wxFAIL_MSG( wxT("wxCursor creation from bits not yet implemented") );
+ wxFAIL_MSG( wxT("wxCursor creation from file not yet implemented") );
}
#if wxUSE_IMAGE
-wxCursor::wxCursor( const wxImage & image )
+wxCursor::wxCursor( const wxImage & WXUNUSED(image) )
{
wxFAIL_MSG( wxT("wxCursor creation from wxImage not yet implemented") );
}
{
}
-bool wxCursor::operator == ( const wxCursor& cursor ) const
+wxGDIRefData *wxCursor::CreateGDIRefData() const
{
- return m_refData == cursor.m_refData;
+ return new wxCursorRefData;
}
-bool wxCursor::operator != ( const wxCursor& cursor ) const
+wxGDIRefData *
+wxCursor::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const
{
- return m_refData != cursor.m_refData;
-}
+ wxFAIL_MSG( wxS("Cloning cursors is not implemented in wxX11.") );
-bool wxCursor::Ok() const
-{
- return (m_refData != NULL);
+ return new wxCursorRefData;
}
WXCursor wxCursor::GetCursor() const
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;