piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-01 02:29:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

17
Externals/wxWidgets3/include/wx/osx/taskbarosx.h vendored
View File

@ -4,7 +4,6 @@
// Author: Ryan Norton
// Modified by:
// Created: 04/04/2003
// RCS-ID: $Id: taskbarosx.h 67084 2011-02-28 10:12:06Z SC $
// Copyright: (c) Ryan Norton, 2003
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////
@ -19,21 +18,7 @@ class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
{
DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
public:
// type of taskbar item to create (currently only DOCK is implemented)
enum wxTaskBarIconType
{
DOCK
#if wxOSX_USE_COCOA
, CUSTOM_STATUSITEM
#endif
#if wxOSX_USE_COCOA
, DEFAULT_TYPE = CUSTOM_STATUSITEM
#else
, DEFAULT_TYPE = DOCK
#endif
};
wxTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE);
wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);
virtual ~wxTaskBarIcon();
// returns true if the taskbaricon is in the global menubar