Small speed up to fonts and support for scaling.

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

diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h
index 4e28fcc178f7f53969b6a575cebd3b8e2229d463..201dcae705d427f0740a26641275e4f0fab9abd0 100644 (file)
--- a/include/wx/msw/cursor.h
+++ b/include/wx/msw/cursor.h
@@ -16,25 +16,11 @@
     #pragma interface "cursor.h"
 #endif
 
-// compatible (even if incorrect) behaviour by default: derive wxCursor from
-// wxBitmap
-#ifndef wxICON_IS_BITMAP
-    #define wxICON_IS_BITMAP 1
-#endif
-
-#if wxICON_IS_BITMAP
-    #include "wx/bitmap.h"
+#include "wx/msw/gdiimage.h"
 
-    #define wxCursorRefDataBase   wxBitmapRefData
-    #define wxCursorBase          wxBitmap
-#else
-    #include "wx/msw/gdiimage.h"
+class WXDLLEXPORT wxImage;
 
-    #define wxCursorRefDataBase   wxGDIImageRefData
-    #define wxCursorBase          wxGDIImage
-#endif
-
-class WXDLLEXPORT wxCursorRefData : public wxCursorRefDataBase
+class WXDLLEXPORT wxCursorRefData : public wxGDIImageRefData
 {
 public:
     wxCursorRefData();
@@ -48,14 +34,14 @@ public:
 };
 
 // Cursor
-class WXDLLEXPORT wxCursor : public wxCursorBase
+class WXDLLEXPORT wxCursor : public wxGDIImage
 {
 public:
     wxCursor();
 
     // Copy constructors
     wxCursor(const wxCursor& cursor) { Ref(cursor); }
-
+    wxCursor(const wxImage& image);
     wxCursor(const char bits[], int width, int height,
              int hotSpotX = -1, int hotSpotY = -1,
              const char maskBits[] = NULL);