X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d0512bd8f4bdf548e0385b21f54f14b68b4b174..70b8ab778fc3f9f89874a242bfa014f2b313c59b:/src/msw/cursor.cpp?ds=sidebyside diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index 706b97fb92..bbe9e4662c 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -32,12 +32,16 @@ #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" - #include "wx/cursor.h" + #include "wx/bitmap.h" #include "wx/icon.h" + #include "wx/cursor.h" #endif +#include "wx/module.h" #include "wx/msw/private.h" +#ifndef __WXMICROWIN__ #include "wx/msw/dib.h" +#endif #if wxUSE_RESOURCE_LOADING_IN_MSW #include "wx/msw/curico.h" @@ -48,9 +52,40 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES - IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxCursorBase) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject) + +// ---------------------------------------------------------------------------- +// 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 @@ -61,13 +96,20 @@ wxCursorRefData::wxCursorRefData() m_width = 32; m_height = 32; - m_destroyCursor = FALSE; + m_destroyCursor = TRUE; } void wxCursorRefData::Free() { - if ( m_hCursor && m_destroyCursor ) - ::DestroyCursor((HCURSOR)m_hCursor); + if ( m_hCursor ) + { +#ifndef __WXMICROWIN__ + if ( m_destroyCursor ) + ::DestroyCursor((HCURSOR)m_hCursor); +#endif + + m_hCursor = 0; + } } // ---------------------------------------------------------------------------- @@ -78,6 +120,79 @@ wxCursor::wxCursor() { } +wxCursor::wxCursor( const wxImage & image ) +{ + //image has to be 32x32 + wxImage image32 = image.Scale(32,32); + unsigned char * rgbBits = image32.GetData(); + int w = image32.GetWidth() ; + int h = image32.GetHeight() ; + bool bHasMask = image32.HasMask() ; + int imagebitcount = (w*h)/8; + + unsigned char r, g, b ; + unsigned char * bits = new unsigned char [imagebitcount]; + unsigned char * maskBits = new unsigned char [imagebitcount]; + + int i,j, i8; unsigned char c, cMask; + for (i=0; i mid grey + if (c>127) + bits[i] = bits[i] | cMask ; + cMask = cMask / 2 ; + } + } + if (bHasMask) + { + r = image32.GetMaskRed() ; + g = image32.GetMaskGreen() ; + b = image32.GetMaskBlue() ; + + for (i=0; i= w) + hotSpotX = 0; + if (hotSpotY < 0 || hotSpotY >= h) + hotSpotY = 0; + + 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; + +} + wxCursor::wxCursor(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(height), @@ -90,11 +205,12 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int hotSpotY) { +#ifdef __WXMICROWIN__ + m_refData = NULL; +#else wxCursorRefData *refData = new wxCursorRefData; m_refData = refData; - refData->m_destroyCursor = FALSE; - if (flags == wxBITMAP_TYPE_CUR_RESOURCE) { #ifdef __WIN95__ @@ -110,7 +226,6 @@ wxCursor::wxCursor(const wxString& cursor_file, #else #if wxUSE_RESOURCE_LOADING_IN_MSW refData->m_hCursor = (WXHCURSOR) ReadCursorFile(WXSTRINGCAST cursor_file, wxGetInstance(), &refData->m_width, &refData->m_height); - refData->m_destroyCursor = TRUE; #endif #endif } @@ -118,7 +233,6 @@ wxCursor::wxCursor(const wxString& cursor_file, { #if wxUSE_RESOURCE_LOADING_IN_MSW refData->m_hCursor = (WXHCURSOR) IconToCursor(WXSTRINGCAST cursor_file, wxGetInstance(), hotSpotX, hotSpotY, &refData->m_width, &refData->m_height); - refData->m_destroyCursor = TRUE; #endif } else if (flags == wxBITMAP_TYPE_BMP) @@ -135,7 +249,6 @@ wxCursor::wxCursor(const wxString& cursor_file, pnt.x = hotSpotX; pnt.y = hotSpotY; refData->m_hCursor = (WXHCURSOR) MakeCursorFromBitmap(wxGetInstance(), hBitmap, &pnt); - refData->m_destroyCursor = TRUE; DeleteObject(hBitmap); #endif } @@ -143,16 +256,26 @@ wxCursor::wxCursor(const wxString& cursor_file, #if WXWIN_COMPATIBILITY_2 refData->SetOk(); #endif // WXWIN_COMPATIBILITY_2 + +#endif } // Cursors by stock number wxCursor::wxCursor(int cursor_type) { +#ifdef __WXMICROWIN__ + m_refData = NULL; +#else wxCursorRefData *refData = new wxCursorRefData; m_refData = refData; 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; @@ -251,6 +374,7 @@ wxCursor::wxCursor(int cursor_type) } 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; } @@ -264,6 +388,11 @@ wxCursor::wxCursor(int cursor_type) refData->m_hCursor = (WXHCURSOR) LoadCursor((HINSTANCE) NULL, IDC_ARROW); break; } + + // no need to destroy the stock cursors + // TODO: check this + //m_refData->m_destroyCursor = FALSE; +#endif } wxCursor::~wxCursor() @@ -274,16 +403,21 @@ wxCursor::~wxCursor() // 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()); +#ifndef __WXMICROWIN__ + ::SetCursor(GetHcursorOf(cursor)); +#endif - if ( g_globalCursor ) - (*g_globalCursor) = cursor; + if ( gs_globalCursor ) + *gs_globalCursor = cursor; } }