applied patch for compilation with gcc 3.0

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

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index a04d7689aa54ee103c93fda57c6b76ee42728010..808a4b4f7fbe45b1b260740867aa7c45112b1335 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -2,7 +2,7 @@
 // Name:        msw/checklst.cpp
 // Purpose:     implementation of wxCheckListBox class
 // Author:      Vadim Zeitlin
 // Name:        msw/checklst.cpp
 // Purpose:     implementation of wxCheckListBox class
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

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


@@ -10,9 +10,13 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================

-// headers & declarations
+// declarations

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

+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

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


@@ -24,18 +28,39 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include <windows.h>
+#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"

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

+#include "wx/settings.h"
+#include "wx/dcmemory.h"

 #include "wx/msw/checklst.h"
 #include "wx/msw/checklst.h"

+#include "wx/log.h"
+
+#include <windows.h>
+#include <windowsx.h>
+
+#ifdef __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


@@ -43,25 +68,26 @@
 
 class wxCheckListBoxItem : public wxOwnerDrawn
 {
 
 class wxCheckListBoxItem : public wxOwnerDrawn
 {

+friend class wxCheckListBox;

 public:
   // ctor
 public:
   // ctor

-  wxCheckListBoxItem(wxCheckListBox *pParent, uint nIndex);
+  wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex);

 
   // drawing functions
   virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
 
   // simple accessors
   bool IsChecked() const  { return m_bChecked;        }
 
   // drawing functions
   virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
 
   // 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;
   wxCheckListBox *m_pParent;
 
 private:
   bool            m_bChecked;
   wxCheckListBox *m_pParent;

-  uint            m_nIndex;
+  size_t            m_nIndex;

 };
 
 };
 

-wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, uint nIndex)
+wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)

                   : wxOwnerDrawn("", TRUE)   // checkable
 {
   m_bChecked = FALSE;
                   : wxOwnerDrawn("", TRUE)   // checkable
 {
   m_bChecked = FALSE;


@@ -73,7 +99,6 @@ wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, uint 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());
 }
 


@@ -85,7 +110,7 @@ wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, uint nIndex)
  * check until you click to the right of it, which is OK for WIN32.
  */
 
  * check until you click to the right of it, which is OK for WIN32.
  */
 

-bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc, 
+bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,

                                     wxODAction act, wxODStatus stat)
 {
   if ( IsChecked() )
                                     wxODAction act, wxODStatus stat)
 {
   if ( IsChecked() )


@@ -93,10 +118,10 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 
   if ( wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) ) {
     // ## using native API for performance and precision
 
   if ( wxOwnerDrawn::OnDrawItem(dc, rc, act, stat) ) {
     // ## using native API for performance and precision

-    uint nCheckWidth  = GetDefaultMarginWidth(),
+    size_t nCheckWidth  = GetDefaultMarginWidth(),

          nCheckHeight = m_pParent->GetItemHeight();
          nCheckHeight = m_pParent->GetItemHeight();

-          
-    int x = rc.GetX(), 
+
+    int x = rc.GetX(),

         y = rc.GetY();
 
     HDC hdc = (HDC)dc.GetHDC();
         y = rc.GetY();
 
     HDC hdc = (HDC)dc.GetHDC();


@@ -104,7 +129,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
     // create pens
     HPEN hpenBack = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_WINDOW)),
          hpenGray = CreatePen(PS_SOLID, 0, RGB(128, 128, 128)),
     // create pens
     HPEN hpenBack = CreatePen(PS_SOLID, 0, GetSysColor(COLOR_WINDOW)),
          hpenGray = CreatePen(PS_SOLID, 0, RGB(128, 128, 128)),

-         hpenPrev = SelectObject(hdc, hpenBack);
+         hpenPrev = (HPEN)SelectObject(hdc, hpenBack);

 
     // we erase the 1-pixel border
     Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);
 
     // we erase the 1-pixel border
     Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);


@@ -116,19 +141,23 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
       // first create a monochrome bitmap in a memory DC
       HDC hdcMem = CreateCompatibleDC(hdc);
       HBITMAP hbmpCheck = CreateBitmap(nCheckWidth, nCheckHeight, 1, 1, 0);
       // first create a monochrome bitmap in a memory DC
       HDC hdcMem = CreateCompatibleDC(hdc);
       HBITMAP hbmpCheck = CreateBitmap(nCheckWidth, nCheckHeight, 1, 1, 0);

