mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-31 10:09:36 -06:00
Upgrade WX to r74856, mainly to support @2x.
This commit is contained in:
@ -2,7 +2,6 @@
|
||||
// Name: wx/gtk/menuitem.h
|
||||
// Purpose: wxMenuItem class
|
||||
// Author: Robert Roebling
|
||||
// RCS-ID: $Id: menuitem.h 67254 2011-03-20 00:14:35Z DS $
|
||||
// Copyright: (c) 1998 Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -36,14 +35,13 @@ public:
|
||||
virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
|
||||
|
||||
// implementation
|
||||
void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; }
|
||||
void SetMenuItem(GtkWidget *menuItem);
|
||||
GtkWidget *GetMenuItem() const { return m_menuItem; }
|
||||
void SetGtkLabel();
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_8
|
||||
// compatibility only, don't use in new code
|
||||
wxDEPRECATED(
|
||||
inline
|
||||
wxDEPRECATED_CONSTRUCTOR(
|
||||
wxMenuItem(wxMenu *parentMenu,
|
||||
int id,
|
||||
const wxString& text,
|
||||
|
Reference in New Issue
Block a user