Applied patch #886192: "Minor fix to XRC contrib"; Minor cosmetic cleanups.

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

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index b0633936f3d524deea449ca111d2cb8febb1006a..3e9b5966cbb79c2060a07385d00085d5c01966fa 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -48,7 +48,9 @@
 #if defined(__WXWINCE__)
   #include <ole2.h>
   #include <shellapi.h>
 #if defined(__WXWINCE__)
   #include <ole2.h>
   #include <shellapi.h>

-  #include <aygshell.h>
+  #if _WIN32_WCE < 400
+    #include <aygshell.h>
+  #endif

 #endif
 
 // include <commctrl.h> "properly"
 #endif
 
 // include <commctrl.h> "properly"


@@ -1808,9 +1810,9 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 event.m_col = nmHDR->iItem;
                 break;
 
                 event.m_col = nmHDR->iItem;
                 break;
 

-#ifdef __WXWINCE__
+#if defined(__WXWINCE__) && _WIN32_WCE < 400

             case GN_CONTEXTMENU:
             case GN_CONTEXTMENU:

-#endif __WXWINCE__
+#endif //__WXWINCE__

             case NM_RCLICK:
                 {
                     eventType = wxEVT_COMMAND_LIST_COL_RIGHT_CLICK;
             case NM_RCLICK:
                 {
                     eventType = wxEVT_COMMAND_LIST_COL_RIGHT_CLICK;


@@ -1822,11 +1824,11 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
                     // where did the click occur?
                     POINT ptClick;
 
                     // where did the click occur?
                     POINT ptClick;

-#ifdef __WXWINCE__
+#if defined(__WXWINCE__) && _WIN32_WCE < 400

                   if(nmhdr->code == GN_CONTEXTMENU) {
                       ptClick = ((NMRGINFO*)nmhdr)->ptAction;
                   } else 
                   if(nmhdr->code == GN_CONTEXTMENU) {
                       ptClick = ((NMRGINFO*)nmhdr)->ptAction;
                   } else 

-#endif __WXWINCE__
+#endif //__WXWINCE__

                     if ( !::GetCursorPos(&ptClick) )
                     {
                         wxLogLastError(_T("GetCursorPos"));
                     if ( !::GetCursorPos(&ptClick) )
                     {
                         wxLogLastError(_T("GetCursorPos"));


@@ -2142,9 +2144,9 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 event.m_item.m_data = GetItemData(iItem);
                 break;
 
                 event.m_item.m_data = GetItemData(iItem);
                 break;
 

-#ifdef __WXWINCE__
+#if defined(__WXWINCE__) && _WIN32_WCE < 400

             case GN_CONTEXTMENU:
             case GN_CONTEXTMENU:

-#endif __WXWINCE__
+#endif //__WXWINCE__

             case NM_RCLICK:
                 // if the user processes it in wxEVT_COMMAND_RIGHT_CLICK(),
                 // don't do anything else
             case NM_RCLICK:
                 // if the user processes it in wxEVT_COMMAND_RIGHT_CLICK(),
                 // don't do anything else


@@ -2157,11 +2159,11 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 LV_HITTESTINFO lvhti;
                 wxZeroMemory(lvhti);
 
                 LV_HITTESTINFO lvhti;
                 wxZeroMemory(lvhti);
 

-#ifdef __WXWINCE__
+#if defined(__WXWINCE__) && _WIN32_WCE < 400

               if(nmhdr->code == GN_CONTEXTMENU) {
                   lvhti.pt = ((NMRGINFO*)nmhdr)->ptAction;
               } else 
               if(nmhdr->code == GN_CONTEXTMENU) {
                   lvhti.pt = ((NMRGINFO*)nmhdr)->ptAction;
               } else 

-#endif __WXWINCE__
+#endif //__WXWINCE__

                 ::GetCursorPos(&(lvhti.pt));
                 ::ScreenToClient(GetHwnd(),&(lvhti.pt));
                 if ( ListView_HitTest(GetHwnd(),&lvhti) != -1 )
                 ::GetCursorPos(&(lvhti.pt));
                 ::ScreenToClient(GetHwnd(),&(lvhti.pt));
                 if ( ListView_HitTest(GetHwnd(),&lvhti) != -1 )