Allow using wxDEFAULT as font size in wxOSX.

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

diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h
index f8025338a4fb86111521f4b239b3f60b11734e18..19423ecffe63a694e29a710ba8057f78870d9825 100644 (file)
--- a/include/wx/msw/cursor.h
+++ b/include/wx/msw/cursor.h
@@ -17,19 +17,19 @@
 class WXDLLIMPEXP_FWD_CORE wxImage;
 
 // Cursor
 class WXDLLIMPEXP_FWD_CORE wxImage;
 
 // Cursor

-class WXDLLEXPORT wxCursor : public wxGDIImage
+class WXDLLIMPEXP_CORE wxCursor : public wxGDIImage

 {
 public:
     // constructors
     wxCursor();
     wxCursor(const wxImage& image);
 {
 public:
     // constructors
     wxCursor();
     wxCursor(const wxImage& image);

-    wxCursor(const char bits[], int width, int height,
-             int hotSpotX = -1, int hotSpotY = -1,
-             const char maskBits[] = NULL);

     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);

-    wxCursor(int idCursor);
+    wxCursor(wxStockCursor id) { InitFromStock(id); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
+#endif

     virtual ~wxCursor();
 
     // implementation only
     virtual ~wxCursor();
 
     // implementation only


@@ -37,6 +37,8 @@ public:
     WXHCURSOR GetHCURSOR() const { return (WXHCURSOR)GetHandle(); }
 
 protected:
     WXHCURSOR GetHCURSOR() const { return (WXHCURSOR)GetHandle(); }
 
 protected:

+    void InitFromStock(wxStockCursor);
+

     virtual wxGDIImageRefData *CreateData() const;
 
 private:
     virtual wxGDIImageRefData *CreateData() const;
 
 private: