Make sure -DNO_GCC_PRAGMA is in wx-config output regardless of the reason.

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 2478d85df13cd62c3c49145be8c86a343d6f2f7b..f546bd06b30fbc86abb8574e1c57b5a8cc277b9e 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -102,7 +102,7 @@ public:
     {
         gs_globalCursor = new wxCursor;
 
-        return TRUE;
+        return true;
     }
 
     virtual void OnExit()
@@ -172,6 +172,7 @@ wxCursor::wxCursor()
 {
 }
 
+#if wxUSE_IMAGE
 wxCursor::wxCursor(const wxImage& image)
 {
     // image has to be of the standard cursor size, otherwise we won't be able
@@ -179,8 +180,8 @@ wxCursor::wxCursor(const wxImage& image)
     const int w = wxCursorRefData::GetStandardWidth();
     const int h = wxCursorRefData::GetStandardHeight();
 
-    const int hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X);
-    const int hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y);
+    const int hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
+    const int hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);
 
     wxASSERT_MSG( hotSpotX >= 0 && hotSpotX < w &&
                     hotSpotY >= 0 && hotSpotY < h,
@@ -200,6 +201,7 @@ wxCursor::wxCursor(const wxImage& image)
 
     m_refData = new wxCursorRefData(hcursor, true /* delete it later */);
 }
+#endif
 
 wxCursor::wxCursor(const char WXUNUSED(bits)[],
                    int WXUNUSED(width),
@@ -270,17 +272,13 @@ wxCursor::wxCursor(const wxString& filename,
     if ( hcursor )
     {
         m_refData = new wxCursorRefData(hcursor, true /* delete it later */);
-
-#if WXWIN_COMPATIBILITY_2
-        ((wxCursorRefData *)m_refData)->SetOk();
-#endif // WXWIN_COMPATIBILITY_2
     }
 }
 
 // Cursors by stock number
 wxCursor::wxCursor(int idCursor)
 {
-    // all wxWindows standard cursors
+    // all wxWidgets standard cursors
     static const struct StdCursor
     {
         // is this a standard Windows cursor?
@@ -292,31 +290,31 @@ wxCursor::wxCursor(int idCursor)
     {
         {  true, NULL                        }, // wxCURSOR_NONE
         {  true, IDC_ARROW                   }, // wxCURSOR_ARROW
-        { false, _T("wxCURSOR_RIGHT_ARROW")  }, // wxCURSOR_RIGHT_ARROW
-        { false, _T("wxCURSOR_BULLSEYE")     }, // wxCURSOR_BULLSEYE
-        {  true, IDC_ARROW                   }, // wxCURSOR_CHAR
-        {  true, IDC_CROSS                   }, // wxCURSOR_CROSS
-        { false, _T("wxCURSOR_HAND")         }, // wxCURSOR_HAND
-        {  true, IDC_IBEAM                   }, // wxCURSOR_IBEAM
-        {  true, IDC_ARROW                   }, // wxCURSOR_LEFT_BUTTON
-        { false, _T("wxCURSOR_MAGNIFIER")    }, // wxCURSOR_MAGNIFIER
-        {  true, IDC_ARROW                   }, // wxCURSOR_MIDDLE_BUTTON
-        {  true, IDC_NO                      }, // wxCURSOR_NO_ENTRY
-        { false, _T("wxCURSOR_PAINT_BRUSH")  }, // wxCURSOR_PAINT_BRUSH
-        { false, _T("wxCURSOR_PENCIL")       }, // wxCURSOR_PENCIL
-        { false, _T("wxCURSOR_POINT_LEFT")   }, // wxCURSOR_POINT_LEFT
-        { false, _T("wxCURSOR_POINT_RIGHT")  }, // wxCURSOR_POINT_RIGHT
-        {  true, IDC_HELP                    }, // wxCURSOR_QUESTION_ARROW
-        {  true, IDC_ARROW                   }, // wxCURSOR_RIGHT_BUTTON
-        {  true, IDC_SIZENESW                }, // wxCURSOR_SIZENESW
-        {  true, IDC_SIZENS                  }, // wxCURSOR_SIZENS
-        {  true, IDC_SIZENWSE                }, // wxCURSOR_SIZENWSE
-        {  true, IDC_SIZEWE                  }, // wxCURSOR_SIZEWE
-        {  true, IDC_SIZEALL                 }, // wxCURSOR_SIZING
-        { false, _T("wxCURSOR_SPRAYCAN")     }, // wxCURSOR_SPRAYCAN
-        {  true, IDC_WAIT                    }, // wxCURSOR_WAIT
-        {  true, IDC_WAIT                    }, // wxCURSOR_WATCH
-        { false, _T("wxCURSOR_BLANK")        }, // wxCURSOR_BLANK
+        { false, _T("WXCURSOR_RIGHT_ARROW")  }, // wxCURSOR_RIGHT_ARROW
+        { false, _T("WXCURSOR_BULLSEYE")     }, // wxCURSOR_BULLSEYE
+        {  true, IDC_ARROW                   }, // WXCURSOR_CHAR
+        {  true, IDC_CROSS                   }, // WXCURSOR_CROSS
+        { false, _T("WXCURSOR_HAND")         }, // wxCURSOR_HAND
+        {  true, IDC_IBEAM                   }, // WXCURSOR_IBEAM
+        {  true, IDC_ARROW                   }, // WXCURSOR_LEFT_BUTTON
+        { false, _T("WXCURSOR_MAGNIFIER")    }, // wxCURSOR_MAGNIFIER
+        {  true, IDC_ARROW                   }, // WXCURSOR_MIDDLE_BUTTON
+        {  true, IDC_NO                      }, // WXCURSOR_NO_ENTRY
+        { false, _T("WXCURSOR_PBRUSH")       }, // wxCURSOR_PAINT_BRUSH
+        { false, _T("WXCURSOR_PENCIL")       }, // wxCURSOR_PENCIL
+        { false, _T("WXCURSOR_PLEFT")        }, // wxCURSOR_POINT_LEFT
+        { false, _T("WXCURSOR_PRIGHT")       }, // wxCURSOR_POINT_RIGHT
+        {  true, IDC_HELP                    }, // WXCURSOR_QUESTION_ARROW
+        {  true, IDC_ARROW                   }, // WXCURSOR_RIGHT_BUTTON
+        {  true, IDC_SIZENESW                }, // WXCURSOR_SIZENESW
+        {  true, IDC_SIZENS                  }, // WXCURSOR_SIZENS
+        {  true, IDC_SIZENWSE                }, // WXCURSOR_SIZENWSE
+        {  true, IDC_SIZEWE                  }, // WXCURSOR_SIZEWE
+        {  true, IDC_SIZEALL                 }, // WXCURSOR_SIZING
+        { false, _T("WXCURSOR_PBRUSH")       }, // wxCURSOR_SPRAYCAN
+        {  true, IDC_WAIT                    }, // WXCURSOR_WAIT
+        { false, _T("WXCURSOR_WATCH")        }, // WXCURSOR_WATCH
+        { false, _T("WXCURSOR_BLANK")        }, // wxCURSOR_BLANK
         {  true, IDC_APPSTARTING             }, // wxCURSOR_ARROWWAIT
 
         // no entry for wxCURSOR_MAX