fixes to previous fixes for Sun's CC 5.0

[wxWidgets.git] / include / wx / motif / cursor.h

diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index 3db0a16fe7d70ed29c10c2b44a0e6de4a44ed74d..2ca07ac040b7833607c4c9f60c7464737e9c942a 100644 (file)
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -18,6 +18,18 @@
 
 #include "wx/bitmap.h"
 
 
 #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;
 class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
 {
     friend class WXDLLEXPORT wxBitmap;


@@ -26,10 +38,8 @@ public:
     wxCursorRefData();
     ~wxCursorRefData();
 
     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)
 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)


@@ -45,29 +55,27 @@ public:
 
   // Copy constructors
   inline wxCursor(const wxCursor& cursor) { Ref(cursor); }
 
   // 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);
 
 
   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,
+  wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_XBM,

    int hotSpotX = 0, int hotSpotY = 0);
 
    int hotSpotX = 0, int hotSpotY = 0);
 

-  wxCursor(int cursor_type);
+  wxCursor(wxStockCursor id);

   ~wxCursor();
 
   ~wxCursor();
 

-  // TODO: also verify the internal cursor handle
-  virtual bool Ok() const { return (m_refData != NULL) ; }
+  virtual bool Ok() const { return ((m_refData != NULL) && M_CURSORDATA->m_ok); }

 
   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; }
 
 
   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); }
-*/
+  // 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);
 };
 
 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);