update for bakefile 0.2.6

[wxWidgets.git] / interface / wx / cursor.h

diff --git a/interface/wx/cursor.h b/interface/wx/cursor.h
index e60fa4b570e67f8c3ff7d41a80a98dec147ccb4f..b4c398cdbd0c670714b074806417a97a7966a217 100644 (file)
--- a/interface/wx/cursor.h
+++ b/interface/wx/cursor.h
@@ -80,7 +80,7 @@
 
     @see wxBitmap, wxIcon, wxWindow::SetCursor(), wxSetCursor(), ::wxStockCursor
 */
 
     @see wxBitmap, wxIcon, wxWindow::SetCursor(), wxSetCursor(), ::wxStockCursor
 */

-class wxCursor : public wxBitmap
+class wxCursor : public wxGDIObject

 {
 public:
     /**
 {
 public:
     /**


@@ -130,10 +130,9 @@ public:
 
         @param cursorName
             The name of the resource or the image file to load.
 
         @param cursorName
             The name of the resource or the image file to load.

-

         @param type
             Icon type to load. It defaults to wxCURSOR_DEFAULT_TYPE,
         @param type
             Icon type to load. It defaults to wxCURSOR_DEFAULT_TYPE,

-            which is a #define associated to different values on different
+            which is a @#define associated to different values on different

             platforms:
             - under Windows, it defaults to wxBITMAP_TYPE_CUR_RESOURCE.
             - under MacOS, it defaults to wxBITMAP_TYPE_MACCURSOR_RESOURCE.
             platforms:
             - under Windows, it defaults to wxBITMAP_TYPE_CUR_RESOURCE.
             - under MacOS, it defaults to wxBITMAP_TYPE_MACCURSOR_RESOURCE.


@@ -207,7 +206,7 @@ public:
     /**
         Returns @true if cursor data is present.
     */
     /**
         Returns @true if cursor data is present.
     */

-    bool IsOk() const;
+    virtual bool IsOk() const;

 
     /**
         Assignment operator, using @ref overview_refcount "reference counting".
 
     /**
         Assignment operator, using @ref overview_refcount "reference counting".