[ 1509599 ] 'Split pickers page in widgets sample' with more icons and rebaking.

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

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index f9790875b9649d727dd0e02b3f611ba025fcfd91..0a9a7154885dc4edcb19e3ac1ff3728fad2eced4 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/checklst.cpp
+// Name:        src/msw/checklst.cpp

 // Purpose:     implementation of wxCheckListBox class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wxCheckListBox class
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,19 +17,17 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "checklst.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN
 
 #endif
 
 #if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN
 

+#include "wx/checklst.h"
+

 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/colour.h"
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/colour.h"


@@ -45,7 +43,6 @@
 #endif
 
 #include "wx/ownerdrw.h"
 #endif
 
 #include "wx/ownerdrw.h"

-#include "wx/checklst.h"

 
 #include "wx/msw/wrapwin.h"
 #include <windowsx.h>
 
 #include "wx/msw/wrapwin.h"
 #include <windowsx.h>


@@ -130,44 +127,44 @@ class wxCheckListBoxItem : public wxOwnerDrawn
 {
 friend class WXDLLEXPORT wxCheckListBox;
 public:
 {
 friend class WXDLLEXPORT wxCheckListBox;
 public:

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

 
 

-  // 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 and operations
-  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();
+    void SendEvent();

 
 private:
 
 private:

-  bool            m_bChecked;
-  wxCheckListBox *m_pParent;
-  size_t          m_nIndex;
+    bool            m_bChecked;
+    wxCheckListBox *m_pParent;
+    size_t    m_nIndex;

 
 

-  DECLARE_NO_COPY_CLASS(wxCheckListBoxItem)
+    DECLARE_NO_COPY_CLASS(wxCheckListBoxItem)

 };
 
 wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)
                   : wxOwnerDrawn(wxEmptyString, true)   // checkable
 {
 };
 
 wxCheckListBoxItem::wxCheckListBoxItem(wxCheckListBox *pParent, size_t nIndex)
                   : wxOwnerDrawn(wxEmptyString, true)   // checkable
 {

-  m_bChecked = false;
-  m_pParent  = pParent;
-  m_nIndex   = nIndex;
-
-  // we don't initialize m_nCheckHeight/Width vars because it's
-  // done in OnMeasure while they are used only in OnDraw and we
-  // know that there will always be OnMeasure before OnDraw
-
-  // fix appearance for check list boxes: they don't look quite the same as
-  // menu icons
-  SetMarginWidth(::GetSystemMetrics(SM_CXMENUCHECK) -
-                    2*wxSystemSettings::GetMetric(wxSYS_EDGE_X) + 1);
-  SetBackgroundColour(pParent->GetBackgroundColour());
+    m_bChecked = false;
+    m_pParent  = pParent;
+    m_nIndex   = nIndex;
+
+    // we don't initialize m_nCheckHeight/Width vars because it's
+    // done in OnMeasure while they are used only in OnDraw and we
+    // know that there will always be OnMeasure before OnDraw
+
+    // fix appearance for check list boxes: they don't look quite the same as
+    // menu icons
+    SetMarginWidth(::GetSystemMetrics(SM_CXMENUCHECK) -
+                      2*wxSystemSettings::GetMetric(wxSYS_EDGE_X) + 1);
+    SetBackgroundColour(pParent->GetBackgroundColour());

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


@@ -322,14 +319,8 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
                             long style,
                             const wxValidator& validator, const wxString& name)
 {
                             long style,
                             const wxValidator& validator, const wxString& name)
 {

-    if (wxListBox::Create(parent, id, pos, size, n, choices,
-                             style | wxLB_OWNERDRAW, validator, name))
-    {
-        SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-        return true;
-    }
-    else
-        return false;
+    return wxListBox::Create(parent, id, pos, size, n, choices,
+                             style | wxLB_OWNERDRAW, validator, name);

 }
 
 bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,


