Added wxCURSOR_ARROWWAIT which is the default arrow+hourglass cursor

on MSW, or the same as wxCURSOR_WAIT on wxGTK.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/cursor.tex b/docs/latex/wx/cursor.tex
index bbc3c38daac8f27dcab02115a48dff843ace5a67..5719407d43365f734b77ee2f547cb9504fbde428 100644 (file)
--- a/docs/latex/wx/cursor.tex
+++ b/docs/latex/wx/cursor.tex
@@ -134,6 +134,8 @@ is enabled in setup.h). Specify {\it hotSpotX} and {\it hotSpotY}.}
 \twocolitem{{\bf wxCURSOR\_SPRAYCAN}}{A spraycan cursor.}
 \twocolitem{{\bf wxCURSOR\_WAIT}}{A wait cursor.}
 \twocolitem{{\bf wxCURSOR\_WATCH}}{A watch cursor.}
+\twocolitem{{\bf wxCURSOR\_ARROWWAIT}}{A cursor with both an arrow and
+an hourglass, (windows.)}
 \end{twocollist}\twocolwidtha{5cm}
 
 Note that not all cursors are available on all platforms.}

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 82c55108c9c547dda615028d12c22c1691d02073..c127a444696058c55fd9dd429281e29e779e263e 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -123,6 +123,8 @@ enum wxStockCursor
     wxCURSOR_BASED_ARROW_DOWN,
 #endif // X11
 
+    wxCURSOR_ARROWWAIT,
+
     wxCURSOR_MAX
 };
 

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 25b07ea391dae9e19c0fb20ac8ba767182fe1755..4ce0228ce79d76eaf476e7aaf498b3235068a36b 100644 (file)
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -72,6 +72,7 @@ wxCursor::wxCursor( int cursorId )
         case wxCURSOR_CROSS:            gdk_cur = GDK_CROSSHAIR; break;
         case wxCURSOR_SIZEWE:           gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
         case wxCURSOR_SIZENS:           gdk_cur = GDK_SB_V_DOUBLE_ARROW; break;
+        case wxCURSOR_ARROWWAIT:
         case wxCURSOR_WAIT:
         case wxCURSOR_WATCH:            gdk_cur = GDK_WATCH; break;
         case wxCURSOR_SIZING:           gdk_cur = GDK_SIZING; break;

diff --git a/src/gtk1/cursor.cpp b/src/gtk1/cursor.cpp
index 25b07ea391dae9e19c0fb20ac8ba767182fe1755..4ce0228ce79d76eaf476e7aaf498b3235068a36b 100644 (file)
--- a/src/gtk1/cursor.cpp
+++ b/src/gtk1/cursor.cpp
@@ -72,6 +72,7 @@ wxCursor::wxCursor( int cursorId )
         case wxCURSOR_CROSS:            gdk_cur = GDK_CROSSHAIR; break;
         case wxCURSOR_SIZEWE:           gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
         case wxCURSOR_SIZENS:           gdk_cur = GDK_SB_V_DOUBLE_ARROW; break;
+        case wxCURSOR_ARROWWAIT:
         case wxCURSOR_WAIT:
         case wxCURSOR_WATCH:            gdk_cur = GDK_WATCH; break;
         case wxCURSOR_SIZING:           gdk_cur = GDK_SIZING; break;

diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp
index 0f7ce4ac2a91da7e1a7c7fbd0fc2ce18c882dddf..892ca4ee0f7cb3245a1d71a3d369a0dbca19bd29 100644 (file)
--- a/src/msw/cursor.cpp
+++ b/src/msw/cursor.cpp
@@ -191,6 +191,9 @@ wxCursor::wxCursor(int cursor_type)
 
   switch (cursor_type)
   {
+    case wxCURSOR_ARROWWAIT:
+      refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_APPSTARTING);
+      break;
     case wxCURSOR_WAIT:
       refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_WAIT);
       break;