#include "wx/cursor.h"
#endif
+#include "wx/module.h"
#include "wx/msw/private.h"
#include "wx/msw/dib.h"
// wxWin macros
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARIES
- IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxCursorBase)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxCursorBase)
+
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+// Current cursor, in order to hang on to cursor handle when setting the cursor
+// globally
+static wxCursor *gs_globalCursor = NULL;
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+class wxCursorModule : public wxModule
+{
+public:
+ virtual bool OnInit()
+ {
+ gs_globalCursor = new wxCursor;
+
+ return TRUE;
+ }
+
+ virtual void OnExit()
+ {
+ delete gs_globalCursor;
+ gs_globalCursor = (wxCursor *)NULL;
+ }
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
// ----------------------------------------------------------------------------
// wxCursorRefData
void wxCursorRefData::Free()
{
- if ( m_hCursor && m_destroyCursor )
- ::DestroyCursor((HCURSOR)m_hCursor);
+ if ( m_hCursor )
+ {
+ if ( m_destroyCursor )
+ ::DestroyCursor((HCURSOR)m_hCursor);
+
+ m_hCursor = 0;
+ }
}
// ----------------------------------------------------------------------------
switch (cursor_type)
{
+ case wxCURSOR_ARROWWAIT:
+#ifndef __WIN16__
+ refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_APPSTARTING);
+ break;
+#endif
case wxCURSOR_WAIT:
refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_WAIT);
break;
}
case wxCURSOR_QUESTION_ARROW:
{
+// refData->m_hCursor = (WXHCURSOR) LoadImage(wxGetInstance(), wxT("wxCURSOR_QARROW"), IMAGE_CURSOR, 16, 16, LR_MONOCHROME);
refData->m_hCursor = (WXHCURSOR) LoadCursor(wxGetInstance(), wxT("wxCURSOR_QARROW"));
break;
}
// Global cursor setting
// ----------------------------------------------------------------------------
-void wxSetCursor(const wxCursor& cursor)
+const wxCursor *wxGetGlobalCursor()
{
- extern wxCursor *g_globalCursor;
+ return gs_globalCursor;
+}
- if ( cursor.Ok() && cursor.GetHCURSOR() )
+void wxSetCursor(const wxCursor& cursor)
+{
+ if ( cursor.Ok() )
{
- ::SetCursor((HCURSOR) cursor.GetHCURSOR());
+ ::SetCursor(GetHcursorOf(cursor));
- if ( g_globalCursor )
- (*g_globalCursor) = cursor;
+ if ( gs_globalCursor )
+ *gs_globalCursor = cursor;
}
}