virtual void OnExit()
{
- delete gs_globalCursor;
- gs_globalCursor = (wxCursor *)NULL;
+ wxDELETE(gs_globalCursor);
}
};
wxASSERT_MSG( hotSpotX >= 0 && hotSpotX < image_w &&
hotSpotY >= 0 && hotSpotY < image_h,
- _T("invalid cursor hot spot coordinates") );
+ wxT("invalid cursor hot spot coordinates") );
wxImage imageSized(image); // final image of correct size
HCURSOR hcursor = wxBitmapToHCURSOR( wxBitmap(imageSized),
hotSpotX, hotSpotY );
-#if wxUSE_WXDIB
if ( !hcursor )
{
wxLogWarning(_("Failed to create cursor."));
return;
}
-#endif // wxUSE_WXDIB
m_refData = new wxCursorRefData(hcursor, true /* delete it later */);
}
-#endif
-
-wxCursor::wxCursor(const char WXUNUSED(bits)[],
- int WXUNUSED(width),
- int WXUNUSED(height),
- int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY),
- const char WXUNUSED(maskBits)[])
-{
-}
+#endif // wxUSE_IMAGE
// MicroWin doesn't have support needed for the other ctors
#ifdef __WXMICROWIN__
-wxCursor::wxCursor(const wxString& WXUNUSED(filename),
- long WXUNUSED(kind),
- int WXUNUSED(hotSpotX),
- int WXUNUSED(hotSpotY))
-{
-}
-
-wxCursor::wxCursor(int WXUNUSED(cursor_type))
+wxCursor::InitFromStock(wxStockCursor WXUNUSED(cursor_type))
{
}
#else // !__WXMICROWIN__
wxCursor::wxCursor(const wxString& filename,
- long kind,
+ wxBitmapType kind,
int hotSpotX,
int hotSpotY)
{
switch ( kind )
{
case wxBITMAP_TYPE_CUR_RESOURCE:
- hcursor = ::LoadCursor(wxGetInstance(), filename.fn_str());
+ hcursor = ::LoadCursor(wxGetInstance(), filename.t_str());
break;
#ifndef __WXWINCE__
+ case wxBITMAP_TYPE_ANI:
case wxBITMAP_TYPE_CUR:
- hcursor = ::LoadCursorFromFile(filename.fn_str());
+ hcursor = ::LoadCursorFromFile(filename.t_str());
break;
#endif
break;
default:
- wxFAIL_MSG( _T("unknown cursor resource type") );
+ wxLogError( wxT("unknown cursor resource type '%d'"), kind );
hcursor = NULL;
}
}
}
+namespace
+{
+
+void ReverseBitmap(HBITMAP bitmap, int width, int height)
+{
+ MemoryHDC hdc;
+ SelectInHDC selBitmap(hdc, bitmap);
+ ::StretchBlt(hdc, width - 1, 0, -width, height,
+ hdc, 0, 0, width, height, SRCCOPY);
+}
+
+HCURSOR CreateReverseCursor(HCURSOR cursor)
+{
+ ICONINFO info;
+ if ( !::GetIconInfo(cursor, &info) )
+ return NULL;
+
+ HCURSOR cursorRev = NULL;
+
+ BITMAP bmp;
+ if ( ::GetObject(info.hbmMask, sizeof(bmp), &bmp) )
+ {
+ ReverseBitmap(info.hbmMask, bmp.bmWidth, bmp.bmHeight);
+ if ( info.hbmColor )
+ ReverseBitmap(info.hbmColor, bmp.bmWidth, bmp.bmHeight);
+ info.xHotspot = (DWORD)bmp.bmWidth - 1 - info.xHotspot;
+
+ cursorRev = ::CreateIconIndirect(&info);
+ }
+
+ ::DeleteObject(info.hbmMask);
+ if ( info.hbmColor )
+ ::DeleteObject(info.hbmColor);
+
+ return cursorRev;
+}
+
+} // anonymous namespace
+
// Cursors by stock number
-wxCursor::wxCursor(int idCursor)
+void wxCursor::InitFromStock(wxStockCursor idCursor)
{
// all wxWidgets standard cursors
static const struct StdCursor
{
{ true, NULL }, // wxCURSOR_NONE
{ true, IDC_ARROW }, // wxCURSOR_ARROW
- { false, _T("WXCURSOR_RIGHT_ARROW") }, // wxCURSOR_RIGHT_ARROW
- { false, _T("WXCURSOR_BULLSEYE") }, // wxCURSOR_BULLSEYE
+ { false, wxT("WXCURSOR_RIGHT_ARROW") }, // wxCURSOR_RIGHT_ARROW
+ { false, wxT("WXCURSOR_BULLSEYE") }, // wxCURSOR_BULLSEYE
{ true, IDC_ARROW }, // WXCURSOR_CHAR
-
- // Displays as an I-beam on XP, so use a cursor file
-// { true, IDC_CROSS }, // WXCURSOR_CROSS
- { false, _T("WXCURSOR_CROSS") }, // WXCURSOR_CROSS
-
- // See special handling below for wxCURSOR_HAND
-// { false, _T("WXCURSOR_HAND") }, // wxCURSOR_HAND
+ { true, IDC_CROSS }, // WXCURSOR_CROSS
{ true, IDC_HAND }, // wxCURSOR_HAND
-
{ true, IDC_IBEAM }, // WXCURSOR_IBEAM
{ true, IDC_ARROW }, // WXCURSOR_LEFT_BUTTON
- { false, _T("WXCURSOR_MAGNIFIER") }, // wxCURSOR_MAGNIFIER
+ { false, wxT("WXCURSOR_MAGNIFIER") }, // wxCURSOR_MAGNIFIER
{ true, IDC_ARROW }, // WXCURSOR_MIDDLE_BUTTON
{ true, IDC_NO }, // WXCURSOR_NO_ENTRY
- { false, _T("WXCURSOR_PBRUSH") }, // wxCURSOR_PAINT_BRUSH
- { false, _T("WXCURSOR_PENCIL") }, // wxCURSOR_PENCIL
- { false, _T("WXCURSOR_PLEFT") }, // wxCURSOR_POINT_LEFT
- { false, _T("WXCURSOR_PRIGHT") }, // wxCURSOR_POINT_RIGHT
+ { false, wxT("WXCURSOR_PBRUSH") }, // wxCURSOR_PAINT_BRUSH
+ { false, wxT("WXCURSOR_PENCIL") }, // wxCURSOR_PENCIL
+ { false, wxT("WXCURSOR_PLEFT") }, // wxCURSOR_POINT_LEFT
+ { false, wxT("WXCURSOR_PRIGHT") }, // wxCURSOR_POINT_RIGHT
{ true, IDC_HELP }, // WXCURSOR_QUESTION_ARROW
{ true, IDC_ARROW }, // WXCURSOR_RIGHT_BUTTON
{ true, IDC_SIZENESW }, // WXCURSOR_SIZENESW
{ true, IDC_SIZENWSE }, // WXCURSOR_SIZENWSE
{ true, IDC_SIZEWE }, // WXCURSOR_SIZEWE
{ true, IDC_SIZEALL }, // WXCURSOR_SIZING
- { false, _T("WXCURSOR_PBRUSH") }, // wxCURSOR_SPRAYCAN
+ { false, wxT("WXCURSOR_PBRUSH") }, // wxCURSOR_SPRAYCAN
{ true, IDC_WAIT }, // WXCURSOR_WAIT
{ true, IDC_WAIT }, // WXCURSOR_WATCH
- { false, _T("WXCURSOR_BLANK") }, // wxCURSOR_BLANK
+ { false, wxT("WXCURSOR_BLANK") }, // wxCURSOR_BLANK
{ true, IDC_APPSTARTING }, // wxCURSOR_ARROWWAIT
// no entry for wxCURSOR_MAX
CursorsIdArrayMismatch );
wxCHECK_RET( idCursor > 0 && (size_t)idCursor < WXSIZEOF(stdCursors),
- _T("invalid cursor id in wxCursor() ctor") );
+ wxT("invalid cursor id in wxCursor() ctor") );
const StdCursor& stdCursor = stdCursors[idCursor];
bool deleteLater = !stdCursor.isStd;
// IDC_HAND may not be available on some versions of Windows.
if ( !hcursor && idCursor == wxCURSOR_HAND)
{
- hcursor = ::LoadCursor(wxGetInstance(), _T("WXCURSOR_HAND"));
+ hcursor = ::LoadCursor(wxGetInstance(), wxT("WXCURSOR_HAND"));
deleteLater = true;
}
+ if ( !hcursor && idCursor == wxCURSOR_RIGHT_ARROW)
+ {
+ hcursor = ::LoadCursor(NULL, IDC_ARROW);
+ if ( hcursor )
+ {
+ hcursor = CreateReverseCursor(hcursor);
+ deleteLater = true;
+ }
+ }
+
if ( !hcursor )
{
- wxLogLastError(_T("LoadCursor"));
+ if ( !stdCursor.isStd )
+ {
+ // it may be not obvious to the programmer why did loading fail,
+ // try to help by pointing to the by far the most probable reason
+ wxFAIL_MSG(wxT("Loading a cursor defined by wxWidgets failed, ")
+ wxT("did you include include/wx/msw/wx.rc file from ")
+ wxT("your resource file?"));
+ }
+
+ wxLogLastError(wxT("LoadCursor"));
}
else
{
void wxSetCursor(const wxCursor& cursor)
{
- if ( cursor.Ok() )
+ if ( cursor.IsOk() )
{
::SetCursor(GetHcursorOf(cursor));
projects / wxWidgets.git / blobdiff