fix WinCE compilation after tbar95.h ->t oolbar.h renaming (#10197)

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

diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h
index 5886b6e20f018d255dce45311483290d1a2530f6..c4bd2ec33443150d2468113b70a046277a088aea 100644 (file)
--- a/include/wx/gtk1/cursor.h
+++ b/include/wx/gtk1/cursor.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,16 +7,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKCURSORH__
 #define __GTKCURSORH__
 
 #ifndef __GTKCURSORH__
 #define __GTKCURSORH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
+#include "wx/gdiobj.h"

 #include "wx/gdicmn.h"
 
 #if wxUSE_IMAGE
 #include "wx/gdicmn.h"
 
 #if wxUSE_IMAGE


@@ -27,29 +21,41 @@
 // wxCursor
 //-----------------------------------------------------------------------------
 
 // wxCursor
 //-----------------------------------------------------------------------------
 

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

 {
 public:
 {
 public:

-

     wxCursor();
     wxCursor();

-    wxCursor( int cursorId );
-    wxCursor( const wxCursor &cursor );
+    wxCursor(wxStockCursor id) { InitFromStock(id); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
+#endif

 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );
 #endif
     wxCursor( const char bits[], int width, int  height,
               int hotSpotX=-1, int hotSpotY=-1,
 #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;
+              const char maskBits[] = NULL,
+              const wxColour* fg = NULL, const wxColour* bg = NULL);
+
+    /* WARNING: the following ctor is missing:
+
+        wxCursor(const wxString& name,
+                wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
+                int hotSpotX = 0, int hotSpotY = 0);
+    */
+
+    virtual ~wxCursor();

 
     // implementation
 
     GdkCursor *GetCursor() const;
 
 
     // implementation
 
     GdkCursor *GetCursor() const;
 

+protected:
+    void InitFromStock(wxStockCursor);
+
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxCursor)
 };