X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b6dbb09746f8f5ee0549a2ff39ae0ac4c725898..98c919483746ad0836f8f70a7d12f8e2d1e7d52b:/include/wx/motif/cursor.h?ds=sidebyside

diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index 3db0a16fe7..c1d3bce5c3 100644
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -18,6 +18,18 @@
 
 #include "wx/bitmap.h"
 
+/* Cursor for one display, so we can choose the correct one for
+* the current display.
+*/
+class wxXCursor : public wxObject
+{
+    DECLARE_DYNAMIC_CLASS(wxXCursor)
+        
+public:
+    WXDisplay*  m_display;
+    WXCursor    m_cursor;
+};
+
 class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
 {
     friend class WXDLLEXPORT wxBitmap;
@@ -25,11 +37,9 @@ class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
 public:
     wxCursorRefData();
     ~wxCursorRefData();
-
-protected:
-/* TODO: implementation
-  WXHCURSOR m_hCursor;
-*/
+    
+    wxList        m_cursors;  // wxXCursor objects, one per display
+    wxStockCursor m_cursorId; // wxWindows standard cursor id
 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
@@ -38,39 +48,37 @@ protected:
 // Cursor
 class WXDLLEXPORT wxCursor: public wxBitmap
 {
-  DECLARE_DYNAMIC_CLASS(wxCursor)
-
+    DECLARE_DYNAMIC_CLASS(wxCursor)
+        
 public:
-  wxCursor();
-
-  // Copy constructors
-  inline wxCursor(const wxCursor& cursor) { Ref(cursor); }
-  inline wxCursor(const wxCursor* cursor) { if (cursor) Ref(*cursor); }
-
-  wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1,
-    const char maskBits[] = NULL);
-
-  /* TODO: make default type suit platform */
-  wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_CUR_RESOURCE,
-   int hotSpotX = 0, int hotSpotY = 0);
-
-  wxCursor(int cursor_type);
-  ~wxCursor();
-
-  // TODO: also verify the internal cursor handle
-  virtual bool Ok() const { return (m_refData != NULL) ; }
-
-  inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }
-  inline bool operator == (const wxCursor& cursor) { return m_refData == cursor.m_refData; }
-  inline bool operator != (const wxCursor& cursor) { return m_refData != cursor.m_refData; }
-
-/* TODO: implementation
-  void SetHCURSOR(WXHCURSOR cursor);
-  inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
-*/
+    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_