Added wxCURSOR_RIGHT_ARROW, which is like the typical wxCURSOR_ARROR,
but points to the right, (duh...) This cursor is now used in wxSTC in the margin area. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -437,7 +437,7 @@ void Window::SetCursor(Cursor curs) {
|
|||||||
cursorId = wxCURSOR_SIZENS;
|
cursorId = wxCURSOR_SIZENS;
|
||||||
break;
|
break;
|
||||||
case cursorReverseArrow:
|
case cursorReverseArrow:
|
||||||
cursorId = wxCURSOR_POINT_RIGHT;
|
cursorId = wxCURSOR_RIGHT_ARROW;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
cursorId = wxCURSOR_ARROW;
|
cursorId = wxCURSOR_ARROW;
|
||||||
|
@@ -120,6 +120,8 @@ is enabled in setup.h). Specify {\it hotSpotX} and {\it hotSpotY}.}
|
|||||||
\twocolwidtha{6cm}
|
\twocolwidtha{6cm}
|
||||||
\begin{twocollist}\itemsep=0pt
|
\begin{twocollist}\itemsep=0pt
|
||||||
\twocolitem{{\bf wxCURSOR\_ARROW}}{A standard arrow cursor.}
|
\twocolitem{{\bf wxCURSOR\_ARROW}}{A standard arrow cursor.}
|
||||||
|
\twocolitem{{\bf wxCURSOR\_RIGHT\_ARROW}}{A standard arrow cursor
|
||||||
|
pointing to the right.}
|
||||||
\twocolitem{{\bf wxCURSOR\_BULLSEYE}}{Bullseye cursor.}
|
\twocolitem{{\bf wxCURSOR\_BULLSEYE}}{Bullseye cursor.}
|
||||||
\twocolitem{{\bf wxCURSOR\_CHAR}}{Rectangular character cursor.}
|
\twocolitem{{\bf wxCURSOR\_CHAR}}{Rectangular character cursor.}
|
||||||
\twocolitem{{\bf wxCURSOR\_CROSS}}{A cross cursor.}
|
\twocolitem{{\bf wxCURSOR\_CROSS}}{A cross cursor.}
|
||||||
|
@@ -90,6 +90,7 @@ enum wxStockCursor
|
|||||||
{
|
{
|
||||||
wxCURSOR_NONE, // should be 0
|
wxCURSOR_NONE, // should be 0
|
||||||
wxCURSOR_ARROW,
|
wxCURSOR_ARROW,
|
||||||
|
wxCURSOR_RIGHT_ARROW,
|
||||||
wxCURSOR_BULLSEYE,
|
wxCURSOR_BULLSEYE,
|
||||||
wxCURSOR_CHAR,
|
wxCURSOR_CHAR,
|
||||||
wxCURSOR_CROSS,
|
wxCURSOR_CROSS,
|
||||||
|
BIN
include/wx/msw/rightarr.cur
Normal file
BIN
include/wx/msw/rightarr.cur
Normal file
Binary file not shown.
After Width: | Height: | Size: 326 B |
@@ -71,6 +71,8 @@ WXCURSOR_PLEFT CURSOR DISCARDABLE "wx/msw/pntleft.cur"
|
|||||||
WXCURSOR_PRIGHT CURSOR DISCARDABLE "wx/msw/pntright.cur"
|
WXCURSOR_PRIGHT CURSOR DISCARDABLE "wx/msw/pntright.cur"
|
||||||
WXCURSOR_QARROW CURSOR DISCARDABLE "wx/msw/query.cur"
|
WXCURSOR_QARROW CURSOR DISCARDABLE "wx/msw/query.cur"
|
||||||
WXCURSOR_BLANK CURSOR DISCARDABLE "wx/msw/blank.cur"
|
WXCURSOR_BLANK CURSOR DISCARDABLE "wx/msw/blank.cur"
|
||||||
|
WXCURSOR_RIGHT_ARROW CURSOR DISCARDABLE "wx/msw/rightarr.cur"
|
||||||
|
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
|
@@ -68,7 +68,9 @@ wxCursor::wxCursor( int cursorId )
|
|||||||
GdkCursorType gdk_cur = GDK_LEFT_PTR;
|
GdkCursorType gdk_cur = GDK_LEFT_PTR;
|
||||||
switch (cursorId)
|
switch (cursorId)
|
||||||
{
|
{
|
||||||
|
case wxCURSOR_ARROW: // fall through to default
|
||||||
case wxCURSOR_DEFAULT: gdk_cur = GDK_LEFT_PTR; break;
|
case wxCURSOR_DEFAULT: gdk_cur = GDK_LEFT_PTR; break;
|
||||||
|
case wxCURSOR_RIGHT_ARROW: gdk_cur = GDK_RIGHT_PTR; break;
|
||||||
case wxCURSOR_HAND: gdk_cur = GDK_HAND1; break;
|
case wxCURSOR_HAND: gdk_cur = GDK_HAND1; break;
|
||||||
case wxCURSOR_CROSS: gdk_cur = GDK_CROSSHAIR; break;
|
case wxCURSOR_CROSS: gdk_cur = GDK_CROSSHAIR; break;
|
||||||
case wxCURSOR_SIZEWE: gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
|
case wxCURSOR_SIZEWE: gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
|
||||||
@@ -103,8 +105,6 @@ wxCursor::wxCursor( int cursorId )
|
|||||||
default:
|
default:
|
||||||
wxFAIL_MSG(wxT("unsupported cursor type"));
|
wxFAIL_MSG(wxT("unsupported cursor type"));
|
||||||
// will use the standard one
|
// will use the standard one
|
||||||
|
|
||||||
case wxCURSOR_ARROW:
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -68,7 +68,9 @@ wxCursor::wxCursor( int cursorId )
|
|||||||
GdkCursorType gdk_cur = GDK_LEFT_PTR;
|
GdkCursorType gdk_cur = GDK_LEFT_PTR;
|
||||||
switch (cursorId)
|
switch (cursorId)
|
||||||
{
|
{
|
||||||
|
case wxCURSOR_ARROW: // fall through to default
|
||||||
case wxCURSOR_DEFAULT: gdk_cur = GDK_LEFT_PTR; break;
|
case wxCURSOR_DEFAULT: gdk_cur = GDK_LEFT_PTR; break;
|
||||||
|
case wxCURSOR_RIGHT_ARROW: gdk_cur = GDK_RIGHT_PTR; break;
|
||||||
case wxCURSOR_HAND: gdk_cur = GDK_HAND1; break;
|
case wxCURSOR_HAND: gdk_cur = GDK_HAND1; break;
|
||||||
case wxCURSOR_CROSS: gdk_cur = GDK_CROSSHAIR; break;
|
case wxCURSOR_CROSS: gdk_cur = GDK_CROSSHAIR; break;
|
||||||
case wxCURSOR_SIZEWE: gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
|
case wxCURSOR_SIZEWE: gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
|
||||||
@@ -103,8 +105,6 @@ wxCursor::wxCursor( int cursorId )
|
|||||||
default:
|
default:
|
||||||
wxFAIL_MSG(wxT("unsupported cursor type"));
|
wxFAIL_MSG(wxT("unsupported cursor type"));
|
||||||
// will use the standard one
|
// will use the standard one
|
||||||
|
|
||||||
case wxCURSOR_ARROW:
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -383,6 +383,11 @@ wxCursor::wxCursor(int cursor_type)
|
|||||||
refData->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), wxT("wxCURSOR_BLANK"));
|
refData->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), wxT("wxCURSOR_BLANK"));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case wxCURSOR_RIGHT_ARROW:
|
||||||
|
{
|
||||||
|
refData->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), wxT("wxCURSOR_RIGHT_ARROW"));
|
||||||
|
break;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
case wxCURSOR_ARROW:
|
case wxCURSOR_ARROW:
|
||||||
refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);
|
refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW);
|
||||||
|
@@ -437,7 +437,7 @@ void Window::SetCursor(Cursor curs) {
|
|||||||
cursorId = wxCURSOR_SIZENS;
|
cursorId = wxCURSOR_SIZENS;
|
||||||
break;
|
break;
|
||||||
case cursorReverseArrow:
|
case cursorReverseArrow:
|
||||||
cursorId = wxCURSOR_POINT_RIGHT;
|
cursorId = wxCURSOR_RIGHT_ARROW;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
cursorId = wxCURSOR_ARROW;
|
cursorId = wxCURSOR_ARROW;
|
||||||
|
Reference in New Issue
Block a user