reapack

commit 5820baf5d0ddd9c64206e56b2b4460dfbac3c41a
parent bfcf384cb776336be442be1f5e91c0b097707565
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Tue, 29 Dec 2015 22:16:49 -0800

fix config dialog build on windows

Diffstat:
M
src/listview.cpp
 | 
12
++++++++----
M
src/listview.hpp
 | 
2
+-
M
src/manager.cpp
 | 
4
++--

3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/listview.cpp b/src/listview.cpp
@@ -17,6 +17,8 @@
 
 #include "listview.hpp"
 
+#include <commctrl.h>
+
 using namespace std;
 
 ListView::ListView(const Columns &columns, HWND handle)
@@ -42,14 +44,16 @@ void ListView::addColumn(const auto_char *text, const int width)
 void ListView::addRow(const Row &content)
 {
   LVITEM item = {0};
-  item.iItem = m_rowSize++;
+  item.iItem = (int)m_rowSize++;
 
   ListView_InsertItem(m_handle, &item);
 
-  const size_t contentSize = min(m_columnSize, content.size());
+  const size_t cols = min(m_columnSize, content.size());
 
-  for(size_t i = 0; i < contentSize; i++)
-    ListView_SetItemText(m_handle, item.iItem, i, content[i]);
+  for(size_t i = 0; i < cols; i++) {
+    auto_char *text = const_cast<auto_char *>(content[i]);
+    ListView_SetItemText(m_handle, item.iItem, (int)i, text);
+  }
 }
 
 void ListView::clear()
diff --git a/src/listview.hpp b/src/listview.hpp
@@ -30,7 +30,7 @@
 
 class ListView {
 public:
-  typedef std::pair<const auto_char *, const int> Column;
+  typedef std::pair<const auto_char *, int> Column;
   typedef std::vector<const Column> Columns;
   typedef std::vector<const auto_char *> Row;
 
diff --git a/src/manager.cpp b/src/manager.cpp
@@ -55,8 +55,8 @@ void Manager::onCommand(WPARAM wParam, LPARAM)
 void Manager::refresh()
 {
   m_list->clear();
-  m_list->addRow({"Hello", "http://hello.com/index.xml"});
-  m_list->addRow({"World", "http://world.com/index.xml"});
+  m_list->addRow({AUTO_STR("Hello"), AUTO_STR("http://hello.com/index.xml")});
+  m_list->addRow({AUTO_STR("World"), AUTO_STR("http://world.com/index.xml")});
 }
 
 void Manager::apply()