don't attempt to convert 8bit values to Unicode in ANSI build

[wxWidgets.git] / include / wx / listbase.h

diff --git a/include/wx/listbase.h b/include/wx/listbase.h
index 71f89838316a971576558e2f168baa86ff91a0d2..ed88175211df6fe14b478286b36e44c80a6a2870 100644 (file)
--- a/include/wx/listbase.h
+++ b/include/wx/listbase.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        wx/listctrl.h
+// Name:        wx/listbase.h

 // Purpose:     wxListCtrl class
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxListCtrl class
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -12,14 +12,9 @@
 #ifndef _WX_LISTBASE_H_BASE_
 #define _WX_LISTBASE_H_BASE_
 
 #ifndef _WX_LISTBASE_H_BASE_
 #define _WX_LISTBASE_H_BASE_
 

-#include "wx/defs.h"
-
-#if wxUSE_LISTCTRL
-

 #include "wx/colour.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"
 #include "wx/colour.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"

-

 #include "wx/event.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/event.h"
 
 // ----------------------------------------------------------------------------


@@ -104,6 +99,9 @@ typedef int (wxCALLBACK *wxListCtrlCompare)(long item1, long item2, long sortDat
 
 #define wxLIST_HITTEST_ONITEM (wxLIST_HITTEST_ONITEMICON | wxLIST_HITTEST_ONITEMLABEL | wxLIST_HITTEST_ONITEMSTATEICON)
 
 
 #define wxLIST_HITTEST_ONITEM (wxLIST_HITTEST_ONITEMICON | wxLIST_HITTEST_ONITEMLABEL | wxLIST_HITTEST_ONITEMSTATEICON)
 

+// GetSubItemRect constants
+#define wxLIST_GETSUBITEMRECT_WHOLEITEM -1l
+

 // Flags for GetNextItem (MSW only except wxLIST_NEXT_ALL)
 enum
 {
 // Flags for GetNextItem (MSW only except wxLIST_NEXT_ALL)
 enum
 {


@@ -338,7 +336,7 @@ protected:
         m_col = 0;
         m_state = 0;
         m_stateMask = 0;
         m_col = 0;
         m_state = 0;
         m_stateMask = 0;

-        m_image = 0;
+        m_image = -1;

         m_data = 0;
 
         m_format = wxLIST_FORMAT_CENTRE;
         m_data = 0;
 
         m_format = wxLIST_FORMAT_CENTRE;


@@ -431,10 +429,7 @@ BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT, 703)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM, 704)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, 705)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT, 703)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM, 704)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, 705)

-#if WXWIN_COMPATIBILITY_2_4
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO, 706)
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO, 707)
-#endif
+

     DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED, 708)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED, 709)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN, 710)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED, 708)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED, 709)
     DECLARE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN, 710)


@@ -484,12 +479,5 @@ typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&);
 #define EVT_LIST_CACHE_HINT(id, fn) wx__DECLARE_LISTEVT(CACHE_HINT, id, fn)
 
 
 #define EVT_LIST_CACHE_HINT(id, fn) wx__DECLARE_LISTEVT(CACHE_HINT, id, fn)
 
 

-#if WXWIN_COMPATIBILITY_2_4
-#define EVT_LIST_GET_INFO(id, fn) wx__DECLARE_LISTEVT(GET_INFO, id, fn)
-#define EVT_LIST_SET_INFO(id, fn) wx__DECLARE_LISTEVT(SET_INFO, id, fn)
-#endif
-
-#endif // wxUSE_LISTCTRL
-

 #endif
     // _WX_LISTCTRL_H_BASE_
 #endif
     // _WX_LISTCTRL_H_BASE_