added new project file having the new files

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

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index b4848d08c29c877ba03c22e6205114e62a97d0bd..a0e585cb5fe36858017d9130eb9052f48dbca429 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -9,6 +9,14 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #pragma implementation "checklst.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "checklst.h"
 #endif


@@ -22,8 +30,6 @@
 
 #if wxUSE_OWNER_DRAWN
 
 
 #if wxUSE_OWNER_DRAWN
 

-#include <windows.h>
-

 #include "wx/object.h"
 #include "wx/colour.h"
 #include "wx/font.h"
 #include "wx/object.h"
 #include "wx/colour.h"
 #include "wx/font.h"


@@ -34,14 +40,27 @@
 #include "wx/settings.h"
 #include "wx/dcmemory.h"
 #include "wx/msw/checklst.h"
 #include "wx/settings.h"
 #include "wx/dcmemory.h"
 #include "wx/msw/checklst.h"

+#include "wx/log.h"
+
+#include <windows.h>
+#include <windowsx.h>
+
+#if defined(__GNUWIN32_OLD__)
+    #include "wx/msw/gnuwin32/extra.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+// get item (converted to right type)
+#define GetItem(n)    ((wxCheckListBoxItem *)(GetItem(n)))

 
 // ============================================================================
 // 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


@@ -49,6 +68,7 @@
 
 class wxCheckListBoxItem : public wxOwnerDrawn
 {
 
 class wxCheckListBoxItem : public wxOwnerDrawn
 {

+friend class wxCheckListBox;

 public:
   // ctor
   wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex);
 public:
   // ctor
   wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex);


@@ -58,8 +78,8 @@ public:
 
   // simple accessors
   bool IsChecked() const  { return m_bChecked;        }
 
   // simple accessors
   bool IsChecked() const  { return m_bChecked;        }

-  void Check(bool bCheck) { m_bChecked = bCheck;      }
-  void Toggle();
+  void Check(bool bCheck);
+  void Toggle() { Check(!IsChecked()); }

 
 private:
   bool            m_bChecked;
 
 private:
   bool            m_bChecked;


@@ -79,7 +99,6 @@ wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)
   // know that there will always be OnMeasure before OnDraw
 
   // fix appearance
   // know that there will always be OnMeasure before OnDraw
 
   // fix appearance

-  SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT));

   SetMarginWidth(GetDefaultMarginWidth());
 }
 
   SetMarginWidth(GetDefaultMarginWidth());
 }
 


@@ -125,18 +144,20 @@ 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 = { 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);
       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));

-      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);


@@ -190,19 +211,48 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 }
 
 // change the state of the item and redraw it
 }
 
 // change the state of the item and redraw it

-void wxCheckListBoxItem::Toggle()
+void wxCheckListBoxItem::Check(bool check)

 {
 {

-  m_bChecked = !m_bChecked;
+    m_bChecked = check;
+
+    // index may be chanegd because new items were added/deleted
+    if ( m_pParent->GetItemIndex(this) != (int)m_nIndex )
+    {
+        // update it
+        int index = m_pParent->GetItemIndex(this);
+
+        wxASSERT_MSG( index != wxNOT_FOUND, wxT("what does this item do here?") );

 
 

-  size_t nHeight = m_pParent->GetItemHeight();
-  size_t y = m_nIndex * nHeight;
-  RECT rcUpdate = { 0, y, GetDefaultMarginWidth(), y + nHeight};
-  InvalidateRect((HWND)m_pParent->GetHWND(), &rcUpdate, FALSE);
+        m_nIndex = (size_t)index;
+    }

 
 

-  wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, m_pParent->GetId());
-  event.SetInt(m_nIndex);
-  event.SetEventObject(m_pParent);
-  m_pParent->ProcessCommand(event);
+    HWND hwndListbox = (HWND)m_pParent->GetHWND();
+
+    #ifdef __WIN32__
+        RECT rcUpdate;
+
+        if ( ::SendMessage(hwndListbox, LB_GETITEMRECT,
+                           m_nIndex, (LPARAM)&rcUpdate) == LB_ERR )
+        {
+            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 ;
+        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);
+    m_pParent->ProcessCommand(event);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -229,13 +279,55 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                                const wxPoint& pos, const wxSize& size,
                                int nStrings, const wxString choices[],
                                long style, const wxValidator& val,
                                const wxPoint& pos, const wxSize& size,
                                int nStrings, const wxString choices[],
                                long style, const wxValidator& val,

-                               const wxString& name) // , const wxFont& font)
-                // don't use ctor with arguments! we must call Create()
-                // ourselves from here.
+                               const wxString& name)

               : wxListBox()
               : wxListBox()

