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 7c2021b8adcb46ba70d01934b1a62daf0b188875..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$


@@ -30,14 +30,14 @@ public:
 #endif
 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );
 #endif
 #if wxUSE_IMAGE
     wxCursor( const wxImage & image );

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

 #endif
     wxCursor( const char bits[], int width, int height,
               int hotSpotX = -1, int hotSpotY = -1,
               const char maskBits[] = NULL,
               const wxColour* fg = NULL, const wxColour* bg = NULL);
 #endif
     wxCursor( const char bits[], int width, int height,
               int hotSpotX = -1, int hotSpotY = -1,
               const char maskBits[] = NULL,
               const wxColour* fg = NULL, const wxColour* bg = NULL);

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

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


@@ -46,6 +46,9 @@ public:
 
 protected:
     void InitFromStock(wxStockCursor);
 
 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;