@@ -338,35 +329,29 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID id,
                             long style,
                             const wxValidator& validator, const wxString& name)
 {
                             long style,
                             const wxValidator& validator, const wxString& name)
 {

-    if (wxListBox::Create(parent, id, pos, size, choices,
-                             style | wxLB_OWNERDRAW, validator, name))
-    {
-        SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-        return true;
-    }
-    else
-        return false;
+    return wxListBox::Create(parent, id, pos, size, choices,
+                             style | wxLB_OWNERDRAW, validator, name);

 }
 
 // misc overloaded methods
 // -----------------------
 
 }
 
 // misc overloaded methods
 // -----------------------
 

-void wxCheckListBox::Delete(int N)
+void wxCheckListBox::Delete(unsigned int n)

 {
 {

-    wxCHECK_RET( N >= 0 && N < m_noItems,
+    wxCHECK_RET( IsValid(n),

                  wxT("invalid index in wxListBox::Delete") );
 
                  wxT("invalid index in wxListBox::Delete") );
 

-    wxListBox::Delete(N);
+    wxListBox::Delete(n);

 
     // free memory
 
     // free memory

-    delete m_aItems[N];
+    delete m_aItems[n];

 
 

-    m_aItems.RemoveAt(N);
+    m_aItems.RemoveAt(n);

 }
 
 bool wxCheckListBox::SetFont( const wxFont &font )
 {
 }
 
 bool wxCheckListBox::SetFont( const wxFont &font )
 {

-    size_t i;
+    unsigned int i;

     for ( i = 0; i < m_aItems.GetCount(); i++ )
         m_aItems[i]->SetFont(font);
 
     for ( i = 0; i < m_aItems.GetCount(); i++ )
         m_aItems[i]->SetFont(font);
 


@@ -407,16 +392,16 @@ bool wxCheckListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
 // check items
 // -----------
 
 // check items
 // -----------
 

-bool wxCheckListBox::IsChecked(size_t uiIndex) const
+bool wxCheckListBox::IsChecked(unsigned int uiIndex) const

 {
 {

-    wxCHECK_MSG( uiIndex < (size_t)GetCount(), false, _T("bad wxCheckListBox index") );
+    wxCHECK_MSG( IsValid(uiIndex), false, _T("bad wxCheckListBox index") );

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

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

 {
 {

-    wxCHECK_RET( uiIndex < (size_t)GetCount(), _T("bad wxCheckListBox index") );
+    wxCHECK_RET( IsValid(uiIndex), _T("bad wxCheckListBox index") );

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


@@ -510,21 +495,24 @@ void wxCheckListBox::OnKeyDown(wxKeyEvent& event)
 
 void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
 {
 
 void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
 {

-  // clicking on the item selects it, clicking on the checkmark toggles
-  if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() ) {
-    int nItem = HitTest(event.GetX(), event.GetY());
-
-    if ( nItem != wxNOT_FOUND ) {
-      wxCheckListBoxItem *item = GetItem(nItem);
-      item->Toggle();
-      item->SendEvent();
+    // clicking on the item selects it, clicking on the checkmark toggles
+    if ( event.GetX() <= wxOwnerDrawn::GetDefaultMarginWidth() )
+    {
+        int nItem = HitTest(event.GetX(), event.GetY());
+
+        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
+    {
+        // implement default behaviour: clicking on the item selects it
+        event.Skip();

     }
     }

-    //else: it's not an error, just click outside of client zone
-  }
-  else {
-    // implement default behaviour: clicking on the item selects it
-    event.Skip();
-  }

 }
 
 int wxCheckListBox::DoHitTestItem(wxCoord x, wxCoord y) const
 }
 
 int wxCheckListBox::DoHitTestItem(wxCoord x, wxCoord y) const


@@ -537,7 +525,7 @@ int wxCheckListBox::DoHitTestItem(wxCoord x, wxCoord y) const
                               MAKELPARAM(x, y)
                              );
 
                               MAKELPARAM(x, y)
                              );
 

-  return nItem >= m_noItems ? wxNOT_FOUND : nItem;
+    return nItem >= (int)m_noItems ? wxNOT_FOUND : nItem;

 }
 
 
 }
 
 


@@ -550,4 +538,3 @@ wxSize wxCheckListBox::DoGetBestSize() const
 }
 
 #endif
 }
 
 #endif

-