[ 1945434 ] Changing method wxComboCtrlBase::DrawButton to virtual one

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

diff --git a/include/wx/mgl/cursor.h b/include/wx/mgl/cursor.h
index 2768db84d0b945a7de6ee9f62056b441e2f6b524..31109db1528765fd9b396e40186a64a902b95560 100644 (file)
--- a/include/wx/mgl/cursor.h
+++ b/include/wx/mgl/cursor.h
@@ -3,20 +3,14 @@
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
-// Copyright:   (c) 2001 Vaclav Slavik
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __WX_CURSOR_H__
 #define __WX_CURSOR_H__
 
-#ifdef __GNUG__
-#pragma interface "cursor.h"
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
+#include "wx/gdiobj.h"
 #include "wx/gdicmn.h"
 
 class MGLCursor;
@@ -25,24 +19,19 @@ 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(const wxString& name,
              long flags = wxBITMAP_TYPE_CUR_RESOURCE,
              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;