removed Win16 code (patch 905241), last version with remains of Win16 support tagged with BEFORE_WIN16_REMOVAL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -59,10 +59,7 @@ wxAcceleratorRefData::~wxAcceleratorRefData()
|
||||
{
|
||||
if (m_hAccel)
|
||||
{
|
||||
// This function not available in WIN16
|
||||
#if !defined(__WIN16__)
|
||||
DestroyAcceleratorTable((HACCEL) m_hAccel);
|
||||
#endif
|
||||
}
|
||||
m_hAccel = 0 ;
|
||||
}
|
||||
@@ -98,10 +95,8 @@ wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
|
||||
extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
|
||||
|
||||
// Create from an array
|
||||
#if !defined(__WIN16__)
|
||||
wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
|
||||
{
|
||||
// Not available in WIN16
|
||||
m_refData = new wxAcceleratorRefData;
|
||||
|
||||
ACCEL* arr = new ACCEL[n];
|
||||
@@ -133,14 +128,6 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
|
||||
|
||||
M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
|
||||
}
|
||||
#else // Win16
|
||||
wxAcceleratorTable::wxAcceleratorTable(int WXUNUSED(n), const wxAcceleratorEntry WXUNUSED(entries)[])
|
||||
{
|
||||
// No, we simply gracefully degrade; we don't expect the
|
||||
// developer to pepper their code with #ifdefs just for this.
|
||||
// wxFAIL_MSG("not implemented");
|
||||
}
|
||||
#endif // Win32/16
|
||||
|
||||
bool wxAcceleratorTable::Ok() const
|
||||
{
|
||||
|
Reference in New Issue
Block a user