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)

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

View File

@@ -219,25 +219,10 @@ wxCursor::wxCursor(const wxImage& image)
}
#endif // wxUSE_IMAGE
wxCursor::wxCursor(const char WXUNUSED(bits)[],
int WXUNUSED(width),
int WXUNUSED(height),
int WXUNUSED(hotSpotX), int WXUNUSED(hotSpotY),
const char WXUNUSED(maskBits)[])
{
}
// MicroWin doesn't have support needed for the other ctors
#ifdef __WXMICROWIN__
wxCursor::wxCursor(const wxString& WXUNUSED(filename),
wxBitmapType WXUNUSED(kind),
int WXUNUSED(hotSpotX),
int WXUNUSED(hotSpotY))
{
}
wxCursor::wxCursor(int WXUNUSED(cursor_type))
wxCursor::InitFromStock(wxStockCursor WXUNUSED(cursor_type))
{
}
@@ -280,7 +265,7 @@ wxCursor::wxCursor(const wxString& filename,
break;
default:
wxFAIL_MSG( _T("unknown cursor resource type") );
wxLogError( _T("unknown cursor resource type '%d'"), kind );
hcursor = NULL;
}
@@ -292,7 +277,7 @@ wxCursor::wxCursor(const wxString& filename,
}
// Cursors by stock number
wxCursor::wxCursor(wxStockCursor idCursor)
void wxCursor::InitFromStock(wxStockCursor idCursor)
{
// all wxWidgets standard cursors
static const struct StdCursor