correct Id tags

[wxWidgets.git] / src / motif / cursor.cpp

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index 134c7e9596587eb37b63917f20450f148649d3ee..df2e6c14b9abaa8cb278e09209aab0fbf11187ac 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -239,16 +239,20 @@ void wxCursor::Create(WXPixmap pixmap, WXPixmap mask_pixmap,
 }
 
 wxCursor::wxCursor(const char bits[], int width, int height,
-                   int hotSpotX, int hotSpotY, const char maskBits[])
+                   int hotSpotX, int hotSpotY, const char maskBits[] ,
+                   const wxColour* WXUNUSED(fg), const wxColour* WXUNUSED(bg) )
 {
     Create(bits, width, height, hotSpotX, hotSpotY, maskBits);
 }
 
-wxCursor::wxCursor(const wxString& name, long flags, int hotSpotX, int hotSpotY)
+wxCursor::wxCursor(const wxString& name, wxBitmapType type, int hotSpotX,
+                  int hotSpotY )
 {
     // Must be an XBM file
-    if (flags != wxBITMAP_TYPE_XBM)
+    if (type != wxBITMAP_TYPE_XBM) {
+        wxLogError("Invalid cursor bitmap type '%d'", type);
         return;
+    }
 
     m_refData = new wxCursorRefData;
 
@@ -284,7 +288,7 @@ wxCursor::wxCursor(const wxString& name, long flags, int hotSpotX, int hotSpotY)
 }
 
 // Cursors by stock number
-wxCursor::wxCursor(wxStockCursor id)
+void wxCursor::InitFromStock(wxStockCursor id)
 {
     m_refData = new wxCursorRefData;
     M_CURSORDATA->m_cursorId = id;
@@ -301,7 +305,7 @@ wxGDIRefData *wxCursor::CreateGDIRefData() const
 
 wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
 {
-    return new wxCursorRefData(*wx_static_cast(const wxCursorRefData *, data));
+    return new wxCursorRefData(*static_cast<const wxCursorRefData *>(data));
 }
 
 // Motif-specific: create/get a cursor for the current display