Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/gtk/cursor.h b/include/wx/gtk/cursor.h
index 8534306a4ff7e02aaa9481b03c6af7858501c99d..533dc498478bbf7b825800cd4da4b1f588fc5dc6 100644 (file)
--- a/include/wx/gtk/cursor.h
+++ b/include/wx/gtk/cursor.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -11,12 +11,11 @@
 #define _WX_GTK_CURSOR_H_
 
 #include "wx/gdiobj.h"
 #define _WX_GTK_CURSOR_H_
 
 #include "wx/gdiobj.h"

+#include "wx/gdicmn.h"

 
 class WXDLLIMPEXP_FWD_CORE wxColour;
 class WXDLLIMPEXP_FWD_CORE wxImage;
 
 
 class WXDLLIMPEXP_FWD_CORE wxColour;
 class WXDLLIMPEXP_FWD_CORE wxImage;
 

-enum wxStockCursor;
-

 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------


@@ -25,14 +24,20 @@ class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
 {
 public:
     wxCursor();
 {
 public:
     wxCursor();

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

 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );
 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );

+    wxCursor(const wxString& name,
+             wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
+             int hotSpotX = 0, int hotSpotY = 0);

 #endif
 #endif

-    wxCursor( const char bits[], int width, int  height,
-              int hotSpotX=-1, int hotSpotY=-1,
+    wxCursor( const char bits[], int width, int height,
+              int hotSpotX = -1, int hotSpotY = -1,

               const char maskBits[] = NULL,
               const char maskBits[] = NULL,

-              const wxColour *fg = NULL, const wxColour *bg = NULL );
+              const wxColour* fg = NULL, const wxColour* bg = NULL);

     virtual ~wxCursor();
 
     // implementation
     virtual ~wxCursor();
 
     // implementation


@@ -40,6 +45,11 @@ public:
     GdkCursor *GetCursor() const;
 
 protected:
     GdkCursor *GetCursor() const;
 
 protected:

+    void InitFromStock(wxStockCursor);
+#if wxUSE_IMAGE
+    void InitFromImage(const wxImage& image);
+#endif
+

     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;