depth for masks added

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

diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index 0fde1803354b01c56ab07e190532d946998a028e..93b7a10f7e42b6fb8699ef6b8cfca192d29d181d 100644 (file)
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -17,17 +17,18 @@
 #endif
 
 #include "wx/bitmap.h"
 #endif
 
 #include "wx/bitmap.h"

+#include "wx/list.h"

 
 /* Cursor for one display, so we can choose the correct one for
 
 /* Cursor for one display, so we can choose the correct one for

- * the current display.
- */
+* the current display.
+*/

 class wxXCursor : public wxObject
 {
 class wxXCursor : public wxObject
 {

- DECLARE_DYNAMIC_CLASS(wxXCursor)
-
- public:
-  WXDisplay*  m_display;
-  WXCursor    m_cursor;
+    DECLARE_DYNAMIC_CLASS(wxXCursor)
+        
+public:
+    WXDisplay*  m_display;
+    WXCursor    m_cursor;

 };
 
 class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
 };
 
 class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData


@@ -37,7 +38,7 @@ class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
 public:
     wxCursorRefData();
     ~wxCursorRefData();
 public:
     wxCursorRefData();
     ~wxCursorRefData();

-
+    

     wxList        m_cursors;  // wxXCursor objects, one per display
     wxStockCursor m_cursorId; // wxWindows standard cursor id
 };
     wxList        m_cursors;  // wxXCursor objects, one per display
     wxStockCursor m_cursorId; // wxWindows standard cursor id
 };


@@ -48,38 +49,41 @@ public:
 // Cursor
 class WXDLLEXPORT wxCursor: public wxBitmap
 {
 // Cursor
 class WXDLLEXPORT wxCursor: public wxBitmap
 {

-  DECLARE_DYNAMIC_CLASS(wxCursor)
-
+    DECLARE_DYNAMIC_CLASS(wxCursor)
+        

 public:
 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);
-
-  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); }
-
-  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; }
-
-  // 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);
+    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);
+
+#if wxUSE_IMAGE   
+    wxCursor(const wxImage& image);
+#endif
+   
+    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
 };
 
 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
 
 #endif

-    // _WX_CURSOR_H_
+// _WX_CURSOR_H_