define wxTC_MULTILINE explicitly as wxNB_MULTILINE is not necessarily defined where...

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

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 92adaffc37db03c61d8ec1390b1e8514717fa6c1..97f61eb113eaa8372b3aa5132d3f96d3d2a8dbdf 100644 (file)
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -2,7 +2,7 @@
 // Name:        wx/msw/listctrl.h
 // Purpose:     wxListCtrl class
 // Author:      Julian Smart
 // Name:        wx/msw/listctrl.h
 // Purpose:     wxListCtrl class
 // Author:      Julian Smart

-// Modified by:
+// Modified by: Agron Selimaj

 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart


@@ -12,14 +12,8 @@
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 

-#if wxUSE_LISTCTRL
-
-#include "wx/control.h"
-#include "wx/event.h"
-#include "wx/hash.h"

 #include "wx/textctrl.h"
 
 #include "wx/textctrl.h"
 

-

 class WXDLLEXPORT wxImageList;
 
 /*
 class WXDLLEXPORT wxImageList;
 
 /*


@@ -174,6 +168,9 @@ public:
     // Gets the item rectangle
     bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ;
 
     // Gets the item rectangle
     bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ;
 

+    // Gets the subitem rectangle in report mode
+    bool GetSubItemRect(long item, long subItem, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ;
+

     // Gets the item position
     bool GetItemPosition(long item, wxPoint& pos) const ;
 
     // Gets the item position
     bool GetItemPosition(long item, wxPoint& pos) const ;
 


@@ -293,7 +290,8 @@ public:
 
     // Determines which item (if any) is at the specified point,
     // giving details in 'flags' (see wxLIST_HITTEST_... flags above)
 
     // Determines which item (if any) is at the specified point,
     // giving details in 'flags' (see wxLIST_HITTEST_... flags above)

-    long HitTest(const wxPoint& point, int& flags);
+    // Request the subitem number as well at the given coordinate.
+    long HitTest(const wxPoint& point, int& flags, long* ptrSubItem = NULL) const;

 
     // Inserts an item, returning the index of the new item if successful,
     // -1 otherwise.
 
     // Inserts an item, returning the index of the new item if successful,
     // -1 otherwise.


@@ -342,6 +340,7 @@ public:
     // IMPLEMENTATION
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
     // IMPLEMENTATION
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);

+    virtual bool MSWShouldPreProcessMessage(WXMSG* msg);

 
     // bring the control in sync with current m_windowStyle value
     void UpdateStyle();
 
     // bring the control in sync with current m_windowStyle value
     void UpdateStyle();


@@ -434,6 +433,4 @@ private:
     DECLARE_NO_COPY_CLASS(wxListCtrl)
 };
 
     DECLARE_NO_COPY_CLASS(wxListCtrl)
 };
 

-#endif // wxUSE_LISTCTRL
-

 #endif // _WX_LISTCTRL_H_
 #endif // _WX_LISTCTRL_H_