Added test for wxUSE_STATLINE in statline.cpp

[wxWidgets.git] / src / msw / checklst.cpp

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index d0b312fb846153680c2f7e3bcdc4537bdbe5be4b..f9de4075a89e918b968566a452d232a911174c03 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -155,9 +155,9 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 #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));

-      HPEN whiteBrush = GetStockObject(WHITE_BRUSH);
-      HPEN hPenOld = ::SelectObject(hdcMem, blackPen);
-      HPEN hBrushOld = ::SelectObject(hdcMem, whiteBrush);
+      HPEN whiteBrush = (HPEN)GetStockObject(WHITE_BRUSH);
+      HPEN hPenOld = (HPEN)::SelectObject(hdcMem, blackPen);
+      HPEN hBrushOld = (HPEN)::SelectObject(hdcMem, whiteBrush);

       ::SetROP2(hdcMem, R2_COPYPEN);
       Rectangle(hdcMem, 0, 0, nCheckWidth, nCheckHeight);
       MoveTo(hdcMem, 0, 0);
       ::SetROP2(hdcMem, R2_COPYPEN);
       Rectangle(hdcMem, 0, 0, nCheckWidth, nCheckHeight);
       MoveTo(hdcMem, 0, 0);


@@ -221,7 +221,7 @@ void wxCheckListBoxItem::Check(bool check)
         // update it
         int index = m_pParent->GetItemIndex(this);
 
         // update it
         int index = m_pParent->GetItemIndex(this);
 

-        wxASSERT_MSG( index != wxNOT_FOUND, "what does this item do here?" );
+        wxASSERT_MSG( index != wxNOT_FOUND, _T("what does this item do here?") );

 
         m_nIndex = (size_t)index;
     }
 
         m_nIndex = (size_t)index;
     }


@@ -234,7 +234,7 @@ void wxCheckListBoxItem::Check(bool check)
         if ( ::SendMessage(hwndListbox, LB_GETITEMRECT,
                            m_nIndex, (LPARAM)&rcUpdate) == LB_ERR )
         {
         if ( ::SendMessage(hwndListbox, LB_GETITEMRECT,
                            m_nIndex, (LPARAM)&rcUpdate) == LB_ERR )
         {

-            wxLogDebug("LB_GETITEMRECT failed");
+            wxLogDebug(_T("LB_GETITEMRECT failed"));

         }
     #else // Win16
         // FIXME this doesn't work if the listbox is scrolled!
         }
     #else // Win16
         // FIXME this doesn't work if the listbox is scrolled!


@@ -285,7 +285,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 void wxCheckListBox::Delete(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 void wxCheckListBox::Delete(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,

-                 "invalid index in wxListBox::Delete" );
+                 _T("invalid index in wxListBox::Delete") );

 
     wxListBox::Delete(N);
 
 
     wxListBox::Delete(N);
 


@@ -298,7 +298,7 @@ void wxCheckListBox::Delete(int N)
 void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
 {
     wxCHECK_RET( pos >= 0 && pos <= m_noItems,
 void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
 {
     wxCHECK_RET( pos >= 0 && pos <= m_noItems,

-                 "invalid index in wxCheckListBox::InsertItems" );
+                 _T("invalid index in wxCheckListBox::InsertItems") );

 
     wxListBox::InsertItems(nItems, items, pos);
 
 
     wxListBox::InsertItems(nItems, items, pos);