projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added version info hidden dialog
[wxWidgets.git]
/
src
/
msw
/
ownerdrw.cpp
diff --git
a/src/msw/ownerdrw.cpp
b/src/msw/ownerdrw.cpp
index d60bc8c408344dfcdf12d5f4957802dacbd2482c..8ea7c54e0f0fd5805a91dd95932abed06398aaa6 100644
(file)
--- a/
src/msw/ownerdrw.cpp
+++ b/
src/msw/ownerdrw.cpp
@@
-15,6
+15,7
@@
// 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/msw/private.h"
#ifdef __BORLANDC__
#pragma hdrstop
#ifdef __BORLANDC__
#pragma hdrstop
@@
-22,7
+23,7
@@
#ifndef WX_PRECOMP
#include "wx/window.h"
#ifndef WX_PRECOMP
#include "wx/window.h"
- #include "wx/msw/private.h"
+
//
#include "wx/msw/private.h"
#include "wx/font.h"
#include "wx/bitmap.h"
#include "wx/dcmemory.h"
#include "wx/font.h"
#include "wx/bitmap.h"
#include "wx/dcmemory.h"
@@
-33,6
+34,8
@@
#include "wx/ownerdrw.h"
#include "wx/menuitem.h"
#include "wx/ownerdrw.h"
#include "wx/menuitem.h"
+#if wxUSE_OWNER_DRAWN
+
// ============================================================================
// implementation of wxOwnerDrawn class
// ============================================================================
// implementation of wxOwnerDrawn class
@@
-74,7
+77,7
@@
bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
delete [] szStripped;
// # without this menu items look too tightly packed (at least under Windows)
delete [] szStripped;
// # without this menu items look too tightly packed (at least under Windows)
- str +=
_
T('W'); // 'W' is typically the widest letter
+ str +=
wx
T('W'); // 'W' is typically the widest letter
dc.GetTextExtent(str, (long *)pwidth, (long *)pheight);
dc.GetTextExtent(str, (long *)pwidth, (long *)pheight);
@@
-140,12
+143,14
@@
bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
// using native API because it reckognizes '&'
#ifdef O_DRAW_NATIVE_API
int nPrevMode = SetBkMode(hdc, TRANSPARENT);
// using native API because it reckognizes '&'
#ifdef O_DRAW_NATIVE_API
int nPrevMode = SetBkMode(hdc, TRANSPARENT);
- HBRUSH
hbr = CreateSolidBrush(colBack),
-
hPrevBrush = (HBRUSH)
SelectObject(hdc, hbr);
+ HBRUSH hbr = CreateSolidBrush(colBack),
+
hPrevBrush = (HBRUSH)
SelectObject(hdc, hbr);
RECT rectAll = { rc.GetLeft(), rc.GetTop(), rc.GetRight(), rc.GetBottom() };
FillRect(hdc, &rectAll, hbr);
RECT rectAll = { rc.GetLeft(), rc.GetTop(), rc.GetRight(), rc.GetBottom() };
FillRect(hdc, &rectAll, hbr);
+ DeleteObject(hbr);
+
// use default font if no font set
HFONT hfont;
if ( m_font.Ok() ) {
// use default font if no font set
HFONT hfont;
if ( m_font.Ok() ) {
@@
-186,14
+191,19
@@
bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
// then draw a check mark into it
RECT rect = { 0, 0, GetMarginWidth(), m_nHeight };
// then draw a check mark into it
RECT rect = { 0, 0, GetMarginWidth(), m_nHeight };
+ if ( m_nHeight > 0 )
+ {
#ifndef __SC__
#ifndef __SC__
- DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
+
DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
#endif
#endif
+ }
// finally copy it to screen DC and clean up
BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight,
hdcMem, 0, 0, SRCCOPY);
// finally copy it to screen DC and clean up
BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight,
hdcMem, 0, 0, SRCCOPY);
+
DeleteDC(hdcMem);
DeleteDC(hdcMem);
+ DeleteObject(hbmpCheck);
#else
// #### to do: perhaps using Marlett font (create equiv. font under X)
// wxFAIL("not implemented");
#else
// #### to do: perhaps using Marlett font (create equiv. font under X)
// wxFAIL("not implemented");
@@
-214,10
+224,11
@@
bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
// there should be enough place!
wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight()));
// there should be enough place!
wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight()));
+ //MT: blit with mask enabled.
dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2,
rc.y + (m_nHeight - nBmpHeight) /2,
nBmpWidth, nBmpHeight,
dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2,
rc.y + (m_nHeight - nBmpHeight) /2,
nBmpWidth, nBmpHeight,
- &dcMem, 0, 0, wxCOPY);
+ &dcMem, 0, 0, wxCOPY
, TRUE
);
if ( st & wxODSelected ) {
#ifdef O_DRAW_NATIVE_API
if ( st & wxODSelected ) {
#ifdef O_DRAW_NATIVE_API
@@
-243,3
+254,6
@@
bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
return TRUE;
}
return TRUE;
}
+
+#endif // wxUSE_OWNER_DRAWN
+