Applied patch [ 652491 ] Update makefiles for mingw

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

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 5e46c81073e8c6193cf149e416fdfca4a1eff0c4..42ffa063a1097cf193fbbe4fbe667cc7611eea54 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -30,23 +30,28 @@
 
 #if wxUSE_OWNER_DRAWN
 
 
 #if wxUSE_OWNER_DRAWN
 

-#include "wx/object.h"
-#include "wx/colour.h"
-#include "wx/font.h"
-#include "wx/bitmap.h"
-#include "wx/window.h"
-#include "wx/listbox.h"
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/colour.h"
+    #include "wx/font.h"
+    #include "wx/bitmap.h"
+    #include "wx/window.h"
+    #include "wx/listbox.h"
+    #include "wx/dcmemory.h"
+
+    #include "wx/settings.h"
+
+    #include "wx/log.h"
+#endif
+

 #include "wx/ownerdrw.h"
 #include "wx/ownerdrw.h"

-#include "wx/settings.h"
-#include "wx/dcmemory.h"
-#include "wx/msw/checklst.h"
-#include "wx/log.h"
+#include "wx/checklst.h"

 
 #include <windows.h>
 #include <windowsx.h>
 
 
 #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
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -60,9 +65,7 @@
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-#if !USE_SHARED_LIBRARY
-  IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)

 
 // ----------------------------------------------------------------------------
 // declaration and implementation of wxCheckListBoxItem class
 
 // ----------------------------------------------------------------------------
 // declaration and implementation of wxCheckListBoxItem class


@@ -70,7 +73,7 @@
 
 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);


@@ -90,7 +93,7 @@ private:
 };
 
 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;


@@ -101,7 +104,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());
 }
 


@@ -147,18 +149,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);


@@ -222,7 +226,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, wxT("what does this item do here?") );

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


@@ -231,21 +235,25 @@ void wxCheckListBoxItem::Check(bool check)
 
     #ifdef __WIN32__
         RECT rcUpdate;
 
     #ifdef __WIN32__
         RECT rcUpdate;

-        
+

         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(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;
         }
     #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);
     #endif  // Win32/16
 
     InvalidateRect(hwndListbox, &rcUpdate, FALSE);

-    
+

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


@@ -259,7 +267,7 @@ void wxCheckListBoxItem::Check(bool check)
 // define event table
 // ------------------
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
 // define event table
 // ------------------
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)

-  EVT_CHAR(wxCheckListBox::OnChar)
+  EVT_KEY_DOWN(wxCheckListBox::OnKeyDown)

   EVT_LEFT_DOWN(wxCheckListBox::OnLeftClick)
 END_EVENT_TABLE()
 
   EVT_LEFT_DOWN(wxCheckListBox::OnLeftClick)
 END_EVENT_TABLE()
 


@@ -267,7 +275,7 @@ END_EVENT_TABLE()
 // ----------------
 
 // def ctor: use Create() to really create the control
 // ----------------
 
 // def ctor: use Create() to really create the control

-wxCheckListBox::wxCheckListBox() : wxListBox()
+wxCheckListBox::wxCheckListBox()

 {
 }
 
 {
 }
 


@@ -277,51 +285,53 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
                                int nStrings, const wxString choices[],
                                long style, const wxValidator& val,
                                const wxString& name)
                                int nStrings, const wxString choices[],
                                long style, const wxValidator& val,
                                const wxString& name)

-              : wxListBox()

 {
 {

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

 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" );
+                 wxT("invalid index in wxListBox::Delete") );

 
     wxListBox::Delete(N);
 
     // free memory
     delete m_aItems[N];
 
 
     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)
+bool wxCheckListBox::SetFont( const wxFont &font )

 {
 {

-    wxCHECK_RET( pos >= 0 && pos <= m_noItems,
-                 "invalid index in wxCheckListBox::InsertItems" );
+    size_t i;
+    for ( i = 0; i < m_aItems.GetCount(); i++ )
+        m_aItems[i]->SetFont(font);

 
 

-    wxListBox::InsertItems(nItems, items, pos);
+    wxListBox::SetFont(font);

 
 

-    int i;
-    for ( i = 0; i < nItems; i++ ) {
-        wxOwnerDrawn *pNewItem = CreateItem((size_t)(pos + i));
-        pNewItem->SetName(items[i]);
-        m_aItems.Insert(pNewItem, (size_t)(pos + i));
-        ListBox_SetItemData((HWND)GetHWND(), i + pos, pNewItem);
-    }
+    return TRUE;

 }
 
 // create/retrieve item
 // --------------------
 
 // create a check list box item
 }
 
 // create/retrieve 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);
 {
   wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, nIndex);

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

   return pItem;
 }
 
   return pItem;
 }
 


@@ -349,43 +359,104 @@ bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
 
 bool wxCheckListBox::IsChecked(size_t uiIndex) const
 {
 
 bool wxCheckListBox::IsChecked(size_t uiIndex) const
 {

-  return GetItem(uiIndex)->IsChecked();
+    wxCHECK_MSG( uiIndex < (size_t)GetCount(), FALSE, _T("bad wxCheckListBox index") );
+
+    return GetItem(uiIndex)->IsChecked();

 }
 
 void wxCheckListBox::Check(size_t uiIndex, bool bCheck)
 {
 }
 
 void wxCheckListBox::Check(size_t uiIndex, bool bCheck)
 {

-  GetItem(uiIndex)->Check(bCheck);
+    wxCHECK_RET( uiIndex < (size_t)GetCount(), _T("bad wxCheckListBox index") );
+
+    GetItem(uiIndex)->Check(bCheck);

 }
 
 // process events
 // --------------
 
 }
 
 // process events
 // --------------
 

-void wxCheckListBox::OnChar(wxKeyEvent& event)
+void wxCheckListBox::OnKeyDown(wxKeyEvent& event)

 {
 {

-  if ( event.KeyCode() == WXK_SPACE )
-    GetItem(GetSelection())->Toggle();
-  else
-    event.Skip();
+    // what do we do?
+    enum
+    {
+        None,
+        Toggle,
+        Set,
+        Clear
+    } oper;
+
+    switch ( event.KeyCode() )
+    {
+        case WXK_SPACE:
+            oper = Toggle;
+            break;
+
+        case WXK_NUMPAD_ADD:
+        case '+':
+            oper = Set;
+            break;
+
+        case WXK_NUMPAD_SUBTRACT:
+        case '-':
+            oper = Clear;
+            break;
+
+        default:
+            oper = None;
+    }
+
+    if ( oper != None )
+    {
+        wxArrayInt selections;
+        int count;
+        if ( HasMultipleSelection() )
+        {
+            count = GetSelections(selections);
+        }
+        else
+        {
+            count = 1;
+            selections.Add(GetSelection());
+        }
+
+        for ( int i = 0; i < count; i++ )
+        {
+            wxCheckListBoxItem *item = GetItem(selections[i]);
+            if ( !item )
+            {
+                wxFAIL_MSG( _T("no wxCheckListBoxItem?") );
+                continue;
+            }
+
+            switch ( oper )
+            {
+                case Toggle:
+                    item->Toggle();
+                    break;
+
+                case Set:
+                case Clear:
+                    item->Check( oper == Set );
+                    break;
+
+                default:
+                    wxFAIL_MSG( _T("what should this key do?") );
+            }
+        }
+    }
+    else // nothing to do
+    {
+        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() ) {

-    #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 )
+    if ( nItem != wxNOT_FOUND )

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


@@ -395,5 +466,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