mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-30 09:39:46 -06:00
Upgrade WX to r74856, mainly to support @2x.
This commit is contained in:
13
Externals/wxWidgets3/include/wx/osx/menu.h
vendored
13
Externals/wxWidgets3/include/wx/osx/menu.h
vendored
@ -4,7 +4,6 @@
|
||||
// Author: Stefan Csomor
|
||||
// Modified by:
|
||||
// Created: 1998-01-01
|
||||
// RCS-ID: $Id: menu.h 70350 2012-01-15 13:41:17Z VZ $
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -33,8 +32,6 @@ public:
|
||||
|
||||
virtual ~wxMenu();
|
||||
|
||||
virtual void Attach(wxMenuBarBase *menubar) ;
|
||||
|
||||
virtual void Break();
|
||||
|
||||
virtual void SetTitle(const wxString& title);
|
||||
@ -77,17 +74,14 @@ private:
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
||||
// common part of Append/Insert (behaves as Append is pos == (size_t)-1)
|
||||
// common part of Do{Append,Insert}(): behaves as Append if pos == -1
|
||||
bool DoInsertOrAppend(wxMenuItem *item, size_t pos = (size_t)-1);
|
||||
|
||||
// terminate the current radio group, if any
|
||||
void EndRadioGroup();
|
||||
|
||||
// Common part of HandleMenu{Opened,Closed}().
|
||||
void DoHandleMenuOpenedOrClosed(wxEventType evtType);
|
||||
|
||||
|
||||
// if TRUE, insert a breal before appending the next item
|
||||
// if TRUE, insert a break before appending the next item
|
||||
bool m_doBreak;
|
||||
|
||||
// in this menu rearranging of menu items (esp hiding) is allowed
|
||||
@ -96,9 +90,6 @@ private:
|
||||
// don't trigger native events
|
||||
bool m_noEventsMode;
|
||||
|
||||
// the position of the first item in the current radio group or -1
|
||||
int m_startRadioGroup;
|
||||
|
||||
wxMenuImpl* m_peer;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxMenu)
|
||||
|
Reference in New Issue
Block a user