X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..d48687a0719620cc888072db31bb3814dea400ab:/src/motif/cursor.cpp?ds=sidebyside

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index eab953674a..6d32080afd 100644
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -1,25 +1,29 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cursor.cpp
+// Name:        src/motif/cursor.cpp
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/list.h"
+#endif
+
 #include "wx/cursor.h"
-#include "wx/app.h"
-#include "wx/utils.h"
-#include "wx/list.h"
-#include "wx/window.h"
-#if wxUSE_IMAGE
-#include "wx/image.h"
-#endif									     
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/window.h"
+    #include "wx/image.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -43,15 +47,15 @@ public:
 
 WX_DECLARE_LIST(wxXCursor, wxXCursorList);
 #include "wx/listimpl.cpp"
-WX_DEFINE_LIST(wxXCursorList);
+WX_DEFINE_LIST(wxXCursorList)
 
 class WXDLLEXPORT wxCursorRefData: public wxObjectRefData
 {
-    friend class WXDLLEXPORT wxCursor;
+    friend class wxCursor;
 public:
     wxCursorRefData();
-    ~wxCursorRefData();
-    
+    virtual ~wxCursorRefData();
+
     wxXCursorList m_cursors;  // wxXCursor objects, one per display
     wxStockCursor m_cursorId; // wxWidgets standard cursor id
 };
@@ -94,7 +98,8 @@ wxCursor::wxCursor(const wxImage & image)
     unsigned char * bits = new unsigned char [imagebitcount];
     unsigned char * maskBits = new unsigned char [imagebitcount];
 
-    int i, j, i8; unsigned char c, cMask;
+    int i, j, i8;
+    unsigned char c, cMask;
     for (i=0; i<imagebitcount; i++)
     {
         bits[i] = 0xff;
@@ -104,11 +109,11 @@ wxCursor::wxCursor(const wxImage & image)
         for (j=0; j<8; j++)
         {
             // possible overflow if we do the summation first ?
-            c = rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3;
-            //if average value is > mid grey
+            c = (unsigned char)(rgbBits[(i8+j)*3]/3 + rgbBits[(i8+j)*3+1]/3 + rgbBits[(i8+j)*3+2]/3);
+            // if average value is > mid grey
             if (c>127)
                 bits[i] = bits[i] & cMask;
-            cMask = (cMask << 1) | 1;
+            cMask = (unsigned char)((cMask << 1) | 1);
         }
     }
 
@@ -129,7 +134,7 @@ wxCursor::wxCursor(const wxImage & image)
             {
                 if (rgbBits[(i8+j)*3] != r || rgbBits[(i8+j)*3+1] != g || rgbBits[(i8+j)*3+2] != b)
                     maskBits[i] = maskBits[i] | cMask;
-                cMask = (cMask << 1);
+                cMask = (unsigned char)(cMask << 1);
             }
         }
     }
@@ -219,7 +224,7 @@ void wxCursor::Create(WXPixmap pixmap, WXPixmap mask_pixmap,
                                   (Pixmap)mask_pixmap,
                                   &foreground_color,
                                   &background_color,
-                                  hotSpotX , 
+                                  hotSpotX ,
                                   hotSpotY);
 
     if (cursor)
@@ -254,7 +259,7 @@ wxCursor::wxCursor(const wxString& name, long flags, int hotSpotX, int hotSpotY)
     int screen_num =  DefaultScreen (dpy);
 
     int value = XReadBitmapFile (dpy, RootWindow (dpy, screen_num),
-                                 wxConstCast(name.c_str(), char),
+                                 name.mb_str(),
                                  &w, &h, &pixmap, &hotX, &hotY);
 
     if (value == BitmapSuccess)
@@ -288,7 +293,7 @@ wxCursor::~wxCursor()
 {
 }
 
-bool wxCursor::Ok() const
+bool wxCursor::IsOk() const
 {
     return m_refData != NULL;
 }
@@ -337,17 +342,18 @@ WXCursor wxCursor::MakeCursor(WXDisplay* display, wxStockCursor id) const
 
     switch (id)
     {
+    case wxCURSOR_CHAR:             return (WXCursor)cursor;
+
     case wxCURSOR_WAIT:             x_cur = XC_watch; break;
-    case wxCURSOR_CROSS:            x_cur = XC_crosshair; break; 
-    case wxCURSOR_CHAR:                       return (WXCursor)cursor; break;
+    case wxCURSOR_CROSS:            x_cur = XC_crosshair; break;
     case wxCURSOR_HAND:             x_cur = XC_hand1; break;
     case wxCURSOR_BULLSEYE:         x_cur = XC_target; break;
-    case wxCURSOR_PENCIL:           x_cur = XC_pencil; break; 
-    case wxCURSOR_MAGNIFIER:        x_cur = XC_sizing; break; 
-    case wxCURSOR_IBEAM:            x_cur = XC_xterm; break; 
+    case wxCURSOR_PENCIL:           x_cur = XC_pencil; break;
+    case wxCURSOR_MAGNIFIER:        x_cur = XC_sizing; break;
+    case wxCURSOR_IBEAM:            x_cur = XC_xterm; break;
     case wxCURSOR_NO_ENTRY:         x_cur = XC_pirate; break;
-    case wxCURSOR_LEFT_BUTTON:      x_cur = XC_leftbutton; break; 
-    case wxCURSOR_RIGHT_BUTTON:     x_cur = XC_rightbutton; break; 
+    case wxCURSOR_LEFT_BUTTON:      x_cur = XC_leftbutton; break;
+    case wxCURSOR_RIGHT_BUTTON:     x_cur = XC_rightbutton; break;
     case wxCURSOR_MIDDLE_BUTTON:    x_cur =  XC_middlebutton; break;
     case wxCURSOR_QUESTION_ARROW:   x_cur = XC_question_arrow; break;
     case wxCURSOR_SIZING:           x_cur = XC_sizing; break;
@@ -424,7 +430,7 @@ static int wxBusyCursorCount = 0;
 
 // Helper function
 static void
-wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
+wxXSetBusyCursor (wxWindow * win, const wxCursor * cursor)
 {
     Display *display = (Display*) win->GetXDisplay();
 
@@ -451,7 +457,7 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
 
     XFlush (display);
 
-    for(wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst (); node; 
+    for(wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst (); node;
         node = node->GetNext())
     {
         wxWindow *child = node->GetData ();
@@ -460,7 +466,7 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
 }
 
 // Set the cursor to the busy cursor for all windows
-void wxBeginBusyCursor(wxCursor *cursor)
+void wxBeginBusyCursor(const wxCursor *cursor)
 {
     wxBusyCursorCount++;
     if (wxBusyCursorCount == 1)