Use __DARWIN__ instead of __WXOSX__ in non-GUI code.

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

diff --git a/include/wx/dfb/cursor.h b/include/wx/dfb/cursor.h
index 298cbe0eb0395554218ef74c92ef22f82a4a7e11..0a22bb67b8f4d10d3f2c9f3af55939f356490e34 100644 (file)
--- a/include/wx/dfb/cursor.h
+++ b/include/wx/dfb/cursor.h
@@ -11,38 +11,36 @@
 #ifndef _WX_DFB_CURSOR_H_
 #define _WX_DFB_CURSOR_H_
 
 #ifndef _WX_DFB_CURSOR_H_
 #define _WX_DFB_CURSOR_H_
 

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

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

-class WXDLLIMPEXP_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;

 
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------
 

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

 {
 public:
     wxCursor() {}
 {
 public:
     wxCursor() {}

-    wxCursor(int cursorId);
-    wxCursor(const char bits[], int width, int  height,
-              int hotSpotX=-1, int hotSpotY=-1,
-              const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0);
+    wxCursor(wxStockCursor id) { InitFromStock(id); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
+#endif

     wxCursor(const wxString& name,
     wxCursor(const wxString& name,

-             long flags = wxBITMAP_TYPE_CUR_RESOURCE,
+             wxBitmapType type = wxCURSOR_DEFAULT_TYPE,

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

-    bool Ok() const;
-    bool operator==(const wxCursor& cursor) const;
-    bool operator!=(const wxCursor& cursor) const { return !(*this == cursor); }
-

     // implementation
     wxBitmap GetBitmap() const;
 
 protected:
     // implementation
     wxBitmap GetBitmap() const;
 
 protected:

+    void InitFromStock(wxStockCursor);
+

     // ref counting code
     // ref counting code

-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };