adding standard menu items for cocoa, adding translation macro to menulabels, fixes...

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

diff --git a/include/wx/os2/cursor.h b/include/wx/os2/cursor.h
index 688539c46da0b855d560adbb4f2529362ee887d0..f00ca92c3952f663410484f142ecbe5b8bcde0da 100644 (file)
--- a/include/wx/os2/cursor.h
+++ b/include/wx/os2/cursor.h
@@ -14,51 +14,47 @@
 
 #include "wx/bitmap.h"
 
-class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
+class WXDLLIMPEXP_CORE wxCursorRefData: public wxGDIImageRefData
 {
-    friend class WXDLLEXPORT wxBitmap;
-    friend class WXDLLEXPORT wxCursor;
 public:
     wxCursorRefData();
-    ~wxCursorRefData();
-
-protected:
-  bool m_destroyCursor;
-};
+    virtual ~wxCursorRefData() { Free(); }
+    virtual void Free(void);
+    bool                            m_bDestroyCursor;
+}; // end of CLASS wxCursorRefData
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
 #define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
 
 // Cursor
-class WXDLLEXPORT wxCursor: public wxBitmap
+class WXDLLIMPEXP_CORE wxCursor: public wxBitmap
 {
-  DECLARE_DYNAMIC_CLASS(wxCursor)
-
 public:
-  wxCursor();
-
-  // Copy constructors
-  inline wxCursor(const wxCursor& cursor) { Ref(cursor); }
-         wxCursor(const wxImage& rImage);
-
-  wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1,
-    const char maskBits[] = NULL);
-  wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_CUR_RESOURCE,
-   int hotSpotX = 0, int hotSpotY = 0);
-  wxCursor(int cursor_type);
-  ~wxCursor();
-
-  virtual bool Ok() const { return (m_refData != NULL) ; }
+    wxCursor();
+
+    wxCursor(const wxImage& rImage);
+
+    wxCursor( const wxString& rsName
+             ,wxBitmapType    lType = wxCURSOR_DEFAULT_TYPE
+             ,int             nHotSpotX = 0
+             ,int             nHotSpotY = 0
+            );
+    wxCursor(wxStockCursor id) { InitFromStock(id); }
+#if WXWIN_COMPATIBILITY_2_8
+    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
+#endif
+    inline ~wxCursor() { }
 
-  inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }
-  inline bool operator == (const wxCursor& cursor) { return m_refData == cursor.m_refData; }
-  inline bool operator != (const wxCursor& cursor) { return m_refData != cursor.m_refData; }
+    inline WXHCURSOR GetHCURSOR(void) const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
+    inline void      SetHCURSOR(WXHCURSOR hCursor) { SetHandle((WXHANDLE)hCursor); }
 
-  void SetHCURSOR(WXHCURSOR cursor);
-  inline WXHCURSOR GetHCURSOR() const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
+protected:
+    void InitFromStock(wxStockCursor);
+    inline virtual wxGDIImageRefData* CreateData(void) const { return (new wxCursorRefData); }
 
-  bool FreeResource(bool force = FALSE);
-};
+private:
+    DECLARE_DYNAMIC_CLASS(wxCursor)
+}; // end of CLASS wxCursor
 
 #endif
     // _WX_CURSOR_H_