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

@ -3,7 +3,6 @@
// Purpose: classes allowing to wrap a native window handle
// Author: Vadim Zeitlin
// Created: 2008-03-05
// RCS-ID: $Id: nativewin.h 62783 2009-12-05 17:31:07Z VZ $
// Copyright: (c) 2008 Vadim Zeitlin <vadim@wxwindows.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -39,9 +38,12 @@
typedef HWND wxNativeContainerWindowId;
typedef HWND wxNativeContainerWindowHandle;
#elif defined(__WXGTK__)
#include <gdk/gdk.h>
typedef GdkNativeWindow wxNativeContainerWindowId;
// GdkNativeWindow is guint32 under GDK/X11 and gpointer under GDK/WIN32
#ifdef __UNIX__
typedef unsigned long wxNativeContainerWindowId;
#else
typedef void *wxNativeContainerWindowId;
#endif
typedef GdkWindow *wxNativeContainerWindowHandle;
#else
// no support for using native windows under this platform yet