Use wxAlphaPixelData if the source bitmap depth is 32 or if on wxGTK and there is...

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

diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h
index eee0aeba209a0dea96a408a3c1a6ca8d463fc0a3..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:


@@ -14,11 +14,11 @@
 
 #include "wx/bitmap.h"
 
 
 #include "wx/bitmap.h"
 

-class WXDLLEXPORT wxCursorRefData: public wxGDIImageRefData
+class WXDLLIMPEXP_CORE wxCursorRefData: public wxGDIImageRefData

 {
 public:
     wxCursorRefData();
 {
 public:
     wxCursorRefData();

-    ~wxCursorRefData() { Free(); }
+    virtual ~wxCursorRefData() { Free(); }

     virtual void Free(void);
     bool                            m_bDestroyCursor;
 }; // end of CLASS wxCursorRefData
     virtual void Free(void);
     bool                            m_bDestroyCursor;
 }; // end of CLASS wxCursorRefData


@@ -27,44 +27,29 @@ public:
 #define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
 
 // Cursor
 #define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
 
 // Cursor

-class WXDLLEXPORT wxCursor: public wxBitmap
+class WXDLLIMPEXP_CORE wxCursor: public wxBitmap

 {
 public:
     wxCursor();
 
 {
 public:
     wxCursor();
 

-    // Copy constructors
-    wxCursor(const wxCursor& rCursor) { Ref(rCursor); }

     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 ~wxCursor() { }
 

-    inline wxCursor& operator = (const wxCursor& rCursor)
-    {
-        if (*this == rCursor)
-            return (*this);
-        Ref(rCursor);
-        return *this;
-    }
-    inline bool operator == (const wxCursor& rCursor) const { return m_refData == rCursor.m_refData; }
-    inline bool operator != (const wxCursor& rCursor) const { return m_refData != rCursor.m_refData; }
-

     inline WXHCURSOR GetHCURSOR(void) const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
     inline void      SetHCURSOR(WXHCURSOR hCursor) { SetHandle((WXHANDLE)hCursor); }
 
 protected:
     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: