Tries to fix wxListBox focus problems.

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

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 5e46c81073e8c6193cf149e416fdfca4a1eff0c4..a0e585cb5fe36858017d9130eb9052f48dbca429 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -45,8 +45,8 @@
 #include <windows.h>
 #include <windowsx.h>
 
-#ifdef __GNUWIN32__
-#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
@@ -101,7 +99,6 @@ wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)
   // know that there will always be OnMeasure before OnDraw
 
   // fix appearance
-  SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT));
   SetMarginWidth(GetDefaultMarginWidth());
 }
 
@@ -147,18 +144,20 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
       HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck);
 
       // then draw a check mark into it
-      RECT rect = { 0, 0, nCheckWidth, nCheckHeight };
+#if defined(__WIN32__) && !defined(__SC__)
+      RECT rect;
+      rect.left   = 0;
+      rect.top    = 0;
+      rect.right  = nCheckWidth;
+      rect.bottom = nCheckHeight;
 
-#ifdef __WIN32__
-#ifndef __SC__
       DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
-#endif
 #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);
@@ -222,7 +221,7 @@ void wxCheckListBoxItem::Check(bool check)
         // update it
         int index = m_pParent->GetItemIndex(this);
 
-        wxASSERT_MSG( index != wxNOT_FOUND, "what does this item do here?" );
+        wxASSERT_MSG( index != wxNOT_FOUND, wxT("what does this item do here?") );
 
         m_nIndex = (size_t)index;
     }
@@ -231,21 +230,25 @@ void wxCheckListBoxItem::Check(bool check)
 
     #ifdef __WIN32__
         RECT rcUpdate;
-        
+
         if ( ::SendMessage(hwndListbox, LB_GETITEMRECT,
                            m_nIndex, (LPARAM)&rcUpdate) == LB_ERR )
         {
-            wxLogDebug("LB_GETITEMRECT failed");
+            wxLogDebug(wxT("LB_GETITEMRECT failed"));
         }
     #else // Win16
         // FIXME this doesn't work if the listbox is scrolled!
         size_t nHeight = m_pParent->GetItemHeight();
         size_t y = m_nIndex * nHeight;
-        RECT rcUpdate = { 0, y, GetDefaultMarginWidth(), y + nHeight};
+        RECT rcUpdate ;
+        rcUpdate.left   = 0 ;
+        rcUpdate.top    = y ;
+        rcUpdate.right  = GetDefaultMarginWidth() ;
+        rcUpdate.bottom = y + nHeight ;
     #endif  // Win32/16
 
     InvalidateRect(hwndListbox, &rcUpdate, FALSE);
-    
+
     wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, m_pParent->GetId());
     event.SetInt(m_nIndex);
     event.SetEventObject(m_pParent);
@@ -286,20 +289,20 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 void wxCheckListBox::Delete(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
-                 "invalid index in wxListBox::Delete" );
+                 wxT("invalid index in wxListBox::Delete") );
 
     wxListBox::Delete(N);
 
     // free memory
     delete m_aItems[N];
 
-    m_aItems.Remove(N);
+    m_aItems.RemoveAt(N);
 }
 
 void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
 {
     wxCHECK_RET( pos >= 0 && pos <= m_noItems,
-                 "invalid index in wxCheckListBox::InsertItems" );
+                 wxT("invalid index in wxCheckListBox::InsertItems") );
 
     wxListBox::InsertItems(nItems, items, pos);
 
@@ -307,11 +310,26 @@ 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);
     }
 }
 
+
+bool wxCheckListBox::SetFont( const wxFont &font )
+{
+    size_t i;
+    for ( i = 0; i < m_aItems.GetCount(); i++ )
+        m_aItems[i]->SetFont(font);
+
+    wxListBox::SetFont(font);
+
+    return TRUE;
+}
+
 // create/retrieve item
 // --------------------
 
@@ -319,9 +337,6 @@ void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
 wxOwnerDrawn *wxCheckListBox::CreateItem(size_t nIndex)
 {
   wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex);
-  if ( m_font.Ok() )
-    pItem->SetFont(m_font);
-
   return pItem;
 }