// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "cursor.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#include "wx/cursor.h"
+
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/bitmap.h"
#include "wx/icon.h"
- #include "wx/cursor.h"
#include "wx/settings.h"
#include "wx/intl.h"
+ #include "wx/image.h"
+ #include "wx/module.h"
#endif
-#include "wx/module.h"
-#include "wx/image.h"
#include "wx/msw/private.h"
+#include "wx/msw/missing.h" // IDC_HAND
// define functions missing in MicroWin
#ifdef __WXMICROWIN__
{
gs_globalCursor = new wxCursor;
- return TRUE;
+ return true;
}
virtual void OnExit()
{
delete gs_globalCursor;
- gs_globalCursor = (wxCursor *)NULL;
+ gs_globalCursor = NULL;
}
};
const int w = wxCursorRefData::GetStandardWidth();
const int h = wxCursorRefData::GetStandardHeight();
- const int hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
- const int hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);
+ int hotSpotX = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
+ int hotSpotY = image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);
+ int image_w = image.GetWidth();
+ int image_h = image.GetHeight();
- wxASSERT_MSG( hotSpotX >= 0 && hotSpotX < w &&
- hotSpotY >= 0 && hotSpotY < h,
+ wxASSERT_MSG( hotSpotX >= 0 && hotSpotX < image_w &&
+ hotSpotY >= 0 && hotSpotY < image_h,
_T("invalid cursor hot spot coordinates") );
- HCURSOR hcursor = wxBitmapToHCURSOR
- (
- wxBitmap(image.Scale(w, h)),
- hotSpotX,
- hotSpotY
- );
+ wxImage imageSized(image); // final image of correct size
+
+ // if image is too small then place it in the center, resize it if too big
+ if ((w > image_w) && (h > image_h))
+ {
+ wxPoint offset((w - image_w)/2, (h - image_h)/2);
+ hotSpotX = hotSpotX + offset.x;
+ hotSpotY = hotSpotY + offset.y;
+
+ imageSized = image.Size(wxSize(w, h), offset);
+ }
+ else if ((w != image_w) || (h != image_h))
+ {
+ hotSpotX = int(hotSpotX * double(w) / double(image_w));
+ hotSpotY = int(hotSpotY * double(h) / double(image_h));
+
+ imageSized = image.Scale(w, h);
+ }
+
+ HCURSOR hcursor = wxBitmapToHCURSOR( wxBitmap(imageSized),
+ hotSpotX, hotSpotY );
+
if ( !hcursor )
{
wxLogWarning(_("Failed to create cursor."));
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);
+ hcursor = ::LoadCursor(wxGetInstance(), filename.fn_str());
break;
#ifndef __WXWINCE__
case wxBITMAP_TYPE_CUR:
- hcursor = ::LoadCursorFromFile(filename);
+ hcursor = ::LoadCursorFromFile(filename.fn_str());
break;
#endif
break;
default:
- wxFAIL_MSG( _T("unknown cursor resource type") );
+ wxLogError( _T("unknown cursor resource type '%d'"), kind );
hcursor = NULL;
}
}
// Cursors by stock number
-wxCursor::wxCursor(int idCursor)
+void wxCursor::InitFromStock(wxStockCursor idCursor)
{
// all wxWidgets standard cursors
static const struct StdCursor
{ false, _T("WXCURSOR_RIGHT_ARROW") }, // wxCURSOR_RIGHT_ARROW
{ false, _T("WXCURSOR_BULLSEYE") }, // wxCURSOR_BULLSEYE
{ true, IDC_ARROW }, // WXCURSOR_CHAR
- { true, IDC_CROSS }, // WXCURSOR_CROSS
- { false, _T("WXCURSOR_HAND") }, // wxCURSOR_HAND
+
+ // 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_HAND }, // wxCURSOR_HAND
+
{ true, IDC_IBEAM }, // WXCURSOR_IBEAM
{ true, IDC_ARROW }, // WXCURSOR_LEFT_BUTTON
{ false, _T("WXCURSOR_MAGNIFIER") }, // wxCURSOR_MAGNIFIER
{ true, IDC_SIZEALL }, // WXCURSOR_SIZING
{ false, _T("WXCURSOR_PBRUSH") }, // wxCURSOR_SPRAYCAN
{ true, IDC_WAIT }, // WXCURSOR_WAIT
- { false, _T("WXCURSOR_WATCH") }, // WXCURSOR_WATCH
+ { true, IDC_WAIT }, // WXCURSOR_WATCH
{ false, _T("WXCURSOR_BLANK") }, // wxCURSOR_BLANK
{ true, IDC_APPSTARTING }, // wxCURSOR_ARROWWAIT
_T("invalid cursor id in wxCursor() ctor") );
const StdCursor& stdCursor = stdCursors[idCursor];
+ bool deleteLater = !stdCursor.isStd;
HCURSOR hcursor = ::LoadCursor(stdCursor.isStd ? NULL : wxGetInstance(),
stdCursor.name);
+ // IDC_HAND may not be available on some versions of Windows.
+ if ( !hcursor && idCursor == wxCURSOR_HAND)
+ {
+ hcursor = ::LoadCursor(wxGetInstance(), _T("WXCURSOR_HAND"));
+ deleteLater = true;
+ }
+
if ( !hcursor )
{
wxLogLastError(_T("LoadCursor"));
}
else
{
- m_refData = new wxCursorRefData(hcursor);
+ m_refData = new wxCursorRefData(hcursor, deleteLater);
}
}
// other wxCursor functions
// ----------------------------------------------------------------------------
-bool wxCursor::operator==(const wxCursor& cursor) const
-{
- if ( !m_refData )
- return !cursor.m_refData;
-
- return cursor.m_refData &&
- ((wxCursorRefData *)m_refData)->m_hCursor ==
- ((wxCursorRefData *)cursor.m_refData)->m_hCursor;
-}
-
wxGDIImageRefData *wxCursor::CreateData() const
{
return new wxCursorRefData;
*gs_globalCursor = cursor;
}
}
-
-
projects / wxWidgets.git / blobdiff