some app.h cleanup: minimize includes, use static cast

[wxWidgets.git] / include / wx / msw / checklst.h

diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index 4b62d3ab3170270b1938373c57efb83bacddb140..e347ba14fe7653cc484cfe92f8b9df62d344c119 100644 (file)
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        checklst.h
+// Name:        wx/msw/checklst.h

 // Purpose:     wxCheckListBox class - a listbox with checkable items
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxCheckListBox class - a listbox with checkable items
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -56,13 +56,13 @@ public:
                 const wxString& name = wxListBoxNameStr);
 
   // override base class virtuals
                 const wxString& name = wxListBoxNameStr);
 
   // override base class virtuals

-  virtual void Delete(int n);
+  virtual void Delete(unsigned int n);

 
   virtual bool SetFont( const wxFont &font );
 
   // items may be checked
 
   virtual bool SetFont( const wxFont &font );
 
   // items may be checked

-  virtual bool IsChecked(size_t uiIndex) const;
-  virtual void Check(size_t uiIndex, bool bCheck = true);
+  virtual bool IsChecked(unsigned int uiIndex) const;
+  virtual void Check(unsigned int uiIndex, bool bCheck = true);

 
   // return the index of the item at this position or wxNOT_FOUND
   int HitTest(const wxPoint& pt) const { return DoHitTestItem(pt.x, pt.y); }
 
   // return the index of the item at this position or wxNOT_FOUND
   int HitTest(const wxPoint& pt) const { return DoHitTestItem(pt.x, pt.y); }


@@ -71,12 +71,12 @@ public:
   // accessors
   size_t GetItemHeight() const { return m_nItemHeight; }
 
   // accessors
   size_t GetItemHeight() const { return m_nItemHeight; }
 

-protected:

   // we create our items ourselves and they have non-standard size,
   // so we need to override these functions
   virtual wxOwnerDrawn *CreateLboxItem(size_t n);
   virtual bool          MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
 
   // we create our items ourselves and they have non-standard size,
   // so we need to override these functions
   virtual wxOwnerDrawn *CreateLboxItem(size_t n);
   virtual bool          MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
 

+protected:

   // this can't be called DoHitTest() because wxWindow already has this method
   int DoHitTestItem(wxCoord x, wxCoord y) const;
 
   // this can't be called DoHitTest() because wxWindow already has this method
   int DoHitTestItem(wxCoord x, wxCoord y) const;