Applied another Marco patch (5)

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

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index bbe9e4662c0945964a3c097a4dcafb26c5f37ebe..31d0f4e86d43ecf8b188c1a31a5789f23fdd8c8a 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -38,6 +38,7 @@
 #endif
 
 #include "wx/module.h"
 #endif
 
 #include "wx/module.h"

+#include "wx/image.h"

 #include "wx/msw/private.h"
 #ifndef __WXMICROWIN__
 #include "wx/msw/dib.h"
 #include "wx/msw/private.h"
 #ifndef __WXMICROWIN__
 #include "wx/msw/dib.h"


@@ -187,7 +188,7 @@ wxCursor::wxCursor( const wxImage & image )
     wxCursorRefData *refData = new wxCursorRefData;
     m_refData = refData;
     refData->m_hCursor = (WXHCURSOR) CreateCursor ( wxGetInstance(), hotSpotX, hotSpotY, w, h, /*AND*/ maskBits, /*XOR*/ bits   );
     wxCursorRefData *refData = new wxCursorRefData;
     m_refData = refData;
     refData->m_hCursor = (WXHCURSOR) CreateCursor ( wxGetInstance(), hotSpotX, hotSpotY, w, h, /*AND*/ maskBits, /*XOR*/ bits   );

-  
+

     delete [] bits ;
     delete [] maskBits;
 
     delete [] bits ;
     delete [] maskBits;
 


@@ -375,7 +376,8 @@ wxCursor::wxCursor(int cursor_type)
     case wxCURSOR_QUESTION_ARROW:
     {
 //      refData->m_hCursor = (WXHCURSOR) LoadImage(wxGetInstance(), wxT("wxCURSOR_QARROW"), IMAGE_CURSOR, 16, 16, LR_MONOCHROME);
     case wxCURSOR_QUESTION_ARROW:
     {
 //      refData->m_hCursor = (WXHCURSOR) LoadImage(wxGetInstance(), wxT("wxCURSOR_QARROW"), IMAGE_CURSOR, 16, 16, LR_MONOCHROME);

-      refData->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), wxT("wxCURSOR_QARROW"));
+//      refData->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), wxT("wxCURSOR_QARROW"));
+      refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_HELP);

       break;
     }
     case wxCURSOR_BLANK:
       break;
     }
     case wxCURSOR_BLANK:


@@ -383,6 +385,11 @@ wxCursor::wxCursor(int cursor_type)
       refData->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), wxT("wxCURSOR_BLANK"));
       break;
     }
       refData->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), wxT("wxCURSOR_BLANK"));
       break;
     }

+    case wxCURSOR_RIGHT_ARROW:
+    {
+        refData->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), wxT("wxCURSOR_RIGHT_ARROW"));
+        break;
+    }

     default:
     case wxCURSOR_ARROW:
       refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);
     default:
     case wxCURSOR_ARROW:
       refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);