wxPaintDC -> wxDC in wxListCtrl; fixed compile problems in wxTreeCtrl (return
types in wxCHECK_MSG); compiles again for 16-bit Windows, though dialogs don't work; added generic notebook implementation (copied from wxMotif); fixed event handler arg in wxDirDialog; added preliminary wxImage reference; removed some constructors from documentation; fixed wxIniConfig compilation git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -61,7 +61,10 @@ wxAcceleratorRefData::~wxAcceleratorRefData()
|
||||
{
|
||||
if (m_hAccel)
|
||||
{
|
||||
// This function not available in WIN16
|
||||
#ifndef __WIN16__
|
||||
DestroyAcceleratorTable((HACCEL) m_hAccel);
|
||||
#endif
|
||||
}
|
||||
m_hAccel = 0 ;
|
||||
}
|
||||
@@ -99,6 +102,8 @@ extern int wxCharCodeWXToMSW(int id, bool *isVirtual);
|
||||
// Create from an array
|
||||
wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])
|
||||
{
|
||||
// Not available in WIN16
|
||||
#ifndef __WIN16__
|
||||
m_refData = new wxAcceleratorRefData;
|
||||
|
||||
ACCEL* arr = new ACCEL[n];
|
||||
@@ -128,6 +133,7 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
|
||||
delete[] arr;
|
||||
|
||||
M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
|
||||
#endif
|
||||
}
|
||||
|
||||
bool wxAcceleratorTable::Ok(void) const
|
||||
|
Reference in New Issue
Block a user