addind nonowned window implementation

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

diff --git a/include/wx/mgl/cursor.h b/include/wx/mgl/cursor.h
index d7ec246c7526f73b7e5baad964af748c44f63c90..7e2ebb3c518218ccc5e6a19eb1e15060d094064a 100644 (file)
--- a/include/wx/mgl/cursor.h
+++ b/include/wx/mgl/cursor.h
@@ -7,16 +7,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __WX_CURSOR_H__
 #define __WX_CURSOR_H__
 
 #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;
 #include "wx/gdicmn.h"
 
 class MGLCursor;


@@ -25,24 +19,19 @@ class MGLCursor;
 // wxCursor
 //-----------------------------------------------------------------------------
 
 // wxCursor
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxCursor: public wxObject
+class WXDLLEXPORT wxCursor : public wxGDIObject

 {
 public:
 
     wxCursor();
     wxCursor(int cursorId);
 {
 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(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;
 
     // implementation
     MGLCursor *GetMGLCursor() const;