restored #ifndef wxUSE_UNICODE accidentaly removed by my previous commit

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

diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index 473cc09b76901cdf1d314f3224865f886a254e57..ffc70a0a512e7759e5e9d4df7d8234cb3e16ab2a 100644 (file)
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -37,6 +37,14 @@ public:
                  const wxValidator& validator = wxDefaultValidator,
                  const wxString& name = wxListBoxNameStr);
 
+  bool Create(wxWindow *parent, wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                int n = 0, const wxString choices[] = NULL,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxListBoxNameStr);
+
   // override base class virtuals
   virtual void Delete(int n);
 
@@ -46,15 +54,22 @@ public:
   virtual bool IsChecked(size_t uiIndex) const;
   virtual void Check(size_t 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); }
+  int HitTest(wxCoord x, wxCoord y) const { return DoHitTestItem(x, y); }
+
   // 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 *CreateItem(size_t n);
+  virtual wxOwnerDrawn *CreateLboxItem(size_t n);
   virtual bool          MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
 
+  // this can't be called DoHitTest() because wxWindow already has this method
+  int DoHitTestItem(wxCoord x, wxCoord y) const;
+
   // pressing space or clicking the check box toggles the item
   void OnKeyDown(wxKeyEvent& event);
   void OnLeftClick(wxMouseEvent& event);