projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add doc for wxGraphicsContext.Create(), which is a lightweight context with no target...
[wxWidgets.git]
/
src
/
os2
/
accel.cpp
diff --git
a/src/os2/accel.cpp
b/src/os2/accel.cpp
index 34be76481503cfe9c93d0daf25e1c7500aaa367e..c65092363e75cab008d6a33557b2dc91758077f7 100644
(file)
--- a/
src/os2/accel.cpp
+++ b/
src/os2/accel.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: accel.cpp
+// Name:
src/os2/
accel.cpp
// Purpose: wxAcceleratorTable
// Author: David Webster
// Modified by:
// Purpose: wxAcceleratorTable
// Author: David Webster
// Modified by:
@@
-12,16
+12,15
@@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#include "wx/accel.h"
+
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/window.h"
-#include "wx/app.h"
-#include "wx/frame.h"
+ #include <stdio.h>
+ #include "wx/window.h"
+ #include "wx/app.h"
+ #include "wx/frame.h"
#endif
#endif
-#include "wx/os2/accel.h"
-
#include "wx/os2/private.h"
#include "wx/os2/private.h"
@@
-32,7
+31,7
@@
class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
friend class WXDLLEXPORT wxAcceleratorTable;
public:
wxAcceleratorRefData();
friend class WXDLLEXPORT wxAcceleratorTable;
public:
wxAcceleratorRefData();
- ~wxAcceleratorRefData();
+
virtual
~wxAcceleratorRefData();
inline HACCEL GetHACCEL() const { return m_hAccel; }
protected:
inline HACCEL GetHACCEL() const { return m_hAccel; }
protected:
@@
-44,7
+43,7
@@
protected:
wxAcceleratorRefData::wxAcceleratorRefData()
{
wxAcceleratorRefData::wxAcceleratorRefData()
{
- m_ok =
FALSE
;
+ m_ok =
false
;
m_hAccel = 0;
} // end of wxAcceleratorRefData::wxAcceleratorRefData
m_hAccel = 0;
} // end of wxAcceleratorRefData::wxAcceleratorRefData
@@
-76,7
+75,7
@@
wxAcceleratorTable::wxAcceleratorTable(
m_refData = new wxAcceleratorRefData;
m_refData = new wxAcceleratorRefData;
- ulId = atol(
(char*)
rResource.c_str());
+ ulId = atol(rResource.c_str());
hAccel = ::WinLoadAccelTable( vHabmain
,NULL // resources always in .exe
,(ULONG)ulId
hAccel = ::WinLoadAccelTable( vHabmain
,NULL // resources always in .exe
,(ULONG)ulId
@@
-169,10
+168,10
@@
wxAcceleratorTable::wxAcceleratorTable(
M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
} // end of wxAcceleratorTable::wxAcceleratorTable
M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
} // end of wxAcceleratorTable::wxAcceleratorTable
-bool wxAcceleratorTable::Ok() const
+bool wxAcceleratorTable::
Is
Ok() const
{
return(M_ACCELDATA && (M_ACCELDATA->m_ok));
{
return(M_ACCELDATA && (M_ACCELDATA->m_ok));
-} // end of wxAcceleratorTable::Ok
+} // end of wxAcceleratorTable::
Is
Ok
void wxAcceleratorTable::SetHACCEL(WXHACCEL hAccel)
{
void wxAcceleratorTable::SetHACCEL(WXHACCEL hAccel)
{
@@
-189,20
+188,18
@@
WXHACCEL wxAcceleratorTable::GetHACCEL() const
return (WXHACCEL) M_ACCELDATA->m_hAccel;
}
return (WXHACCEL) M_ACCELDATA->m_hAccel;
}
-bool wxAcceleratorTable::Translate(
- WXHWND hWnd
-, WXMSG* pWxmsg
-) const
+bool wxAcceleratorTable::Translate( WXHWND hWnd,
+ WXMSG* pWxmsg ) const
{
{
- PQMSG
pMsg = (PQMSG)pWxmsg;
- BOOL
rc = FALSE;
+ PQMSG pMsg = (PQMSG)pWxmsg;
+ BOOL rc = FALSE;
rc = ::WinTranslateAccel( vHabmain
,(HWND)hWnd
,GetHaccel()
,pMsg
);
rc = ::WinTranslateAccel( vHabmain
,(HWND)hWnd
,GetHaccel()
,pMsg
);
- return (Ok() && rc);
+ return (
Is
Ok() && rc);
} // end of wxAcceleratorTable::Translate
// ---------------------------------------------------------------------------
} // end of wxAcceleratorTable::Translate
// ---------------------------------------------------------------------------