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

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

src/msw/listctrl.cpp

@@ -611,12 +611,20 @@ bool wxListCtrl::GetColumn(int col, wxListItem& item) const
 
     if ( item.m_mask & wxLIST_MASK_FORMAT )
     {
-        if (lvCol.fmt == LVCFMT_LEFT)
+        switch (lvCol.fmt & LVCFMT_JUSTIFYMASK) {
+            case LVCFMT_LEFT:
                 item.m_format = wxLIST_FORMAT_LEFT;
-        else if (lvCol.fmt == LVCFMT_RIGHT)
+                break;
+            case LVCFMT_RIGHT:
                 item.m_format = wxLIST_FORMAT_RIGHT;
-        else if (lvCol.fmt == LVCFMT_CENTER)
+                break;
+            case LVCFMT_CENTER:
                 item.m_format = wxLIST_FORMAT_CENTRE;
+                break;
+            default:
+                item.m_format = -1;  // Unknown?
+                break;
+        }
     }
 
 #if _WIN32_IE >= 0x0300