Bugfix for wxListCtrl::GetColumn. It wasn't checking the returned format correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 66acdfc7e229341eb65f4bf6b058a8774f83c757..fdcff64cc21694303627d0832be32aa01ed8c4fa 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -39,6 +39,10 @@
     #define HDM_FIRST 0x1200
 #endif
 
+#ifndef LVCFMT_JUSTIFYMASK
+    #define LVCFMT_JUSTIFYMASK 0x0003
+#endif
+
 // mingw32/cygwin don't have declarations for comctl32.dll 4.70+ stuff
 #ifndef NM_CACHEHINT
     typedef struct tagNMLVCACHEHINT

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 9ea8e389a189eb9e8e4276742658beb9608a4780..2379386b1c05799533c867358dd2a95f28550efa 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -598,7 +598,7 @@ bool wxListCtrl::GetColumn(int col, wxListItem& item) const
         lvCol.mask |= LVCF_IMAGE;
     }
 
-    bool success = ListView_GetColumn(GetHwnd(), col, & lvCol) != 0;
+    bool success = ListView_GetColumn(GetHwnd(), col, &lvCol) != 0;
 
     //  item.m_subItem = lvCol.iSubItem;
     item.m_width = lvCol.cx;
@@ -611,12 +611,20 @@ bool wxListCtrl::GetColumn(int col, wxListItem& item) const
 
     if ( item.m_mask & wxLIST_MASK_FORMAT )
     {
-        if (lvCol.fmt == LVCFMT_LEFT)
-            item.m_format = wxLIST_FORMAT_LEFT;
-        else if (lvCol.fmt == LVCFMT_RIGHT)
-            item.m_format = wxLIST_FORMAT_RIGHT;
-        else if (lvCol.fmt == LVCFMT_CENTER)
-            item.m_format = wxLIST_FORMAT_CENTRE;
+        switch (lvCol.fmt & LVCFMT_JUSTIFYMASK) {
+            case LVCFMT_LEFT:
+                item.m_format = wxLIST_FORMAT_LEFT;
+                break;
+            case LVCFMT_RIGHT:
+                item.m_format = wxLIST_FORMAT_RIGHT;
+                break;
+            case LVCFMT_CENTER:
+                item.m_format = wxLIST_FORMAT_CENTRE;
+                break;
+            default:
+                item.m_format = -1;  // Unknown?
+                break;
+        }
     }
 
 #if _WIN32_IE >= 0x0300