fixed MSVC6 compiler warning

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

diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index 2ca07ac040b7833607c4c9f60c7464737e9c942a..4c6d47a635522210ed52ba0a19df885294dc1661 100644 (file)
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -12,73 +12,63 @@
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "cursor.h"
 #endif
 
 #pragma interface "cursor.h"
 #endif
 

-#include "wx/bitmap.h"
+#include "wx/object.h"
+#include "wx/gdicmn.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;
-    friend class WXDLLEXPORT wxCursor;
-public:
-    wxCursorRefData();
-    ~wxCursorRefData();
-
-    wxList        m_cursors;  // wxXCursor objects, one per display
-    wxStockCursor m_cursorId; // wxWindows standard cursor id
-};
-
-#define M_CURSORDATA ((wxCursorRefData *)m_refData)
-#define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
+class WXDLLEXPORT wxImage;

 
 // Cursor
 
 // Cursor

-class WXDLLEXPORT wxCursor: public wxBitmap
+class WXDLLEXPORT wxCursor: public wxObject

 {
 {

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

 public:
 public:

-  wxCursor();
-
-  // Copy constructors
-  inline 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); }
-
-  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;
+    
+    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) const;
+private:
+    void Create(const char bits[], int width, int height,
+                int hotSpotX = -1, int hotSpotY = -1,
+                const char maskBits[] = NULL);
+    void Create(WXPixmap cursor, WXPixmap mask, int hotSpotX, int hotSpotY);
+
+    // Make a cursor from standard id
+    WXCursor MakeCursor(WXDisplay* display, wxStockCursor id) const;

 };
 
 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
 
 #endif
 };
 
 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
 
 #endif

-    // _WX_CURSOR_H_
+// _WX_CURSOR_H_