AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added wxCURSOR_RIGHT_ARROW, which is like the typical wxCURSOR_ARROR,

Browse Source 
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:
Robin Dunn 2002-03-15 22:52:15 +00:00
parent c1fa2fda3c
commit 15dadf3155
9 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/src/stc/PlatWX.cpp
View File

@ -437,7 +437,7 @@ void Window::SetCursor(Cursor curs) {
cursorId = wxCURSOR_SIZENS;
break;
case cursorReverseArrow:
cursorId = wxCURSOR_POINT_RIGHT;
cursorId = wxCURSOR_RIGHT_ARROW;
break;
default:
cursorId = wxCURSOR_ARROW;

2
docs/latex/wx/cursor.tex
View File

@ -120,6 +120,8 @@ is enabled in setup.h). Specify {\it hotSpotX} and {\it hotSpotY}.}
\twocolwidtha{6cm}
\begin{twocollist}\itemsep=0pt
\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\_CHAR}}{Rectangular character cursor.}
\twocolitem{{\bf wxCURSOR\_CROSS}}{A cross cursor.}

1
include/wx/gdicmn.h
View File

@ -90,6 +90,7 @@ enum wxStockCursor
{
wxCURSOR_NONE, // should be 0
wxCURSOR_ARROW,
wxCURSOR_RIGHT_ARROW,
wxCURSOR_BULLSEYE,
wxCURSOR_CHAR,
wxCURSOR_CROSS,

BIN
include/wx/msw/rightarr.cur Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 326 B

2
include/wx/msw/wx.rc
View File

@ -71,6 +71,8 @@ WXCURSOR_PLEFT CURSOR DISCARDABLE "wx/msw/pntleft.cur"
WXCURSOR_PRIGHT CURSOR DISCARDABLE "wx/msw/pntright.cur"
WXCURSOR_QARROW CURSOR DISCARDABLE "wx/msw/query.cur"
WXCURSOR_BLANK CURSOR DISCARDABLE "wx/msw/blank.cur"
WXCURSOR_RIGHT_ARROW CURSOR DISCARDABLE "wx/msw/rightarr.cur"
//////////////////////////////////////////////////////////////////////////////
//

12
src/gtk/cursor.cpp
View File

@ -68,7 +68,9 @@ wxCursor::wxCursor( int cursorId )
GdkCursorType gdk_cur = GDK_LEFT_PTR;
switch (cursorId)
{
case wxCURSOR_ARROW: // fall through to default
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_CROSS: gdk_cur = GDK_CROSSHAIR; break;
case wxCURSOR_SIZEWE: gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
@ -103,8 +105,6 @@ wxCursor::wxCursor( int cursorId )
default:
wxFAIL_MSG(wxT("unsupported cursor type"));
// will use the standard one
case wxCURSOR_ARROW:
break;
}
@ -211,7 +211,7 @@ wxCursor::wxCursor( const wxImage & image )
unsigned long key;
unsigned long value;
unsigned long keyMaskColor = 0;
if (bHasMask)
if (bHasMask)
keyMaskColor = (r << 16) | (g << 8) | b;
tmpImage.ComputeHistogram(histogram);
@ -249,14 +249,14 @@ wxCursor::wxCursor( const wxImage & image )
(unsigned char)(NextFreqCol >> 8),
(unsigned char)(NextFreqCol) ) ;
int hotSpotX=0;
int hotSpotX=0;
int hotSpotY=0;
if (image.HasOption(wxCUR_HOTSPOT_X))
hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X);
if (image.HasOption(wxCUR_HOTSPOT_Y))
hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y);
if (hotSpotX < 0 || hotSpotX >= w)
hotSpotX = 0;
if (hotSpotY < 0 || hotSpotY >= h)
@ -358,7 +358,7 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
if (wxTheApp)
wxTheApp->SendIdleEvents();
gdk_flush();
}

12
src/gtk1/cursor.cpp
View File

@ -68,7 +68,9 @@ wxCursor::wxCursor( int cursorId )
GdkCursorType gdk_cur = GDK_LEFT_PTR;
switch (cursorId)
{
case wxCURSOR_ARROW: // fall through to default
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_CROSS: gdk_cur = GDK_CROSSHAIR; break;
case wxCURSOR_SIZEWE: gdk_cur = GDK_SB_H_DOUBLE_ARROW; break;
@ -103,8 +105,6 @@ wxCursor::wxCursor( int cursorId )
default:
wxFAIL_MSG(wxT("unsupported cursor type"));
// will use the standard one
case wxCURSOR_ARROW:
break;
}
@ -211,7 +211,7 @@ wxCursor::wxCursor( const wxImage & image )
unsigned long key;
unsigned long value;
unsigned long keyMaskColor = 0;
if (bHasMask)
if (bHasMask)
keyMaskColor = (r << 16) | (g << 8) | b;
tmpImage.ComputeHistogram(histogram);
@ -249,14 +249,14 @@ wxCursor::wxCursor( const wxImage & image )
(unsigned char)(NextFreqCol >> 8),
(unsigned char)(NextFreqCol) ) ;
int hotSpotX=0;
int hotSpotX=0;
int hotSpotY=0;
if (image.HasOption(wxCUR_HOTSPOT_X))
hotSpotX = image.GetOptionInt(wxCUR_HOTSPOT_X);
if (image.HasOption(wxCUR_HOTSPOT_Y))
hotSpotY = image.GetOptionInt(wxCUR_HOTSPOT_Y);
if (hotSpotX < 0 || hotSpotX >= w)
hotSpotX = 0;
if (hotSpotY < 0 || hotSpotY >= h)
@ -358,7 +358,7 @@ void wxBeginBusyCursor( wxCursor *WXUNUSED(cursor) )
if (wxTheApp)
wxTheApp->SendIdleEvents();
gdk_flush();
}

7
src/msw/cursor.cpp
View File

@ -187,7 +187,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 );
delete [] bits ;
delete [] maskBits;
@ -383,6 +383,11 @@ wxCursor::wxCursor(int cursor_type)
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);

2
src/stc/PlatWX.cpp
View File

@ -437,7 +437,7 @@ void Window::SetCursor(Cursor curs) {
cursorId = wxCURSOR_SIZENS;
break;
case cursorReverseArrow:
cursorId = wxCURSOR_POINT_RIGHT;
cursorId = wxCURSOR_RIGHT_ARROW;
break;
default:
cursorId = wxCURSOR_ARROW;