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:
@ -3,7 +3,6 @@
|
||||
// Purpose: NSDate-related helpers
|
||||
// Author: Vadim Zeitlin
|
||||
// Created: 2011-12-19
|
||||
// RCS-ID: $Id: date.h 70070 2011-12-20 21:27:09Z VZ $
|
||||
// Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -3,7 +3,6 @@
|
||||
// Purpose: Class to convert markup to Cocoa attributed strings.
|
||||
// Author: Vadim Zeitlin
|
||||
// Created: 2011-02-22
|
||||
// RCS-ID: $Id: markuptoattr.h 67069 2011-02-27 12:48:46Z VZ $
|
||||
// Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -4,7 +4,6 @@
|
||||
// Author: Stefan Csomor
|
||||
// Modified by:
|
||||
// Created: 2006-10-20
|
||||
// RCS-ID: $Id: overlay.h 67232 2011-03-18 15:10:15Z DS $
|
||||
// Copyright: (c) wxWidgets team
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -4,7 +4,6 @@
|
||||
// Author: Stefan Csomor
|
||||
// Modified by:
|
||||
// Created: 03/02/99
|
||||
// RCS-ID: $Id: textimpl.h 70354 2012-01-15 15:53:56Z SC $
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -45,6 +44,10 @@ public :
|
||||
virtual bool SetHint(const wxString& hint);
|
||||
|
||||
virtual void controlAction(WXWidget slf, void* _cmd, void *sender);
|
||||
virtual bool becomeFirstResponder(WXWidget slf, void *_cmd);
|
||||
virtual bool resignFirstResponder(WXWidget slf, void *_cmd);
|
||||
|
||||
virtual void SetInternalSelection( long from , long to );
|
||||
|
||||
protected :
|
||||
NSTextField* m_textField;
|
||||
@ -111,6 +114,10 @@ public :
|
||||
virtual void Popup();
|
||||
virtual void Dismiss();
|
||||
|
||||
virtual void SetEditable(bool editable);
|
||||
|
||||
virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd);
|
||||
|
||||
private:
|
||||
NSComboBox* m_comboBox;
|
||||
};
|
||||
|
Reference in New Issue
Block a user