-//                , m_font(font)

 {
 {

-  Create(parent, id, pos, size, nStrings, choices, style|wxLB_OWNERDRAW, val, name);
+    Create(parent, id, pos, size, nStrings, choices,
+           style | wxLB_OWNERDRAW, val, name);
+}
+
+void wxCheckListBox::Delete(int N)
+{
+    wxCHECK_RET( N >= 0 && N < m_noItems,
+                 wxT("invalid index in wxListBox::Delete") );
+
+    wxListBox::Delete(N);
+
+    // free memory
+    delete m_aItems[N];
+
+    m_aItems.RemoveAt(N);
+}
+
+void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
+{
+    wxCHECK_RET( pos >= 0 && pos <= m_noItems,
+                 wxT("invalid index in wxCheckListBox::InsertItems") );
+
+    wxListBox::InsertItems(nItems, items, pos);
+
+    int i;
+    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
 }
 
 // create/retrieve item


@@ -245,15 +337,9 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 wxOwnerDrawn *wxCheckListBox::CreateItem(size_t nIndex)
 {
   wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex);
 wxOwnerDrawn *wxCheckListBox::CreateItem(size_t nIndex)
 {
   wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex);

-  if ( m_windowFont.Ok() )
-    pItem->SetFont(m_windowFont);
-

   return pItem;
 }
 
   return pItem;
 }
 

-// get item (converted to right type)
-#define GetItem(n)    ((wxCheckListBoxItem *)(GetItem(n)))
-

 // return item size
 // ----------------
 bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
 // return item size
 // ----------------
 bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)


@@ -294,15 +380,26 @@ void wxCheckListBox::OnChar(wxKeyEvent& event)
   if ( event.KeyCode() == WXK_SPACE )
     GetItem(GetSelection())->Toggle();
   else
   if ( event.KeyCode() == WXK_SPACE )
     GetItem(GetSelection())->Toggle();
   else

-    wxListBox::OnChar(event);
+    event.Skip();

 }
 
 void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
 {
   // clicking on the item selects it, clicking on the checkmark toggles
   if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() ) {
 }
 
 void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
 {
   // clicking on the item selects it, clicking on the checkmark toggles
   if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() ) {

-    // # better use LB_ITEMFROMPOINT perhaps?
-    size_t nItem = ((size_t)event.GetY()) / m_nItemHeight;
+    #ifdef __WIN32__
+      size_t nItem = (size_t)::SendMessage
+                               (
+                                (HWND)GetHWND(),
+                                LB_ITEMFROMPOINT,
+                                0,
+                                MAKELPARAM(event.GetX(), event.GetY())
+                               );
+    #else // Win16
+        // FIXME this doesn't work when the listbox is scrolled!
+        size_t nItem = ((size_t)event.GetY()) / m_nItemHeight;
+    #endif // Win32/16
+

     if ( nItem < (size_t)m_noItems )
       GetItem(nItem)->Toggle();
     //else: it's not an error, just click outside of client zone
     if ( nItem < (size_t)m_noItems )
       GetItem(nItem)->Toggle();
     //else: it's not an error, just click outside of client zone