Tinderbox build fix for wxUnivGTK build.

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

diff --git a/include/wx/motif/cursor.h b/include/wx/motif/cursor.h
index 87a19dadc987d97b89d35fbb9b6bde74dccffd6b..e0882ffc64cc4e1cdfcb2279fcbfc91ec583cd5c 100644 (file)
--- a/include/wx/motif/cursor.h
+++ b/include/wx/motif/cursor.h
@@ -12,10 +12,6 @@
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 
 #ifndef _WX_CURSOR_H_
 #define _WX_CURSOR_H_
 

-#ifdef __GNUG__
-#pragma interface "cursor.h"
-#endif
-

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


@@ -28,12 +24,10 @@ class WXDLLEXPORT wxCursor: public wxObject
         
 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);


@@ -47,8 +41,6 @@ public:
     
     virtual bool Ok() const;
     
     
     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
     bool operator == (const wxCursor& cursor) const
         { return m_refData == cursor.m_refData; }
     bool operator != (const wxCursor& cursor) const


@@ -56,10 +48,15 @@ public:
 
     // 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:
 private:

+    void Create(const char bits[], int width, int height,
+                int hotSpotX = -1, int hotSpotY = -1,
+                const char maskBits[] = NULL);
+    void Create(WXPixmap cursor, WXPixmap mask, int hotSpotX, int hotSpotY);
+

     // Make a cursor from standard id
     // 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);