avoid GCC warnings about breaking strict aliasing rules

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

diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index ed65bb52d961d3c7a52805388f4f0e591e9c2e46..ccb7837598f5fb63d806befce4ec4f2a01b30f9e 100644 (file)
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -12,16 +12,14 @@
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 

-#include "wx/object.h"
+#include "wx/gdiobj.h"

 #include "wx/gdicmn.h"
 
 #include "wx/gdicmn.h"
 

-class WXDLLEXPORT wxImage;
+class WXDLLIMPEXP_FWD_CORE wxImage;

 
 // Cursor
 
 // Cursor

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxCursor)
-

 public:
     wxCursor();
 
 public:
     wxCursor();
 


@@ -39,16 +37,14 @@ public:
     wxCursor(wxStockCursor id);
     virtual ~wxCursor();
 
     wxCursor(wxStockCursor id);
     virtual ~wxCursor();
 

-    virtual bool Ok() const;
-
-    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;
     // Motif-specific.
     // Create/get a cursor for the current display
     WXCursor GetXCursor(WXDisplay* display) const;

+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+

 private:
     void Create(const char bits[], int width, int height,
                 int hotSpotX = -1, int hotSpotY = -1,
 private:
     void Create(const char bits[], int width, int height,
                 int hotSpotX = -1, int hotSpotY = -1,


@@ -57,6 +53,8 @@ private:
 
     // Make a cursor from standard id
     WXCursor MakeCursor(WXDisplay* display, wxStockCursor id) const;
 
     // Make a cursor from standard id
     WXCursor MakeCursor(WXDisplay* display, wxStockCursor id) const;

+
+    DECLARE_DYNAMIC_CLASS(wxCursor)

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