use new style creation (MSWCreateControl() and MSWGetStyle()); adjust the drop down...

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

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 37cc646f05037bc3fd248ea56dadc522eb6d8c42..9bb556cf46ddb011e61f8ec94bae59448e96ccb3 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"


@@ -1563,6 +1565,9 @@ long wxListCtrl::InsertItem(wxListItem& info)
         {
             // take copy of attributes
             data->attr = new wxListItemAttr(*info.GetAttributes());
         {
             // take copy of attributes
             data->attr = new wxListItemAttr(*info.GetAttributes());

+
+            // and remember that we have some now...
+            m_hasAnyAttr = TRUE;

         }
     };
 
         }
     };
 


@@ -1808,7 +1813,7 @@ 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:
 #endif //__WXWINCE__
             case NM_RCLICK:
             case GN_CONTEXTMENU:
 #endif //__WXWINCE__
             case NM_RCLICK:


@@ -1822,7 +1827,7 @@ 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 


@@ -2142,7 +2147,7 @@ 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:
 #endif //__WXWINCE__
             case NM_RCLICK:
             case GN_CONTEXTMENU:
 #endif //__WXWINCE__
             case NM_RCLICK:


@@ -2157,7 +2162,7 @@ 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