use unsgined int instead of int for 1 bit bitfields (SGI CC warning fix)

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

diff --git a/src/motif/cursor.cpp b/src/motif/cursor.cpp
index 4ecaddf1b759c95da639a269da51211cb9ea170d..66b2925bec8b8456dd1ad7e5cbb75570bd60e66b 100644 (file)
--- a/src/motif/cursor.cpp
+++ b/src/motif/cursor.cpp
@@ -9,10 +9,13 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "cursor.h"
 #endif
 
 #pragma implementation "cursor.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/cursor.h"
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/cursor.h"
 #include "wx/app.h"
 #include "wx/utils.h"


@@ -54,7 +57,7 @@ public:
     ~wxCursorRefData();
     
     wxXCursorList m_cursors;  // wxXCursor objects, one per display
     ~wxCursorRefData();
     
     wxXCursorList m_cursors;  // wxXCursor objects, one per display

-    wxStockCursor m_cursorId; // wxWindows standard cursor id
+    wxStockCursor m_cursorId; // wxWidgets standard cursor id

 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)
 };
 
 #define M_CURSORDATA ((wxCursorRefData *)m_refData)


@@ -143,13 +146,13 @@ wxCursor::wxCursor(const wxImage & image)
     int hotSpotX;
     int hotSpotY;
 
     int hotSpotX;
     int hotSpotY;
 

-    if (image.HasOption(wxCUR_HOTSPOT_X))
-        hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X);
+    if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_X))
+        hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);

     else
         hotSpotX = 0;
 
     else
         hotSpotX = 0;
 

-    if (image.HasOption(wxCUR_HOTSPOT_Y))
-        hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y);
+    if (image.HasOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y))
+        hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);

     else
         hotSpotY = 0;
 
     else
         hotSpotY = 0;
 


@@ -295,7 +298,7 @@ bool wxCursor::Ok() const
 }
 
 // Motif-specific: create/get a cursor for the current display
 }
 
 // Motif-specific: create/get a cursor for the current display

-WXCursor wxCursor::GetXCursor(WXDisplay* display)
+WXCursor wxCursor::GetXCursor(WXDisplay* display) const

 {
     if (!M_CURSORDATA)
         return (WXCursor) 0;
 {
     if (!M_CURSORDATA)
         return (WXCursor) 0;


@@ -330,7 +333,7 @@ WXCursor wxCursor::GetXCursor(WXDisplay* display)
 }
 
 // Make a cursor from standard id
 }
 
 // Make a cursor from standard id

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

 {
     Display* dpy = (Display*) display;
     Cursor cursor = (Cursor) 0;
 {
     Display* dpy = (Display*) display;
     Cursor cursor = (Cursor) 0;


@@ -493,7 +496,7 @@ void wxEndBusyCursor()
     }
 }
 
     }
 }
 

-// TRUE if we're between the above two calls
+// true if we're between the above two calls

 bool wxIsBusy()
 {
     return (wxBusyCursorCount > 0);
 bool wxIsBusy()
 {
     return (wxBusyCursorCount > 0);