applied patch 428783 (fix B32 makefiles)

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

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 808ed0f727ffdd9329dfd2349392283c325e3a49..ae3ced7b55097d1d621bc0a20a9df681828cbad2 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -45,8 +45,8 @@
 #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
 
 // ----------------------------------------------------------------------------
@@ -60,9 +60,7 @@
 // implementation
 // ============================================================================
 
-#if !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
-#endif
 
 // ----------------------------------------------------------------------------
 // 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
-      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);
-#endif
 #else
       // In WIN16, draw a cross
       HPEN blackPen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
@@ -225,7 +221,7 @@ void wxCheckListBoxItem::Check(bool check)
         // update it
         int index = m_pParent->GetItemIndex(this);
 
-        wxASSERT_MSG( index != wxNOT_FOUND, _T("what does this item do here?") );
+        wxASSERT_MSG( index != wxNOT_FOUND, wxT("what does this item do here?") );
 
         m_nIndex = (size_t)index;
     }
@@ -238,7 +234,7 @@ void wxCheckListBoxItem::Check(bool check)
         if ( ::SendMessage(hwndListbox, LB_GETITEMRECT,
                            m_nIndex, (LPARAM)&rcUpdate) == LB_ERR )
         {
-            wxLogDebug(_T("LB_GETITEMRECT failed"));
+            wxLogDebug(wxT("LB_GETITEMRECT failed"));
         }
     #else // Win16
         // FIXME this doesn't work if the listbox is scrolled!
@@ -293,7 +289,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 void wxCheckListBox::Delete(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
-                 _T("invalid index in wxListBox::Delete") );
+                 wxT("invalid index in wxListBox::Delete") );
 
     wxListBox::Delete(N);
 
@@ -306,7 +302,7 @@ void wxCheckListBox::Delete(int N)
 void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
 {
     wxCHECK_RET( pos >= 0 && pos <= m_noItems,
-                 _T("invalid index in wxCheckListBox::InsertItems") );
+                 wxT("invalid index in wxCheckListBox::InsertItems") );
 
     wxListBox::InsertItems(nItems, items, pos);
 
@@ -314,7 +310,10 @@ void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
     for ( i = 0; i < nItems; i++ ) {
         wxOwnerDrawn *pNewItem = CreateItem((size_t)(pos + i));
         pNewItem->SetName(items[i]);
+        pNewItem->SetFont(GetFont());
+
         m_aItems.Insert(pNewItem, (size_t)(pos + i));
+
         ListBox_SetItemData((HWND)GetHWND(), i + pos, pNewItem);
     }
 }
@@ -323,9 +322,11 @@ void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
 bool wxCheckListBox::SetFont( const wxFont &font )
 {
     size_t i;
-    for (i=0; i < m_aItems.GetCount(); i++)
+    for ( i = 0; i < m_aItems.GetCount(); i++ )
         m_aItems[i]->SetFont(font);
+
     wxListBox::SetFont(font);
+
     return TRUE;
 }