Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h
index f91cb7dd0425322f81a2f76b0996b20300144410..5bda492eb1cbf4241abb6fdeeddc90f76fc4cbec 100644 (file)
--- a/include/wx/os2/cursor.h
+++ b/include/wx/os2/cursor.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxCursor class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxCursor class
 // Author:      David Webster
 // Modified by:


@@ -34,25 +34,22 @@ public:
 
     wxCursor(const wxImage& rImage);
 
 
     wxCursor(const wxImage& rImage);
 

-    wxCursor( const char acBits[]
-             ,int        nWidth
-             ,int        nHeight
-             ,int        nHotSpotX = -1
-             ,int        nHotSpotY = -1
-             ,const char zMaskBits[] = NULL
-            );

     wxCursor( const wxString& rsName
     wxCursor( const wxString& rsName

-             ,long            lFlags = wxBITMAP_TYPE_CUR_RESOURCE
+             ,wxBitmapType    lType = wxCURSOR_DEFAULT_TYPE

              ,int             nHotSpotX = 0
              ,int             nHotSpotY = 0
             );
              ,int             nHotSpotX = 0
              ,int             nHotSpotY = 0
             );

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

     inline ~wxCursor() { }
 
     inline WXHCURSOR GetHCURSOR(void) const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
     inline void      SetHCURSOR(WXHCURSOR hCursor) { SetHandle((WXHANDLE)hCursor); }
 
 protected:
     inline ~wxCursor() { }
 
     inline WXHCURSOR GetHCURSOR(void) const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
     inline void      SetHCURSOR(WXHCURSOR hCursor) { SetHandle((WXHANDLE)hCursor); }
 
 protected:

+    void InitFromStock(wxStockCursor);

     inline virtual wxGDIImageRefData* CreateData(void) const { return (new wxCursorRefData); }
 
 private:
     inline virtual wxGDIImageRefData* CreateData(void) const { return (new wxCursorRefData); }
 
 private: