projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Committing in .
[wxWidgets.git]
/
src
/
msw
/
checklst.cpp
diff --git
a/src/msw/checklst.cpp
b/src/msw/checklst.cpp
index c15c16e0d17de9083a4029dca2908451bccb257f..a0e585cb5fe36858017d9130eb9052f48dbca429 100644
(file)
--- a/
src/msw/checklst.cpp
+++ b/
src/msw/checklst.cpp
@@
-45,8
+45,8
@@
#include <windows.h>
#include <windowsx.h>
#include <windows.h>
#include <windowsx.h>
-#if defined(__GNUWIN32_
_) && !defined(wxUSE_NORLANDER_HEADERS
)
-#include "wx/msw/gnuwin32/extra.h"
+#if defined(__GNUWIN32_
OLD__
)
+
#include "wx/msw/gnuwin32/extra.h"
#endif
// ----------------------------------------------------------------------------
#endif
// ----------------------------------------------------------------------------
@@
-60,9
+60,7
@@
// implementation
// ============================================================================
// implementation
// ============================================================================
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
-#endif
// ----------------------------------------------------------------------------
// declaration and implementation of wxCheckListBoxItem class
// ----------------------------------------------------------------------------
// declaration and implementation of wxCheckListBoxItem class
@@
-146,16
+144,14
@@
bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck);
// then draw a check mark into it
HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck);
// then draw a check mark into it
- RECT rect ;
- rect.left = 0 ;
- rect.top = 0 ;
- rect.right = nCheckWidth ;
- rect.bottom = nCheckHeight ;
-
-#ifdef __WIN32__
-#ifndef __SC__
+#if defined(__WIN32__) && !defined(__SC__)
+ RECT rect;
+ rect.left = 0;
+ rect.top = 0;
+ rect.right = nCheckWidth;
+ rect.bottom = nCheckHeight;
+
DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
-#endif
#else
// In WIN16, draw a cross
HPEN blackPen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
#else
// In WIN16, draw a cross
HPEN blackPen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
@@
-300,7
+296,7
@@
void wxCheckListBox::Delete(int N)
// free memory
delete m_aItems[N];
// free memory
delete m_aItems[N];
- m_aItems.Remove(N);
+ m_aItems.Remove
At
(N);
}
void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
}
void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)