Applied some of patch [ 688466 ] MSVC7 build & bug fixes

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

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 5aa72dd1e4196b5d723af61420746e4ef1f5ec7f..2a7e01108ecfb17e593f35a32ef3cfbca1b7ca6f 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -6,7 +6,7 @@
 // Created:     16.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     16.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -73,7 +73,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 
 class wxCheckListBoxItem : public wxOwnerDrawn
 {
 
 class wxCheckListBoxItem : public wxOwnerDrawn
 {

-friend class wxCheckListBox;
+friend class WXDLLEXPORT wxCheckListBox;

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


@@ -81,19 +81,24 @@ public:
   // drawing functions
   virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
 
   // drawing functions
   virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
 

-  // simple accessors
-  bool IsChecked() const  { return m_bChecked;        }
+  // simple accessors and operations
+  bool IsChecked() const { return m_bChecked; }
+

   void Check(bool bCheck);
   void Toggle() { Check(!IsChecked()); }
 
   void Check(bool bCheck);
   void Toggle() { Check(!IsChecked()); }
 

+  void SendEvent();
+

 private:
 private:

+
+    DECLARE_NO_COPY_CLASS(wxCheckListBoxItem)

   bool            m_bChecked;
   wxCheckListBox *m_pParent;
   bool            m_bChecked;
   wxCheckListBox *m_pParent;

-  size_t            m_nIndex;
+  size_t          m_nIndex;

 };
 
 wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)
 };
 
 wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)

-                  : wxOwnerDrawn("", TRUE)   // checkable
+                  : wxOwnerDrawn(wxEmptyString, TRUE)   // checkable

 {
   m_bChecked = FALSE;
   m_pParent  = pParent;
 {
   m_bChecked = FALSE;
   m_pParent  = pParent;


@@ -220,7 +225,7 @@ void wxCheckListBoxItem::Check(bool check)
 {
     m_bChecked = check;
 
 {
     m_bChecked = check;
 

-    // index may be chanegd because new items were added/deleted
+    // index may be changed because new items were added/deleted

     if ( m_pParent->GetItemIndex(this) != (int)m_nIndex )
     {
         // update it
     if ( m_pParent->GetItemIndex(this) != (int)m_nIndex )
     {
         // update it


@@ -253,7 +258,11 @@ void wxCheckListBoxItem::Check(bool check)
     #endif  // Win32/16
 
     InvalidateRect(hwndListbox, &rcUpdate, FALSE);
     #endif  // Win32/16
 
     InvalidateRect(hwndListbox, &rcUpdate, FALSE);

+}

 
 

+// send an "item checked" event
+void wxCheckListBoxItem::SendEvent()
+{

     wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, m_pParent->GetId());
     event.SetInt(m_nIndex);
     event.SetEventObject(m_pParent);
     wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, m_pParent->GetId());
     event.SetInt(m_nIndex);
     event.SetEventObject(m_pParent);


@@ -286,10 +295,22 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                                long style, const wxValidator& val,
                                const wxString& name)
 {
                                long style, const wxValidator& val,
                                const wxString& name)
 {

-    Create(parent, id, pos, size, nStrings, choices,
-           style | wxLB_OWNERDRAW, val, name);
+    Create(parent, id, pos, size, nStrings, choices, style, val, name);

 }
 
 }
 

+bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
+                            const wxPoint& pos, const wxSize& size,
+                            int n, const wxString choices[],
+                            long style,
+                            const wxValidator& validator, const wxString& name)
+{
+    return wxListBox::Create(parent, id, pos, size, n, choices,
+                             style | wxLB_OWNERDRAW, validator, name);
+}
+
+// misc overloaded methods
+// -----------------------
+

 void wxCheckListBox::Delete(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 void wxCheckListBox::Delete(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,


@@ -318,7 +339,7 @@ bool wxCheckListBox::SetFont( const wxFont &font )
 // --------------------
 
 // create a check list box item
 // --------------------
 
 // create a check list box item

-wxOwnerDrawn *wxCheckListBox::CreateItem(size_t nIndex)
+wxOwnerDrawn *wxCheckListBox::CreateLboxItem(size_t nIndex)

 {
   wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex);
   return pItem;
 {
   wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex);
   return pItem;


@@ -374,7 +395,7 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event)
         Clear
     } oper;
 
         Clear
     } oper;
 

-    switch ( event.KeyCode() )
+    switch ( event.GetKeyCode() )

     {
         case WXK_SPACE:
             oper = Toggle;
     {
         case WXK_SPACE:
             oper = Toggle;


@@ -397,15 +418,19 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event)
     if ( oper != None )
     {
         wxArrayInt selections;
     if ( oper != None )
     {
         wxArrayInt selections;

-        int count;
+        int count = 0;

         if ( HasMultipleSelection() )
         {
             count = GetSelections(selections);
         }
         else
         {
         if ( HasMultipleSelection() )
         {
             count = GetSelections(selections);
         }
         else
         {

-            count = 1;
-            selections.Add(GetSelection());
+            int sel = GetSelection();
+            if (sel != -1)
+            {
+                count = 1;
+                selections.Add(sel);
+            }

         }
 
         for ( int i = 0; i < count; i++ )
         }
 
         for ( int i = 0; i < count; i++ )


@@ -431,6 +456,10 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event)
                 default:
                     wxFAIL_MSG( _T("what should this key do?") );
             }
                 default:
                     wxFAIL_MSG( _T("what should this key do?") );
             }

+
+            // we should send an event as this has been done by the user and
+            // not by the program
+            item->SendEvent();

         }
     }
     else // nothing to do
         }
     }
     else // nothing to do


@@ -443,21 +472,13 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
 {
   // clicking on the item selects it, clicking on the checkmark toggles
   if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() ) {
 {
   // clicking on the item selects it, clicking on the checkmark toggles
   if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() ) {

-    #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
+    int nItem = HitTest(event.GetX(), event.GetY());

 
 

-    if ( nItem < (size_t)m_noItems )
-      GetItem(nItem)->Toggle();
+    if ( nItem != wxNOT_FOUND ) {
+      wxCheckListBoxItem *item = GetItem(nItem);
+      item->Toggle();
+      item->SendEvent();
+    }

     //else: it's not an error, just click outside of client zone
   }
   else {
     //else: it's not an error, just click outside of client zone
   }
   else {


@@ -466,5 +487,23 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
   }
 }
 
   }
 }
 

+int wxCheckListBox::DoHitTestItem(wxCoord x, wxCoord y) const
+{
+  #ifdef __WIN32__
+    int nItem = (int)::SendMessage
+                             (
+                              (HWND)GetHWND(),
+                              LB_ITEMFROMPOINT,
+                              0,
+                              MAKELPARAM(x, y)
+                             );
+  #else // Win16
+    // FIXME this doesn't work when the listbox is scrolled!
+    int nItem = y / m_nItemHeight;
+  #endif // Win32/16
+
+  return nItem >= m_noItems ? wxNOT_FOUND : nItem;
+}
+

 #endif
 
 #endif