projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not #include an header where a forward declaration suffixes. Do not
[wxWidgets.git]
/
src
/
os2
/
accel.cpp
diff --git
a/src/os2/accel.cpp
b/src/os2/accel.cpp
index 8e1c6f43b6e2b8863c1e7aab5f2b9a1219b891e5..662e2c63f073f34ff7c6f3c747ac95d308c68e7e 100644
(file)
--- a/
src/os2/accel.cpp
+++ b/
src/os2/accel.cpp
@@
-90,7
+90,7
@@
wxAcceleratorTable::wxAcceleratorTable(
::WinSetAccelTable( vHabmain
,hAccel
::WinSetAccelTable( vHabmain
,hAccel
- ,(HWND)pFrame->Get
HWND
()
+ ,(HWND)pFrame->Get
Frame
()
);
}
M_ACCELDATA->m_hAccel = hAccel;
);
}
M_ACCELDATA->m_hAccel = hAccel;
@@
-105,7
+105,7
@@
extern int wxCharCodeWXToOS2(
// Create from an array
wxAcceleratorTable::wxAcceleratorTable(
int n
// Create from an array
wxAcceleratorTable::wxAcceleratorTable(
int n
-,
wxAcceleratorEntry
vaEntries[]
+,
const wxAcceleratorEntry
vaEntries[]
)
{
int nAccelLength = ((sizeof(ACCEL) * n) + sizeof(ACCELTABLE));
)
{
int nAccelLength = ((sizeof(ACCEL) * n) + sizeof(ACCELTABLE));
@@
-148,7
+148,7
@@
wxAcceleratorTable::wxAcceleratorTable(
pArr->aaccel[i].key = uKey;
pArr->aaccel[i].cmd = uCmd;
}
pArr->aaccel[i].key = uKey;
pArr->aaccel[i].cmd = uCmd;
}
- pArr->codepage =
437; // default to english Fix???
+ pArr->codepage =
::WinQueryCp(wxTheApp->m_hMq);
pArr->cAccel = (USHORT)n;
M_ACCELDATA->m_hAccel = ::WinCreateAccelTable( vHabmain
,pArr
pArr->cAccel = (USHORT)n;
M_ACCELDATA->m_hAccel = ::WinCreateAccelTable( vHabmain
,pArr
@@
-162,7
+162,7
@@
wxAcceleratorTable::wxAcceleratorTable(
::WinSetAccelTable( vHabmain
,M_ACCELDATA->m_hAccel
::WinSetAccelTable( vHabmain
,M_ACCELDATA->m_hAccel
- ,(HWND)pFrame->Get
HWND
()
+ ,(HWND)pFrame->Get
Frame
()
);
}
);
}