mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-29 17:19:44 -06:00
wxWidgets3: update to svn r70933
This commit is contained in:
@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 28.10.99
|
||||
// RCS-ID: $Id: spinctrl.h 67254 2011-03-20 00:14:35Z DS $
|
||||
// RCS-ID: $Id: spinctrl.h 68366 2011-07-24 22:19:33Z VZ $
|
||||
// Copyright: (c) Vadim Zeitlin
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -33,7 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxSpinCtrlButton;
|
||||
// wxSpinCtrl is a combination of wxTextCtrl and wxSpinButton
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLIMPEXP_CORE wxSpinCtrl : public wxControl
|
||||
class WXDLLIMPEXP_CORE wxSpinCtrl : public wxNavigationEnabled<wxControl>
|
||||
{
|
||||
public:
|
||||
wxSpinCtrl() { Init(); }
|
||||
@ -93,8 +93,6 @@ public:
|
||||
// number is out of range
|
||||
bool GetTextValue(int *val) const;
|
||||
|
||||
WX_DECLARE_CONTROL_CONTAINER();
|
||||
|
||||
protected:
|
||||
// override the base class virtuals involved into geometry calculations
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
@ -113,7 +111,6 @@ private:
|
||||
|
||||
int m_oldValue;
|
||||
private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user