Allow passing wxLongLong values directly to wx pseudo-vararg functions.

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

diff --git a/include/wx/mgl/cursor.h b/include/wx/mgl/cursor.h
index 31109db1528765fd9b396e40186a64a902b95560..bba7e590f28bb6b7186f22c046eff8fabc057bc1 100644 (file)
--- a/include/wx/mgl/cursor.h
+++ b/include/wx/mgl/cursor.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cursor.h
+// Name:        wx/mgl/cursor.h

 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$


@@ -24,12 +24,12 @@ 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);
     virtual ~wxCursor();
 
              int hotSpotX = 0, int hotSpotY = 0);
     virtual ~wxCursor();
 


@@ -37,6 +37,8 @@ public:
     MGLCursor *GetMGLCursor() const;
 
 private:
     MGLCursor *GetMGLCursor() const;
 
 private:

+    void InitFromStock(wxStockCursor);
+

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