projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changing the Multiple Inheritance along the Single Inheritance, patch 1623801
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
cursor.h
diff --git
a/include/wx/gtk1/cursor.h
b/include/wx/gtk1/cursor.h
index 963a26182d625376252ed02e4d5fe7d8bcc3d506..eba3d24b1b7559f4ec059ccc332c51ba2bfd11fe 100644
(file)
--- a/
include/wx/gtk1/cursor.h
+++ b/
include/wx/gtk1/cursor.h
@@
-33,11
+33,10
@@
public:
#endif
wxCursor( const char bits[], int width, int height,
int hotSpotX=-1, int hotSpotY=-1,
#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();
- bool operator == ( const wxCursor& cursor ) const;
- bool operator != ( const wxCursor& cursor ) const;
- bool Ok() const;
+ const char maskBits[] = NULL, const wxColour *fg = NULL, const wxColour *bg = NULL );
+ virtual ~wxCursor();
+ bool Ok() const { return IsOk(); }
+ bool IsOk() const;
// implementation
// implementation