cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more cursor fixes (now ::wxSetCursor() works too)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-02-23 23:08:40 +00:00
parent 02b5126b85
commit 6bf5720681
2 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/msw/cursor.cpp
View File

@ -6,7 +6,7 @@
// Created: 01/02/97 // Created: 01/02/97
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem // Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@ -52,8 +52,8 @@ wxCursorRefData::wxCursorRefData(void)
wxCursorRefData::~wxCursorRefData(void) wxCursorRefData::~wxCursorRefData(void)
{ {
if ( m_hCursor && m_destroyCursor) if ( m_hCursor && m_destroyCursor)
::DestroyCursor((HICON) m_hCursor); ::DestroyCursor((HICON) m_hCursor);
} }
// Cursors // Cursors
@ -85,14 +85,14 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
{ {
#if wxUSE_RESOURCE_LOADING_IN_MSW #if wxUSE_RESOURCE_LOADING_IN_MSW
M_CURSORDATA->m_hCursor = (WXHCURSOR) ReadCursorFile((char *)(const char *)cursor_file, wxGetInstance(), &M_CURSORDATA->m_width, &M_CURSORDATA->m_height); M_CURSORDATA->m_hCursor = (WXHCURSOR) ReadCursorFile((char *)(const char *)cursor_file, wxGetInstance(), &M_CURSORDATA->m_width, &M_CURSORDATA->m_height);
M_CURSORDATA->m_destroyCursor = TRUE; M_CURSORDATA->m_destroyCursor = TRUE;
#endif #endif
} }
else if (flags & wxBITMAP_TYPE_ICO) else if (flags & wxBITMAP_TYPE_ICO)
{ {
#if wxUSE_RESOURCE_LOADING_IN_MSW #if wxUSE_RESOURCE_LOADING_IN_MSW
M_CURSORDATA->m_hCursor = (WXHCURSOR) IconToCursor((char *)(const char *)cursor_file, wxGetInstance(), hotSpotX, hotSpotY, &M_CURSORDATA->m_width, &M_CURSORDATA->m_height); M_CURSORDATA->m_hCursor = (WXHCURSOR) IconToCursor((char *)(const char *)cursor_file, wxGetInstance(), hotSpotX, hotSpotY, &M_CURSORDATA->m_width, &M_CURSORDATA->m_height);
M_CURSORDATA->m_destroyCursor = TRUE; M_CURSORDATA->m_destroyCursor = TRUE;
#endif #endif
} }
else if (flags & wxBITMAP_TYPE_BMP) else if (flags & wxBITMAP_TYPE_BMP)
@ -109,7 +109,7 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
pnt.x = hotSpotX; pnt.x = hotSpotX;
pnt.y = hotSpotY; pnt.y = hotSpotY;
M_CURSORDATA->m_hCursor = (WXHCURSOR) MakeCursorFromBitmap(wxGetInstance(), hBitmap, &pnt); M_CURSORDATA->m_hCursor = (WXHCURSOR) MakeCursorFromBitmap(wxGetInstance(), hBitmap, &pnt);
M_CURSORDATA->m_destroyCursor = TRUE; M_CURSORDATA->m_destroyCursor = TRUE;
DeleteObject(hBitmap); DeleteObject(hBitmap);
if (M_CURSORDATA->m_hCursor) if (M_CURSORDATA->m_hCursor)
M_CURSORDATA->m_ok = TRUE; M_CURSORDATA->m_ok = TRUE;
@ -239,7 +239,7 @@ wxCursor::wxCursor(int cursor_type)
wxCursor::~wxCursor(void) wxCursor::~wxCursor(void)
{ {
// FreeResource(TRUE); // FreeResource(TRUE);
} }
bool wxCursor::FreeResource(bool WXUNUSED(force)) bool wxCursor::FreeResource(bool WXUNUSED(force))
@ -247,7 +247,7 @@ bool wxCursor::FreeResource(bool WXUNUSED(force))
if (M_CURSORDATA && M_CURSORDATA->m_hCursor && M_CURSORDATA->m_destroyCursor) if (M_CURSORDATA && M_CURSORDATA->m_hCursor && M_CURSORDATA->m_destroyCursor)
{ {
DestroyCursor((HCURSOR) M_CURSORDATA->m_hCursor); DestroyCursor((HCURSOR) M_CURSORDATA->m_hCursor);
M_CURSORDATA->m_hCursor = 0; M_CURSORDATA->m_hCursor = 0;
} }
return TRUE; return TRUE;
} }
@ -255,7 +255,7 @@ bool wxCursor::FreeResource(bool WXUNUSED(force))
void wxCursor::SetHCURSOR(WXHCURSOR cursor) void wxCursor::SetHCURSOR(WXHCURSOR cursor)
{ {
if ( !M_CURSORDATA ) if ( !M_CURSORDATA )
m_refData = new wxCursorRefData; m_refData = new wxCursorRefData;
M_CURSORDATA->m_hCursor = cursor; M_CURSORDATA->m_hCursor = cursor;
} }
@ -263,12 +263,15 @@ void wxCursor::SetHCURSOR(WXHCURSOR cursor)
// Global cursor setting // Global cursor setting
void wxSetCursor(const wxCursor& cursor) void wxSetCursor(const wxCursor& cursor)
{ {
extern wxCursor *g_globalCursor; extern wxCursor *g_globalCursor;
if ( g_globalCursor )
(*g_globalCursor) = cursor;
if (cursor.Ok() && cursor.GetHCURSOR()) if ( cursor.Ok() && cursor.GetHCURSOR() )
::SetCursor((HCURSOR) cursor.GetHCURSOR()); {
::SetCursor((HCURSOR) cursor.GetHCURSOR());
if ( g_globalCursor )
(*g_globalCursor) = cursor;
}
} }

30
src/msw/window.cpp
View File

@ -1486,17 +1486,33 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
return MSWGetDlgCode(); return MSWGetDlgCode();
case WM_SETCURSOR: case WM_SETCURSOR:
if ( wxIsBusy() )
{ {
extern HCURSOR gs_wxBusyCursor; // from msw\utils.cpp HCURSOR hcursor = 0;
if ( wxIsBusy() )
{
extern HCURSOR gs_wxBusyCursor; // from msw\utils.cpp
::SetCursor(gs_wxBusyCursor); hcursor = gs_wxBusyCursor;
}
else
{
extern wxCursor *g_globalCursor; // from msw\data.cpp
// returning TRUE stops the DefWindowProc() from further processing if ( g_globalCursor && g_globalCursor->Ok() )
// this message - exactly what we need because we've just set the hcursor = (HCURSOR)g_globalCursor->GetHCURSOR();
// cursor }
return TRUE;
if ( hcursor )
{
::SetCursor(hcursor);
// returning TRUE stops the DefWindowProc() from further
// processing this message - exactly what we need because we've
// just set the cursor
return TRUE;
}
} }
break; // leave it to DefWindowProc() break; // leave it to DefWindowProc()
default: default: