projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
expose find window method
[wxWidgets.git]
/
src
/
os2
/
ownerdrw.cpp
diff --git
a/src/os2/ownerdrw.cpp
b/src/os2/ownerdrw.cpp
index 40044aae7540c4c39f5fe8b7b7916c0401f260d6..12b76cc401358476f6d1515ded7bba67f89ae953 100644
(file)
--- a/
src/os2/ownerdrw.cpp
+++ b/
src/os2/ownerdrw.cpp
@@
-28,6
+28,7
@@
#if wxUSE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
+#include "wx/settings.h"
#include "wx/ownerdrw.h"
#include "wx/menuitem.h"
#include "wx/ownerdrw.h"
#include "wx/menuitem.h"
@@
-110,7
+111,7
@@
bool wxOwnerDrawn::OnMeasureItem(
// Add space at the end of the menu for the submenu expansion arrow
// this will also allow offsetting the accel string from the right edge
//
// Add space at the end of the menu for the submenu expansion arrow
// this will also allow offsetting the accel string from the right edge
//
- *pWidth
+= GetDefaultMarginWidth() * 1.5
;
+ *pWidth
= (size_t)(*pWidth + GetDefaultMarginWidth() * 1.5)
;
//
// JACS: items still look too tightly packed, so adding 5 pixels.
//
// JACS: items still look too tightly packed, so adding 5 pixels.
@@
-302,7
+303,7
@@
bool wxOwnerDrawn::OnDrawItem(
wxString sTgt = "\t";
wxString sFullString = m_strName; // need to save the original text
wxString sAccel;
wxString sTgt = "\t";
wxString sFullString = m_strName; // need to save the original text
wxString sAccel;
-
size_t
nIndex;
+
int
nIndex;
size_t nWidth;
size_t nCharWidth;
size_t nHeight;
size_t nWidth;
size_t nCharWidth;
size_t nHeight;
@@
-335,7
+336,7
@@
bool wxOwnerDrawn::OnDrawItem(
,(long *)&nWidth
,(long *)&nHeight
);
,(long *)&nWidth
,(long *)&nHeight
);
- sTmp = sFullString[
nIndex + 1
];
+ sTmp = sFullString[
(size_t)(nIndex + 1)
];
rDC.GetTextExtent( sTmp
,(long *)&nCharWidth
,(long *)&nHeight
rDC.GetTextExtent( sTmp
,(long *)&nCharWidth
,(long *)&nHeight
@@
-463,11
+464,6
@@
bool wxOwnerDrawn::OnDrawItem(
if (eStatus & wxODSelected)
{
if (eStatus & wxODSelected)
{
- RECT vRectBmp = { rRect.x
- ,rRect.y
- ,rRect.x + GetMarginWidth() - 1
- ,rRect.y + m_nHeight - 1
- };
POINTL vPnt1 = {rRect.x + 1, rRect.y + 3}; // Leave a little background border
POINTL vPnt2 = {rRect.x + GetMarginWidth(), rRect.y + m_nHeight - 3};
POINTL vPnt1 = {rRect.x + 1, rRect.y + 3}; // Leave a little background border
POINTL vPnt2 = {rRect.x + GetMarginWidth(), rRect.y + m_nHeight - 3};