CanAcceptFocus() now returns true if either the window itself or one of its children...

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

diff --git a/include/wx/x11/cursor.h b/include/wx/x11/cursor.h
index 764a8e81cfc145c1b55bd95142ccf9e1a4d3d1fb..3a22621bd1f49ba5deda9fae166b6508ca07fe5d 100644 (file)
--- a/include/wx/x11/cursor.h
+++ b/include/wx/x11/cursor.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxCursor class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxCursor class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// 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/bitmap.h"
 
 #if wxUSE_IMAGE
 #include "wx/bitmap.h"
 
 #if wxUSE_IMAGE


@@ -32,18 +28,15 @@ public:
 
     wxCursor();
     wxCursor( int cursorId );
 
     wxCursor();
     wxCursor( int cursorId );

-    wxCursor( const wxCursor &cursor );

 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );
 #endif
     wxCursor( const char bits[], int width, int  height,
               int hotSpotX=-1, int hotSpotY=-1,
               const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0 );
 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );
 #endif
     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();
-    wxCursor& operator = ( const wxCursor& cursor );
-    bool operator == ( const wxCursor& cursor ) const;
-    bool operator != ( const wxCursor& cursor ) const;
-    bool Ok() const;
+    virtual ~wxCursor();
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     // implementation
 
 
     // implementation
 


@@ -55,4 +48,4 @@ private:
 
 
 #endif
 
 
 #endif

-// _WX_CURSOR_H_
+    // _WX_CURSOR_H_