winundef.h serves for other compilators too with STL turned on.

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

diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h
index d3b4473c82874c701dfcaf24240b21baf1b5b795..1ff62a2011409b2bb304b6eecb6135cebdbd9d9b 100644 (file)
--- a/include/wx/msw/cursor.h
+++ b/include/wx/msw/cursor.h
@@ -1,69 +1,59 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxCursor class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     wxCursor class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __CURSORH__
-#define __CURSORH__
+#ifndef _WX_CURSOR_H_
+#define _WX_CURSOR_H_

 
 

-#ifdef __GNUG__
-#pragma interface "cursor.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "cursor.h"

 #endif
 
 #endif
 

-#include "wx/bitmap.h"
+#include "wx/msw/gdiimage.h"

 
 

-class WXDLLEXPORT wxCursorRefData: public wxBitmapRefData
-{
-    friend class WXDLLEXPORT wxBitmap;
-    friend class WXDLLEXPORT wxCursor;
-public:
-    wxCursorRefData(void);
-    ~wxCursorRefData(void);
-
-protected:
-  WXHCURSOR m_hCursor;
-  bool m_destroyCursor;
-};
-
-#define M_CURSORDATA ((wxCursorRefData *)m_refData)
-#define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
+class WXDLLEXPORT wxImage;

 
 // Cursor
 
 // Cursor

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxCursor)
-

 public:
 public:

-  wxCursor(void);
-
-  // Copy constructors
-  inline wxCursor(const wxCursor& cursor) { Ref(cursor); }
-  inline wxCursor(const wxCursor* cursor) { /* UnRef(); */ if (cursor) Ref(*cursor); }
-
-  wxCursor(const char bits[], const int width, const int height, const int hotSpotX = -1, const int hotSpotY = -1,
-    const char maskBits[] = NULL);
-  wxCursor(const wxString& name, const long flags = wxBITMAP_TYPE_CUR_RESOURCE,
-   const int hotSpotX = 0, const int hotSpotY = 0);
-  wxCursor(const int cursor_type);
-  ~wxCursor(void);
+    // constructors
+    wxCursor();
+    wxCursor(const wxCursor& cursor) : wxGDIImage(cursor) { Ref(cursor); }
+    wxCursor(const wxImage& image);
+    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 idCursor);
+    virtual ~wxCursor();
+
+    wxCursor& operator=(const wxCursor& cursor)
+        { if (*this == cursor) return (*this); Ref(cursor); return *this; }
+
+    bool operator==(const wxCursor& cursor) const;
+    bool operator!=(const wxCursor& cursor) const
+        { return !(*this == cursor); }
+
+    // implementation only
+    void SetHCURSOR(WXHCURSOR cursor) { SetHandle((WXHANDLE)cursor); }
+    WXHCURSOR GetHCURSOR() const { return (WXHCURSOR)GetHandle(); }

 
 

-  virtual bool Ok(void) const { return (m_refData != NULL && M_CURSORDATA->m_hCursor) ; }
-
-  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; }
-
-  void SetHCURSOR(WXHCURSOR cursor);
-  inline WXHCURSOR GetHCURSOR(void) const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
+protected:
+    virtual wxGDIImageRefData *CreateData() const;

 
 

-  bool FreeResource(bool force = FALSE);
+private:
+    DECLARE_DYNAMIC_CLASS(wxCursor)

 };
 
 #endif
 };
 
 #endif

-    // __CURSORH__
+    // _WX_CURSOR_H_