projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
cursor.h
diff --git
a/include/wx/gtk1/cursor.h
b/include/wx/gtk1/cursor.h
index f0391af65bcebbf6506e5e003cb7c2156acb07ee..655103113a1a7e350b93cc6d3466cc621d9a06c1 100644
(file)
--- a/
include/wx/gtk1/cursor.h
+++ b/
include/wx/gtk1/cursor.h
@@
-4,14
+4,14
@@
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __GTKCURSORH__
#define __GTKCURSORH__
/////////////////////////////////////////////////////////////////////////////
#ifndef __GTKCURSORH__
#define __GTKCURSORH__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(__APPLE__)
#pragma interface
#endif
#pragma interface
#endif
@@
-19,13
+19,9
@@
#include "wx/object.h"
#include "wx/gdicmn.h"
#include "wx/object.h"
#include "wx/gdicmn.h"
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxWindow;
-
-class wxCursor;
+#if wxUSE_IMAGE
+#include "wx/image.h"
+#endif
//-----------------------------------------------------------------------------
// wxCursor
//-----------------------------------------------------------------------------
// wxCursor
@@
-33,28
+29,29
@@
class wxCursor;
class wxCursor: public wxObject
{
class wxCursor: public wxObject
{
- DECLARE_DYNAMIC_CLASS(wxCursor)
+public:
- public:
-
- wxCursor(void);
+ wxCursor();
wxCursor( int cursorId );
wxCursor( const wxCursor &cursor );
wxCursor( int cursorId );
wxCursor( const wxCursor &cursor );
- wxCursor( const wxCursor *cursor );
- ~wxCursor(void);
+#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 );
wxCursor& operator = ( const wxCursor& cursor );
- bool operator == ( const wxCursor& cursor );
- bool operator != ( const wxCursor& cursor );
- bool Ok(void) const;
-
- private:
- public:
-
- friend wxWindow;
-
- GdkCursor *GetCursor(void) const;
-
- // no data :-)
+ bool operator == ( const wxCursor& cursor ) const;
+ bool operator != ( const wxCursor& cursor ) const;
+ bool Ok() const;
+
+ // implementation
+
+ GdkCursor *GetCursor() const;
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxCursor)
};
#endif // __GTKCURSORH__
};
#endif // __GTKCURSORH__