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 e36d2f91ffeb9af95ce6c1ea8b48cd508d6abfee..f546bd06b30fbc86abb8574e1c57b5a8cc277b9e 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -102,7 +102,7 @@ public:
     {
         gs_globalCursor = new wxCursor;
 
     {
         gs_globalCursor = new wxCursor;
 

-        return TRUE;
+        return true;

     }
 
     virtual void OnExit()
     }
 
     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
 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 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,
 
     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 */);
 }
 
     m_refData = new wxCursorRefData(hcursor, true /* delete it later */);
 }

+#endif

 
 wxCursor::wxCursor(const char WXUNUSED(bits)[],
                    int WXUNUSED(width),
 
 wxCursor::wxCursor(const char WXUNUSED(bits)[],
                    int WXUNUSED(width),


@@ -276,7 +278,7 @@ wxCursor::wxCursor(const wxString& filename,
 // Cursors by stock number
 wxCursor::wxCursor(int idCursor)
 {
 // 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?
     static const struct StdCursor
     {
         // is this a standard Windows cursor?


@@ -298,10 +300,10 @@ wxCursor::wxCursor(int idCursor)
         { false, _T("WXCURSOR_MAGNIFIER")    }, // wxCURSOR_MAGNIFIER
         {  true, IDC_ARROW                   }, // WXCURSOR_MIDDLE_BUTTON
         {  true, IDC_NO                      }, // WXCURSOR_NO_ENTRY
         { 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_PBRUSH")       }, // wxCURSOR_PAINT_BRUSH

         { false, _T("WXCURSOR_PENCIL")       }, // wxCURSOR_PENCIL
         { false, _T("WXCURSOR_PENCIL")       }, // wxCURSOR_PENCIL

-        { false, _T("WXCURSOR_POINT_LEFT")   }, // wxCURSOR_POINT_LEFT
-        { false, _T("WXCURSOR_POINT_RIGHT")  }, // wxCURSOR_POINT_RIGHT
+        { 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_HELP                    }, // WXCURSOR_QUESTION_ARROW
         {  true, IDC_ARROW                   }, // WXCURSOR_RIGHT_BUTTON
         {  true, IDC_SIZENESW                }, // WXCURSOR_SIZENESW


@@ -309,9 +311,9 @@ wxCursor::wxCursor(int idCursor)
         {  true, IDC_SIZENWSE                }, // WXCURSOR_SIZENWSE
         {  true, IDC_SIZEWE                  }, // WXCURSOR_SIZEWE
         {  true, IDC_SIZEALL                 }, // WXCURSOR_SIZING
         {  true, IDC_SIZENWSE                }, // WXCURSOR_SIZENWSE
         {  true, IDC_SIZEWE                  }, // WXCURSOR_SIZEWE
         {  true, IDC_SIZEALL                 }, // WXCURSOR_SIZING

-        { false, _T("WXCURSOR_SPRAYCAN")     }, // wxCURSOR_SPRAYCAN
+        { false, _T("WXCURSOR_PBRUSH")       }, // wxCURSOR_SPRAYCAN

         {  true, IDC_WAIT                    }, // WXCURSOR_WAIT
         {  true, IDC_WAIT                    }, // WXCURSOR_WAIT

-        {  true, IDC_WAIT                    }, // WXCURSOR_WATCH
+        { false, _T("WXCURSOR_WATCH")        }, // WXCURSOR_WATCH

         { false, _T("WXCURSOR_BLANK")        }, // wxCURSOR_BLANK
         {  true, IDC_APPSTARTING             }, // wxCURSOR_ARROWWAIT
 
         { false, _T("WXCURSOR_BLANK")        }, // wxCURSOR_BLANK
         {  true, IDC_APPSTARTING             }, // wxCURSOR_ARROWWAIT