X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/x11/cursor.h?ds=sidebyside

diff --git a/include/wx/x11/cursor.h b/include/wx/x11/cursor.h
index c1d3bce5c3..3a22621bd1 100644
--- a/include/wx/x11/cursor.h
+++ b/include/wx/x11/cursor.h
@@ -1,84 +1,51 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cursor.h
+// Name:        wx/x11/cursor.h
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
-#ifdef __GNUG__
-#pragma interface "cursor.h"
+#include "wx/bitmap.h"
+
+#if wxUSE_IMAGE
+#include "wx/image.h"
 #endif
 
-#include "wx/bitmap.h"
+//-----------------------------------------------------------------------------
+// wxCursor
+//-----------------------------------------------------------------------------
 
-/* Cursor for one display, so we can choose the correct one for
-* the current display.
-*/
-class wxXCursor : public wxObject
+class WXDLLIMPEXP_CORE wxCursor: public wxObject
 {
-    DECLARE_DYNAMIC_CLASS(wxXCursor)
-        
 public:
-    WXDisplay*  m_display;
-    WXCursor    m_cursor;
-};
 
-class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
-{
-    friend class WXDLLEXPORT wxBitmap;
-    friend class WXDLLEXPORT wxCursor;
-public:
-    wxCursorRefData();
-    ~wxCursorRefData();
-    
-    wxList        m_cursors;  // wxXCursor objects, one per display
-    wxStockCursor m_cursorId; // wxWindows standard cursor id
-};
+    wxCursor();
+    wxCursor( int cursorId );
+#if wxUSE_IMAGE
+    wxCursor( const wxImage & image );
+#endif
+    wxCursor( const char bits[], int width, int  height,
+              int hotSpotX=-1, int hotSpotY=-1,
+              const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0 );
+    virtual ~wxCursor();
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;
 
-#define M_CURSORDATA ((wxCursorRefData *)m_refData)
-#define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
+    // implementation
 
-// Cursor
-class WXDLLEXPORT wxCursor: public wxBitmap
-{
+    WXCursor GetCursor() const;
+
+private:
     DECLARE_DYNAMIC_CLASS(wxCursor)
-        
-public:
-    wxCursor();
-    
-    // Copy constructors
-    wxCursor(const wxCursor& cursor) { Ref(cursor); }
-    
-    wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1,
-        const char maskBits[] = NULL);
-    
-    wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_XBM,
-        int hotSpotX = 0, int hotSpotY = 0);
-    
-    wxCursor(wxStockCursor id);
-    ~wxCursor();
-    
-    virtual bool Ok() const { return ((m_refData != NULL) && M_CURSORDATA->m_ok); }
-    
-    wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }
-    bool operator == (const wxCursor& cursor) const { return m_refData == cursor.m_refData; }
-    bool operator != (const wxCursor& cursor) const { return m_refData != cursor.m_refData; }
-    
-    // Motif-specific.
-    // Create/get a cursor for the current display
-    WXCursor GetXCursor(WXDisplay* display) ;
-    // Make a cursor from standard id
-    WXCursor MakeCursor(WXDisplay* display, wxStockCursor id);
 };
 
-extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
 
 #endif
-// _WX_CURSOR_H_
+    // _WX_CURSOR_H_