gtkfeatures.h does not exist under gtk+ 1.3.1, #ifndef it out

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

diff --git a/include/wx/stubs/cursor.h b/include/wx/stubs/cursor.h
index 5484414e7bd6f33129f8edb2c65064a6f8705e77..bc6397069fc9d4d0ee10bba44479520ccec6f9c4 100644 (file)
--- a/include/wx/stubs/cursor.h
+++ b/include/wx/stubs/cursor.h
@@ -45,7 +45,6 @@ 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);


@@ -57,7 +56,8 @@ public:
   wxCursor(int cursor_type);
   ~wxCursor();
 
   wxCursor(int cursor_type);
   ~wxCursor();
 

-  virtual bool Ok() const { return (m_refData != NULL && M_CURSORDATA->m_hCursor) ; }
+  // 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 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; }


@@ -69,5 +69,7 @@ public:
 */
 };
 
 */
 };
 

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

 #endif
     // _WX_CURSOR_H_
 #endif
     // _WX_CURSOR_H_