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

provide backward-compat wxCursor(int) ctor; remove empty stubs of XBM ctor from all ports except gtk,motif; make all ports emit wxLogError on invalid bitmap types; implement wxCursor(const wxString&, ...) ctor on GTK (not tested yet)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-09-25 17:56:07 +00:00
parent 5a8009d2f1
commit 0ef5b1dad1
23 changed files with 216 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/os2/cursor.cpp
View File

@@ -53,15 +53,6 @@ wxCursor::wxCursor(void)
{
}
wxCursor::wxCursor(const char WXUNUSED(bits)[],
int WXUNUSED(width),
int WXUNUSED(height),
int WXUNUSED(hotSpotX),
int WXUNUSED(hotSpotY),
const char WXUNUSED(maskBits)[])
{
}
wxCursor::wxCursor(const wxImage& rImage)
{
wxImage vImage32 = rImage.Scale(32,32);
@@ -94,7 +85,7 @@ wxCursor::wxCursor(const wxImage& rImage)
} // end of wxCursor::wxCursor
wxCursor::wxCursor( const wxString& WXUNUSED(rsCursorFile),
long lFlags,
wxBitmapType type,
int WXUNUSED(nHotSpotX),
int WXUNUSED(nHotSpotY) )
{
@@ -103,17 +94,19 @@ wxCursor::wxCursor( const wxString& WXUNUSED(rsCursorFile),
pRefData = new wxCursorRefData;
m_refData = pRefData;
pRefData->m_bDestroyCursor = false;
if (lFlags == wxBITMAP_TYPE_CUR_RESOURCE)
if (type == wxBITMAP_TYPE_CUR_RESOURCE)
{
pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP
,0
,(ULONG)lFlags // if OS/2 this should be the resource Id
,(ULONG)type // if OS/2 this should be the resource Id
);
}
else
wxLogError("Invalid cursor bitmap type '%d'", type);
} // end of wxCursor::wxCursor
// Cursors by stock number
wxCursor::wxCursor(wxStockCursor nCursorType)
void wxCursor::InitFromStock(wxStockCursor nCursorType)
{
wxCursorRefData* pRefData = new wxCursorRefData;