-      HBITMAP hbmpOld = SelectObject(hdcMem, hbmpCheck);
+      HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck);

 
       // then draw a check mark into it
 
       // 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__

       DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
 #else
       // In WIN16, draw a cross
       HPEN blackPen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
       DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
 #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);


@@ -141,7 +170,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 #endif
 
       // finally copy it to screen DC and clean up
 #endif
 
       // finally copy it to screen DC and clean up

-      BitBlt(hdc, x, y, nCheckWidth - 1, nCheckHeight, 
+      BitBlt(hdc, x, y, nCheckWidth - 1, nCheckHeight,

              hdcMem, 0, 0, SRCCOPY);
 
       SelectObject(hdcMem, hbmpOld);
              hdcMem, 0, 0, SRCCOPY);
 
       SelectObject(hdcMem, hbmpOld);


@@ -156,7 +185,7 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
 
     // draw hollow gray rectangle
     (void)SelectObject(hdc, hpenGray);
 
     // draw hollow gray rectangle
     (void)SelectObject(hdc, hpenGray);

-    HBRUSH hbrPrev  = SelectObject(hdc, GetStockObject(NULL_BRUSH));
+    HBRUSH hbrPrev  = (HBRUSH)SelectObject(hdc, GetStockObject(NULL_BRUSH));

     Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);
 
     // clean up
     Rectangle(hdc, x, y, x + nCheckWidth, y + nCheckHeight);
 
     // clean up


@@ -182,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()
-{ 
-  m_bChecked = !m_bChecked;
-
-  uint nHeight = m_pParent->GetItemHeight();
-  uint y = m_nIndex * nHeight;
-  RECT rcUpdate = { 0, y, GetDefaultMarginWidth(), y + nHeight};
-  InvalidateRect((HWND)m_pParent->GetHWND(), &rcUpdate, FALSE);
-
-  wxCommandEvent event(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, m_pParent->GetId());
-  event.SetInt(m_nIndex);
-  event.SetEventObject(m_pParent);
-  m_pParent->ProcessCommand(event);
+void wxCheckListBoxItem::Check(bool check)
+{
+    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?") );
+
+        m_nIndex = (size_t)index;
+    }
+
+    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);

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


@@ -217,35 +275,71 @@ wxCheckListBox::wxCheckListBox() : wxListBox()
 }
 
 // ctor which creates the associated control
 }
 
 // ctor which creates the associated control

-wxCheckListBox::wxCheckListBox(wxWindow *parent, const wxWindowID id,
+wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,

                                const wxPoint& pos, const wxSize& size,
                                const wxPoint& pos, const wxSize& size,

-                               const int nStrings, const wxString choices[],
-                               const long style, const wxValidator& val,
-                               const wxString& name) // , const wxFont& font)
-                // don't use ctor with arguments! we must call Create()
-                // ourselves from here.
+                               int nStrings, const wxString choices[],
+                               long style, const wxValidator& val,
+                               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.Remove(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 a check list box item
 }
 
 // create/retrieve item
 // --------------------
 
 // create a check list box item

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

 {
   wxCheckListBoxItem *pItem = new wxCheckListBoxItem(this, 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)


@@ -268,12 +362,12 @@ bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
 // check items
 // -----------
 
 // check items
 // -----------
 

-bool wxCheckListBox::IsChecked(uint uiIndex) const
+bool wxCheckListBox::IsChecked(size_t uiIndex) const

 {
   return GetItem(uiIndex)->IsChecked();
 }
 
 {
   return GetItem(uiIndex)->IsChecked();
 }
 

-void wxCheckListBox::Check(uint uiIndex, bool bCheck)
+void wxCheckListBox::Check(size_t uiIndex, bool bCheck)

 {
   GetItem(uiIndex)->Check(bCheck);
 }
 {
   GetItem(uiIndex)->Check(bCheck);
 }


@@ -286,16 +380,27 @@ 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
 }
 
 void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
 {
   // clicking on the item selects it, clicking on the checkmark toggles

-  if ( (uint)event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() ) {
-    // # better use LB_ITEMFROMPOINT perhaps?
-    uint nItem = ((uint)event.GetY()) / m_nItemHeight;
-    if ( nItem < (uint)m_noItems )
+  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
+
+    if ( nItem < (size_t)m_noItems )

       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
   }


@@ -304,3 +409,6 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
     event.Skip();
   }
 }
     event.Skip();
   }
 }

+
+#endif
+