Cast needed to fix compilation on 10.4 --This line, and those below,

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

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index 41deb27462b97ca1e161d607fb80ec066fe9a79f..68f66e43e29e625cdc08b9cd0e7c90737a964d28 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -23,6 +23,7 @@
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/image.h"
     #include "wx/utils.h"
     #include "wx/window.h"
     #include "wx/image.h"

+    #include "wx/log.h"

 #endif
 
 #ifdef __VMS__
 #endif
 
 #ifdef __VMS__


@@ -239,13 +240,14 @@ void wxCursor::Create(WXPixmap pixmap, WXPixmap mask_pixmap,
 }
 
 wxCursor::wxCursor(const char bits[], int width, int height,
 }
 
 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);
 }
 
 {
     Create(bits, width, height, hotSpotX, hotSpotY, maskBits);
 }
 

-wxCursor::wxCursor(const wxString& name, wxBitmapType type, int hotSpotX, int hotSpotY,
-                   const wxColour* WXUNUSED(fg), const wxColour* WXUNUSED(bg))
+wxCursor::wxCursor(const wxString& name, wxBitmapType type, int hotSpotX,
+                  int hotSpotY )

 {
     // Must be an XBM file
     if (type != wxBITMAP_TYPE_XBM) {
 {
     // Must be an XBM file
     if (type != wxBITMAP_TYPE_XBM) {


@@ -304,7 +306,7 @@ wxGDIRefData *wxCursor::CreateGDIRefData() const
 
 wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) 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
 }
 
 // Motif-specific: create/get a cursor for the current display