Moved all the coordinate system calculation to wxDCBase

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

diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index d5ccf28f7a9f4bfce715fc897825aff2d8478d5f..e30e1f0db407b85277ef3e84ce2d76c5ce6a546d 100644 (file)
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxCursor class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxCursor class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "cursor.h"
-#endif
-

 #include "wx/object.h"
 #include "wx/gdicmn.h"
 
 #include "wx/object.h"
 #include "wx/gdicmn.h"
 


@@ -25,39 +21,30 @@ class WXDLLEXPORT wxImage;
 class WXDLLEXPORT wxCursor: public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxCursor)
 class WXDLLEXPORT wxCursor: public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxCursor)

-        
+

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

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

     wxCursor(const char bits[], int width, int height,
              int hotSpotX = -1, int hotSpotY = -1,
              const char maskBits[] = NULL);
     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_XBM,
         int hotSpotX = 0, int hotSpotY = 0);
 
     wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_XBM,
         int hotSpotX = 0, int hotSpotY = 0);
 

-#if wxUSE_IMAGE   
+#if wxUSE_IMAGE

     wxCursor(const wxImage& image);
 #endif
     wxCursor(const wxImage& image);
 #endif

-   
+

     wxCursor(wxStockCursor id);
     wxCursor(wxStockCursor id);

-    ~wxCursor();
-    
-    virtual bool Ok() const;
-    
-    wxCursor& operator = (const wxCursor& cursor)
-        { if (*this == cursor) return (*this); Ref(cursor); return *this; }
-    bool operator == (const wxCursor& cursor) const
-        { return m_refData == cursor.m_refData; }
-    bool operator != (const wxCursor& cursor) const
-        { return m_refData != cursor.m_refData; }
+    virtual ~wxCursor();
+
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;

 
     // Motif-specific.
     // Create/get a cursor for the current display
 
     // Motif-specific.
     // Create/get a cursor for the current display

-    WXCursor GetXCursor(WXDisplay* display) ;
+    WXCursor GetXCursor(WXDisplay* display) const;

 private:
     void Create(const char bits[], int width, int height,
                 int hotSpotX = -1, int hotSpotY = -1,
 private:
     void Create(const char bits[], int width, int height,
                 int hotSpotX = -1, int hotSpotY = -1,


@@ -65,7 +52,7 @@ private:
     void Create(WXPixmap cursor, WXPixmap mask, int hotSpotX, int hotSpotY);
 
     // Make a cursor from standard id
     void Create(WXPixmap cursor, WXPixmap mask, int hotSpotX, int hotSpotY);
 
     // Make a cursor from standard id

-    WXCursor MakeCursor(WXDisplay* display, wxStockCursor id);
+    WXCursor MakeCursor(WXDisplay* display, wxStockCursor id) const;

 };
 
 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
 };
 
 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);