Upgrade WX to r74856, mainly to support @2x.

This commit is contained in:
comex
2013-09-22 18:44:55 -04:00
parent 0bdef3932f
commit 66ed9a1804
1935 changed files with 45373 additions and 22739 deletions

View File

@ -4,7 +4,6 @@
// Author: David Elliott
// Modified by:
// Created: 2003/07/19
// RCS-ID: $Id: bitmap.h 59526 2009-03-14 13:57:51Z FM $
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -64,7 +63,8 @@ protected:
// wxBitmap
// ========================================================================
class WXDLLIMPEXP_CORE wxBitmap: public wxGDIObject
class WXDLLIMPEXP_CORE wxBitmap: public wxGDIObject,
public wxBitmapHelpers
{
// ------------------------------------------------------------------------
// initialization