X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..0995b9dc18a7ce898c1c1be0e2790b258cab0fee:/include/wx/mgl/cursor.h

diff --git a/include/wx/mgl/cursor.h b/include/wx/mgl/cursor.h
index ac71374b47..bba7e590f2 100644
--- a/include/wx/mgl/cursor.h
+++ b/include/wx/mgl/cursor.h
@@ -1,22 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cursor.h
+// Name:        wx/mgl/cursor.h
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __WX_CURSOR_H__
 #define __WX_CURSOR_H__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "cursor.h"
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
+#include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
 class MGLCursor;
@@ -25,29 +19,26 @@ class MGLCursor;
 // wxCursor
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxCursor: public wxObject
+class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
 {
 public:
 
     wxCursor();
-    wxCursor(int cursorId);
-    wxCursor(const wxCursor &cursor);
-    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,
-             long flags = wxBITMAP_TYPE_CUR_RESOURCE,
+             wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
              int hotSpotX = 0, int hotSpotY = 0);
-    ~wxCursor();
-    wxCursor& operator = ( const wxCursor& cursor );
-    bool operator == (const wxCursor& cursor) const;
-    bool operator != (const wxCursor& cursor) const;
-    bool Ok() const;
+    virtual ~wxCursor();
 
     // implementation
     MGLCursor *GetMGLCursor() const;
 
 private:
+    void InitFromStock(wxStockCursor);
+
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };