react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Control/Dialog.h

@@ -1,91 +1,62 @@
 // Windows/Control/Dialog.h
 
-#ifndef ZIP7_INC_WINDOWS_CONTROL_DIALOG_H
-#define ZIP7_INC_WINDOWS_CONTROL_DIALOG_H
+#ifndef __WINDOWS_CONTROL_DIALOG_H
+#define __WINDOWS_CONTROL_DIALOG_H
 
 #include "../Window.h"
 
 namespace NWindows {
 namespace NControl {
 
-#ifndef IDCONTINUE
-#define IDCONTINUE 11
-#endif
-
 class CDialog: public CWindow
 {
-  // Z7_CLASS_NO_COPY(CDialog)
 public:
-  CDialog(HWND wnd = NULL): CWindow(wnd) {}
-  virtual ~CDialog() {}
+  CDialog(HWND wnd = NULL): CWindow(wnd){};
+  virtual ~CDialog() {};
 
-  HWND GetItem(unsigned itemID) const
-    { return GetDlgItem(_window, (int)itemID); }
+  HWND GetItem(int itemID) const
+    { return GetDlgItem(_window, itemID); }
 
-  bool EnableItem(unsigned itemID, bool enable) const
+  bool EnableItem(int itemID, bool enable) const
     { return BOOLToBool(::EnableWindow(GetItem(itemID), BoolToBOOL(enable))); }
 
-  bool ShowItem(unsigned itemID, int cmdShow) const
+  bool ShowItem(int itemID, int cmdShow) const
     { return BOOLToBool(::ShowWindow(GetItem(itemID), cmdShow)); }
 
-  bool ShowItem_Bool(unsigned itemID, bool show) const
+  bool ShowItem_Bool(int itemID, bool show) const
     { return ShowItem(itemID, show ? SW_SHOW: SW_HIDE); }
 
-  bool HideItem(unsigned itemID) const { return ShowItem(itemID, SW_HIDE); }
-
-  bool SetItemText(unsigned itemID, LPCTSTR s)
-    { return BOOLToBool(SetDlgItemText(_window, (int)itemID, s)); }
-
-  bool SetItemTextA(unsigned itemID, LPCSTR s)
-    { return BOOLToBool(SetDlgItemTextA(_window, (int)itemID, s)); }
+  bool HideItem(int itemID) const { return ShowItem(itemID, SW_HIDE); }
 
-  bool SetItemText_Empty(unsigned itemID)
-    { return SetItemText(itemID, TEXT("")); }
+  bool SetItemText(int itemID, LPCTSTR s)
+    { return BOOLToBool(SetDlgItemText(_window, itemID, s)); }
 
   #ifndef _UNICODE
-  bool SetItemText(unsigned itemID, LPCWSTR s)
+  bool SetItemText(int itemID, LPCWSTR s)
   {
     CWindow window(GetItem(itemID));
     return window.SetText(s);
   }
   #endif
 
-  UINT GetItemText(unsigned itemID, LPTSTR string, unsigned maxCount)
-    { return GetDlgItemText(_window, (int)itemID, string, (int)maxCount); }
+  UINT GetItemText(int itemID, LPTSTR string, int maxCount)
+    { return GetDlgItemText(_window, itemID, string, maxCount); }
   #ifndef _UNICODE
   /*
-  bool GetItemText(unsigned itemID, LPWSTR string, int maxCount)
+  bool GetItemText(int itemID, LPWSTR string, int maxCount)
   {
-    CWindow window(GetItem(unsigned));
+    CWindow window(GetItem(itemID));
     return window.GetText(string, maxCount);
   }
   */
   #endif
 
-  bool GetItemText(unsigned itemID, UString &s)
-  {
-    CWindow window(GetItem(itemID));
-    return window.GetText(s);
-  }
-
-/*
-  bool SetItemInt(unsigned itemID, UINT value, bool isSigned)
-    { return BOOLToBool(SetDlgItemInt(_window, (int)itemID, value, BoolToBOOL(isSigned))); }
-*/
-  bool SetItemUInt(unsigned itemID, UINT value)
-    { return BOOLToBool(SetDlgItemInt(_window, (int)itemID, value, FALSE)); }
-/*
-  bool GetItemInt(unsigned itemID, bool isSigned, UINT &value)
+  bool SetItemInt(int itemID, UINT value, bool isSigned)
+    { return BOOLToBool(SetDlgItemInt(_window, itemID, value, BoolToBOOL(isSigned))); }
+  bool GetItemInt(int itemID, bool isSigned, UINT &value)
   {
     BOOL result;
-    value = GetDlgItemInt(_window, (int)itemID, &result, BoolToBOOL(isSigned));
-    return BOOLToBool(result);
-  }
-*/
-  bool GetItemUInt(unsigned itemID, UINT &value)
-  {
-    BOOL result;
-    value = GetDlgItemInt(_window, (int)itemID, &result, FALSE);
+    value = GetDlgItemInt(_window, itemID, &result, BoolToBOOL(isSigned));
     return BOOLToBool(result);
   }
 
@@ -94,42 +65,33 @@ public:
   HWND GetNextTabItem(HWND control, bool previous)
     { return GetNextDlgTabItem(_window, control, BoolToBOOL(previous)); }
 
-  LRESULT SendMsg_NextDlgCtl(WPARAM wParam, LPARAM lParam)
-    { return SendMsg(WM_NEXTDLGCTL, wParam, lParam); }
-  LRESULT SendMsg_NextDlgCtl_HWND(HWND hwnd) { return SendMsg_NextDlgCtl((WPARAM)hwnd, TRUE); }
-  LRESULT SendMsg_NextDlgCtl_CtlId(unsigned id)   { return SendMsg_NextDlgCtl_HWND(GetItem(id)); }
-  LRESULT SendMsg_NextDlgCtl_Next()          { return SendMsg_NextDlgCtl(0, FALSE); }
-  LRESULT SendMsg_NextDlgCtl_Prev()          { return SendMsg_NextDlgCtl(1, FALSE); }
-
   bool MapRect(LPRECT rect)
     { return BOOLToBool(MapDialogRect(_window, rect)); }
 
   bool IsMessage(LPMSG message)
     { return BOOLToBool(IsDialogMessage(_window, message)); }
 
-  LRESULT SendItemMessage(unsigned itemID, UINT message, WPARAM wParam, LPARAM lParam)
-    { return SendDlgItemMessage(_window, (int)itemID, message, wParam, lParam); }
+  LRESULT SendItemMessage(int itemID, UINT message, WPARAM wParam, LPARAM lParam)
+    { return SendDlgItemMessage(_window, itemID, message, wParam, lParam); }
 
-  bool CheckButton(unsigned buttonID, UINT checkState)
-    { return BOOLToBool(CheckDlgButton(_window, (int)buttonID, checkState)); }
-  bool CheckButton(unsigned buttonID, bool checkState)
+  bool CheckButton(int buttonID, UINT checkState)
+    { return BOOLToBool(CheckDlgButton(_window, buttonID, checkState)); }
+  bool CheckButton(int buttonID, bool checkState)
     { return CheckButton(buttonID, UINT(checkState ? BST_CHECKED : BST_UNCHECKED)); }
 
-  UINT IsButtonChecked_BST(unsigned buttonID) const
-    { return IsDlgButtonChecked(_window, (int)buttonID); }
-  bool IsButtonCheckedBool(unsigned buttonID) const
-    { return (IsButtonChecked_BST(buttonID) == BST_CHECKED); }
+  UINT IsButtonChecked(int buttonID) const
+    { return IsDlgButtonChecked(_window, buttonID); }
+  bool IsButtonCheckedBool(int buttonID) const
+    { return (IsButtonChecked(buttonID) == BST_CHECKED); }
 
-  bool CheckRadioButton(unsigned firstButtonID, unsigned lastButtonID, unsigned checkButtonID)
-    { return BOOLToBool(::CheckRadioButton(_window,
-        (int)firstButtonID, (int)lastButtonID, (int)checkButtonID)); }
+  bool CheckRadioButton(int firstButtonID, int lastButtonID, int checkButtonID)
+    { return BOOLToBool(::CheckRadioButton(_window, firstButtonID, lastButtonID, checkButtonID)); }
 
   virtual bool OnMessage(UINT message, WPARAM wParam, LPARAM lParam);
   virtual bool OnInit() { return true; }
-  // virtual bool OnCommand2(WPARAM wParam, LPARAM lParam);
-  virtual bool OnCommand(unsigned code, unsigned itemID, LPARAM lParam);
+  virtual bool OnCommand(WPARAM wParam, LPARAM lParam);
+  virtual bool OnCommand(int code, int itemID, LPARAM lParam);
   virtual bool OnSize(WPARAM /* wParam */, int /* xSize */, int /* ySize */) { return false; }
-  virtual bool OnDestroy() { return false; }
 
   /*
   #ifdef UNDER_CE
@@ -138,12 +100,11 @@ public:
   virtual void OnHelp(LPHELPINFO) { OnHelp(); }
   #endif
   */
-  virtual void OnHelp() {}
+  virtual void OnHelp() {};
 
-  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND);
-  virtual void OnOK() {}
-  virtual void OnContinue() {}
-  virtual void OnCancel() {}
+  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
+  virtual void OnOK() {};
+  virtual void OnCancel() {};
   virtual void OnClose() {}
   virtual bool OnNotify(UINT /* controlID */, LPNMHDR /* lParam */) { return false; }
   virtual bool OnTimer(WPARAM /* timerID */, LPARAM /* callback */) { return false; }
@@ -155,11 +116,9 @@ public:
 
   bool GetMargins(int margin, int &x, int &y);
   int Units_To_Pixels_X(int units);
-  bool GetItemSizes(unsigned id, int &x, int &y);
-  void GetClientRectOfItem(unsigned id, RECT &rect);
-  bool MoveItem(unsigned id, int x, int y, int width, int height, bool repaint = true);
-  bool MoveItem_RECT(unsigned id, const RECT &r, bool repaint = true)
-    { return MoveItem(id, r.left, r.top, RECT_SIZE_X(r), RECT_SIZE_Y(r), repaint); }
+  bool GetItemSizes(int id, int &x, int &y);
+  void GetClientRectOfItem(int id, RECT &rect);
+  bool MoveItem(int id, int x, int y, int width, int height, bool repaint = true);
 
   void NormalizeSize(bool fullNormalize = false);
   void NormalizePosition();
@@ -173,10 +132,9 @@ public:
   #ifndef _UNICODE
   bool Create(LPCWSTR templateName, HWND parentWindow);
   #endif
-  virtual void OnOK() Z7_override { Destroy(); }
-  virtual void OnContinue() Z7_override { Destroy(); }
-  virtual void OnCancel() Z7_override { Destroy(); }
-  virtual void OnClose() Z7_override { Destroy(); }
+  virtual void OnOK() { Destroy(); }
+  virtual void OnCancel() { Destroy(); }
+  virtual void OnClose() { Destroy(); }
 };
 
 class CModalDialog: public CDialog
@@ -189,24 +147,23 @@ public:
   #endif
 
   bool End(INT_PTR result) { return BOOLToBool(::EndDialog(_window, result)); }
-  virtual void OnOK() Z7_override { End(IDOK); }
-  virtual void OnContinue() Z7_override { End(IDCONTINUE); }
-  virtual void OnCancel() Z7_override { End(IDCANCEL); }
-  virtual void OnClose() Z7_override { End(IDCLOSE); }
+  virtual void OnOK() { End(IDOK); }
+  virtual void OnCancel() { End(IDCANCEL); }
+  virtual void OnClose() { End(IDCLOSE); }
 };
 
 class CDialogChildControl: public NWindows::CWindow
 {
-  // unsigned m_ID;
+  int m_ID;
 public:
-  void Init(const NWindows::NControl::CDialog &parentDialog, unsigned id)
+  void Init(const NWindows::NControl::CDialog &parentDialog, int id)
   {
-    // m_ID = id;
+    m_ID = id;
     Attach(parentDialog.GetItem(id));
   }
 };
 
-bool IsDialogSizeOK(int xSize, int ySize, HWND hwnd = NULL);
+bool IsDialogSizeOK(int xSize, int ySize);
 
 }}
 

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Control/Edit.h

@@ -1,7 +1,7 @@
 // Windows/Control/Edit.h
 
-#ifndef ZIP7_INC_WINDOWS_CONTROL_EDIT_H
-#define ZIP7_INC_WINDOWS_CONTROL_EDIT_H
+#ifndef __WINDOWS_CONTROL_EDIT_H
+#define __WINDOWS_CONTROL_EDIT_H
 
 #include "../Window.h"
 

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Control/ImageList.h

@@ -1,9 +1,9 @@
 // Windows/Control/ImageList.h
 
-#ifndef ZIP7_INC_WINDOWS_CONTROL_IMAGE_LIST_H
-#define ZIP7_INC_WINDOWS_CONTROL_IMAGE_LIST_H
+#ifndef __WINDOWS_CONTROL_IMAGE_LIST_H
+#define __WINDOWS_CONTROL_IMAGE_LIST_H
 
-#include <CommCtrl.h>
+#include <commctrl.h>
 
 #include "../Defs.h"
 
@@ -56,7 +56,7 @@ public:
   bool GetImageInfo(int index, IMAGEINFO* imageInfo) const
     { return BOOLToBool(ImageList_GetImageInfo(m_Object, index, imageInfo)); }
 
-  int Add(HBITMAP hbmImage, HBITMAP hbmMask = NULL)
+  int Add(HBITMAP hbmImage, HBITMAP hbmMask = 0)
     { return ImageList_Add(m_Object, hbmImage, hbmMask); }
   int AddMasked(HBITMAP hbmImage, COLORREF mask)
     { return ImageList_AddMasked(m_Object, hbmImage, mask); }

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Control/ListView.cpp

@@ -20,85 +20,78 @@ bool CListView::CreateEx(DWORD exStyle, DWORD style,
       height, parentWindow, idOrHMenu, instance, createParam);
 }
 
-/* note: LVITEM and LVCOLUMN structures contain optional fields
-   depending from preprocessor macros:
-      #if (_WIN32_IE >= 0x0300)
-      #if (_WIN32_WINNT >= 0x0501)
-      #if (_WIN32_WINNT >= 0x0600)
-*/
-
-bool CListView::GetItemParam(unsigned index, LPARAM &param) const
+bool CListView::GetItemParam(int index, LPARAM &param) const
 {
   LVITEM item;
-  item.iItem = (int)index;
+  item.iItem = index;
   item.iSubItem = 0;
   item.mask = LVIF_PARAM;
-  const bool res = GetItem(&item);
+  bool aResult = GetItem(&item);
   param = item.lParam;
-  return res;
+  return aResult;
 }
 
-int CListView::InsertColumn(unsigned columnIndex, LPCTSTR text, int width)
+int CListView::InsertColumn(int columnIndex, LPCTSTR text, int width)
 {
   LVCOLUMN ci;
   ci.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM;
-  ci.pszText = (LPTSTR)(void *)text;
-  ci.iSubItem = (int)columnIndex;
+  ci.pszText = (LPTSTR)text;
+  ci.iSubItem = columnIndex;
   ci.cx = width;
   return InsertColumn(columnIndex, &ci);
 }
 
-int CListView::InsertItem(unsigned index, LPCTSTR text)
+int CListView::InsertItem(int index, LPCTSTR text)
 {
   LVITEM item;
   item.mask = LVIF_TEXT | LVIF_PARAM;
-  item.iItem = (int)index;
-  item.lParam = (LPARAM)index;
-  item.pszText = (LPTSTR)(void *)text;
+  item.iItem = index;
+  item.lParam = index;
+  item.pszText = (LPTSTR)text;
   item.iSubItem = 0;
   return InsertItem(&item);
 }
 
-int CListView::SetSubItem(unsigned index, unsigned subIndex, LPCTSTR text)
+int CListView::SetSubItem(int index, int subIndex, LPCTSTR text)
 {
   LVITEM item;
   item.mask = LVIF_TEXT;
-  item.iItem = (int)index;
-  item.pszText = (LPTSTR)(void *)text;
-  item.iSubItem = (int)subIndex;
+  item.iItem = index;
+  item.pszText = (LPTSTR)text;
+  item.iSubItem = subIndex;
   return SetItem(&item);
 }
 
 #ifndef _UNICODE
 
-int CListView::InsertColumn(unsigned columnIndex, LPCWSTR text, int width)
+int CListView::InsertColumn(int columnIndex, LPCWSTR text, int width)
 {
   LVCOLUMNW ci;
   ci.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM;
-  ci.pszText = (LPWSTR)(void *)text;
-  ci.iSubItem = (int)columnIndex;
+  ci.pszText = (LPWSTR)text;
+  ci.iSubItem = columnIndex;
   ci.cx = width;
   return InsertColumn(columnIndex, &ci);
 }
 
-int CListView::InsertItem(unsigned index, LPCWSTR text)
+int CListView::InsertItem(int index, LPCWSTR text)
 {
   LVITEMW item;
   item.mask = LVIF_TEXT | LVIF_PARAM;
-  item.iItem = (int)index;
-  item.lParam = (LPARAM)index;
-  item.pszText = (LPWSTR)(void *)text;
+  item.iItem = index;
+  item.lParam = index;
+  item.pszText = (LPWSTR)text;
   item.iSubItem = 0;
   return InsertItem(&item);
 }
 
-int CListView::SetSubItem(unsigned index, unsigned subIndex, LPCWSTR text)
+int CListView::SetSubItem(int index, int subIndex, LPCWSTR text)
 {
   LVITEMW item;
   item.mask = LVIF_TEXT;
-  item.iItem = (int)index;
-  item.pszText = (LPWSTR)(void *)text;
-  item.iSubItem = (int)subIndex;
+  item.iItem = index;
+  item.pszText = (LPWSTR)text;
+  item.iSubItem = subIndex;
   return SetItem(&item);
 }
 

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Control/ListView.h

@@ -1,11 +1,11 @@
 // Windows/Control/ListView.h
 
-#ifndef ZIP7_INC_WINDOWS_CONTROL_LISTVIEW_H
-#define ZIP7_INC_WINDOWS_CONTROL_LISTVIEW_H
+#ifndef __WINDOWS_CONTROL_LISTVIEW_H
+#define __WINDOWS_CONTROL_LISTVIEW_H
 
 #include "../../Common/MyWindows.h"
 
-#include <CommCtrl.h>
+#include <commctrl.h>
 
 #include "../Window.h"
 
@@ -28,12 +28,11 @@ public:
   }
  
   bool DeleteAllItems() { return BOOLToBool(ListView_DeleteAllItems(_window)); }
-  bool DeleteColumn(unsigned columnIndex) { return BOOLToBool(ListView_DeleteColumn(_window, columnIndex)); }
+  bool DeleteColumn(int columnIndex) { return BOOLToBool(ListView_DeleteColumn(_window, columnIndex)); }
 
-  int InsertColumn(unsigned columnIndex, const LVCOLUMN *columnInfo) { return ListView_InsertColumn(_window, columnIndex, columnInfo); }
-  int InsertColumn(unsigned columnIndex, LPCTSTR text, int width);
-  bool SetColumnOrderArray(unsigned count, const int *columns)
-    { return BOOLToBool(ListView_SetColumnOrderArray(_window, count, (int *)(void *)columns)); }
+  int InsertColumn(int columnIndex, const LVCOLUMN *columnInfo) { return ListView_InsertColumn(_window, columnIndex, columnInfo); }
+  int InsertColumn(int columnIndex, LPCTSTR text, int width);
+  bool SetColumnOrderArray(int count, const int *columns) { return BOOLToBool(ListView_SetColumnOrderArray(_window, count, columns)); }
 
   /*
   int GetNumColumns()
@@ -46,49 +45,43 @@ public:
   */
 
   int InsertItem(const LVITEM* item) { return ListView_InsertItem(_window, item); }
-  int InsertItem(unsigned index, LPCTSTR text);
+  int InsertItem(int index, LPCTSTR text);
   bool SetItem(const LVITEM* item) { return BOOLToBool(ListView_SetItem(_window, item)); }
-  int SetSubItem(unsigned index, unsigned subIndex, LPCTSTR text);
+  int SetSubItem(int index, int subIndex, LPCTSTR text);
 
   #ifndef _UNICODE
 
-  int InsertColumn(unsigned columnIndex, const LVCOLUMNW *columnInfo) { return (int)SendMsg(LVM_INSERTCOLUMNW, (WPARAM)columnIndex, (LPARAM)columnInfo); }
-  int InsertColumn(unsigned columnIndex, LPCWSTR text, int width);
+  int InsertColumn(int columnIndex, const LVCOLUMNW *columnInfo) { return (int)SendMsg(LVM_INSERTCOLUMNW, (WPARAM)columnIndex, (LPARAM)columnInfo); }
+  int InsertColumn(int columnIndex, LPCWSTR text, int width);
   int InsertItem(const LV_ITEMW* item) { return (int)SendMsg(LVM_INSERTITEMW, 0, (LPARAM)item); }
-  int InsertItem(unsigned index, LPCWSTR text);
+  int InsertItem(int index, LPCWSTR text);
   bool SetItem(const LV_ITEMW* item) { return BOOLToBool((BOOL)SendMsg(LVM_SETITEMW, 0, (LPARAM)item)); }
-  int SetSubItem(unsigned index, unsigned subIndex, LPCWSTR text);
+  int SetSubItem(int index, int subIndex, LPCWSTR text);
 
   #endif
 
-  bool DeleteItem(unsigned itemIndex) { return BOOLToBool(ListView_DeleteItem(_window, itemIndex)); }
+  bool DeleteItem(int itemIndex) { return BOOLToBool(ListView_DeleteItem(_window, itemIndex)); }
 
   UINT GetSelectedCount() const { return ListView_GetSelectedCount(_window); }
   int GetItemCount() const { return ListView_GetItemCount(_window); }
 
   INT GetSelectionMark() const { return ListView_GetSelectionMark(_window); }
 
-  void SetItemCount(unsigned numItems) { ListView_SetItemCount(_window, numItems); }
-  void SetItemCountEx(unsigned numItems, DWORD flags) {  ListView_SetItemCountEx(_window, numItems, flags); }
+  void SetItemCount(int numItems) { ListView_SetItemCount(_window, numItems); }
+  void SetItemCountEx(int numItems, DWORD flags) {  ListView_SetItemCountEx(_window, numItems, flags); }
 
-  /* startIndex : The index of the item with which to begin the search,
-     or -1 to find the first item that matches the specified flags.
-     The specified item itself is excluded from the search. */
   int GetNextItem(int startIndex, UINT flags) const { return ListView_GetNextItem(_window, startIndex, flags); }
   int GetNextSelectedItem(int startIndex) const { return GetNextItem(startIndex, LVNI_SELECTED); }
   int GetFocusedItem() const { return GetNextItem(-1, LVNI_FOCUSED); }
   
   bool GetItem(LVITEM* item) const { return BOOLToBool(ListView_GetItem(_window, item)); }
-  bool GetItemParam(unsigned itemIndex, LPARAM &param) const;
-  /*
-  void GetItemText(unsigned itemIndex, unsigned subItemIndex, LPTSTR text, unsigned textSizeMax) const
-    { ListView_GetItemText(_window, itemIndex, subItemIndex, text, textSizeMax) }
-  */
+  bool GetItemParam(int itemIndex, LPARAM &param) const;
+  void GetItemText(int itemIndex, int subItemIndex, LPTSTR text, int textSizeMax) const
+    { ListView_GetItemText(_window, itemIndex, subItemIndex, text, textSizeMax); }
   bool SortItems(PFNLVCOMPARE compareFunction, LPARAM dataParam)
     { return BOOLToBool(ListView_SortItems(_window, compareFunction, dataParam)); }
 
-  // If (index == -1), then the state change is applied to all items.
-  void SetItemState(int index, UINT state, UINT mask) { ListView_SetItemState(_window, index, state, mask) }
+  void SetItemState(int index, UINT state, UINT mask) { ListView_SetItemState(_window, index, state, mask); }
   void SetItemState_Selected(int index, bool select) { SetItemState(index, select ? LVIS_SELECTED : 0, LVIS_SELECTED); }
   void SetItemState_Selected(int index) { SetItemState(index, LVIS_SELECTED, LVIS_SELECTED); }
   void SelectAll() { SetItemState_Selected(-1); }
@@ -96,7 +89,7 @@ public:
   UINT GetItemState(int index, UINT mask) const { return ListView_GetItemState(_window, index, mask); }
   bool IsItemSelected(int index) const { return GetItemState(index, LVIS_SELECTED) == LVIS_SELECTED; }
 
-  bool GetColumn(unsigned columnIndex, LVCOLUMN* columnInfo) const
+  bool GetColumn(int columnIndex, LVCOLUMN* columnInfo) const
     { return BOOLToBool(ListView_GetColumn(_window, columnIndex, columnInfo)); }
 
   HIMAGELIST SetImageList(HIMAGELIST imageList, int imageListType)
@@ -107,7 +100,7 @@ public:
   void SetExtendedListViewStyle(DWORD exStyle) { ListView_SetExtendedListViewStyle(_window, exStyle); }
   void SetExtendedListViewStyle(DWORD exMask, DWORD exStyle) { ListView_SetExtendedListViewStyleEx(_window, exMask, exStyle); }
 
-  void SetCheckState(UINT index, bool checkState) { ListView_SetCheckState(_window, index, BoolToBOOL(checkState)) }
+  void SetCheckState(UINT index, bool checkState) { ListView_SetCheckState(_window, index, BoolToBOOL(checkState)); }
   bool GetCheckState(UINT index) { return BOOLToBool(ListView_GetCheckState(_window, index)); }
 
   bool EnsureVisible(int index, bool partialOK) { return BOOLToBool(ListView_EnsureVisible(_window, index, BoolToBOOL(partialOK))); }
@@ -135,10 +128,7 @@ public:
 class CListView2: public CListView
 {
   WNDPROC _origWindowProc;
-  // ~CListView2() ZIP7_eq_delete;
 public:
-  virtual ~CListView2() {}
-  CListView2() {}
   void SetWindowProc();
   virtual LRESULT OnMessage(UINT message, WPARAM wParam, LPARAM lParam);
 };

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/Control/ProgressBar.h

@@ -1,11 +1,11 @@
 // Windows/Control/ProgressBar.h
 
-#ifndef ZIP7_INC_WINDOWS_CONTROL_PROGRESSBAR_H
-#define ZIP7_INC_WINDOWS_CONTROL_PROGRESSBAR_H
+#ifndef __WINDOWS_CONTROL_PROGRESSBAR_H
+#define __WINDOWS_CONTROL_PROGRESSBAR_H
 
 #include "../../Common/MyWindows.h"
 
-#include <CommCtrl.h>
+#include <commctrl.h>
 
 #include "../Window.h"
 
@@ -15,18 +15,18 @@ namespace NControl {
 class CProgressBar: public CWindow
 {
 public:
-  LRESULT SetPos(int pos) { return SendMsg(PBM_SETPOS, (unsigned)pos, 0); }
-  // LRESULT DeltaPos(int increment) { return SendMsg(PBM_DELTAPOS, increment, 0); }
-  // UINT GetPos() { return (UINT)SendMsg(PBM_GETPOS, 0, 0); }
-  // LRESULT SetRange(unsigned short minValue, unsigned short maxValue) { return SendMsg(PBM_SETRANGE, 0, MAKELPARAM(minValue, maxValue)); }
-  DWORD SetRange32(int minValue, int maxValue) { return (DWORD)SendMsg(PBM_SETRANGE32, (unsigned)minValue, (LPARAM)(unsigned)maxValue); }
-  // int SetStep(int step) { return (int)SendMsg(PBM_SETSTEP, step, 0); }
-  // LRESULT StepIt() { return SendMsg(PBM_STEPIT, 0, 0); }
-  // INT GetRange(bool minValue, PPBRANGE range) { return (INT)SendMsg(PBM_GETRANGE, BoolToBOOL(minValue), (LPARAM)range); }
+  LRESULT SetPos(int pos) { return SendMsg(PBM_SETPOS, pos, 0); }
+  LRESULT DeltaPos(int increment) { return SendMsg(PBM_DELTAPOS, increment, 0); }
+  UINT GetPos() { return (UINT)SendMsg(PBM_GETPOS, 0, 0); }
+  LRESULT SetRange(unsigned short minValue, unsigned short maxValue) { return SendMsg(PBM_SETRANGE, 0, MAKELPARAM(minValue, maxValue)); }
+  DWORD SetRange32(int minValue, int maxValue) { return (DWORD)SendMsg(PBM_SETRANGE32, minValue, maxValue); }
+  int SetStep(int step) { return (int)SendMsg(PBM_SETSTEP, step, 0); }
+  LRESULT StepIt() { return SendMsg(PBM_STEPIT, 0, 0); }
+  INT GetRange(bool minValue, PPBRANGE range) { return (INT)SendMsg(PBM_GETRANGE, BoolToBOOL(minValue), (LPARAM)range); }
   
   #ifndef UNDER_CE
-  COLORREF SetBarColor(COLORREF color) { return (COLORREF)SendMsg(PBM_SETBARCOLOR, 0, (LPARAM)color); }
-  COLORREF SetBackgroundColor(COLORREF color) { return (COLORREF)SendMsg(PBM_SETBKCOLOR, 0, (LPARAM)color); }
+  COLORREF SetBarColor(COLORREF color) { return (COLORREF)SendMsg(PBM_SETBARCOLOR, 0, color); }
+  COLORREF SetBackgroundColor(COLORREF color) { return (COLORREF)SendMsg(PBM_SETBKCOLOR, 0, color); }
   #endif
 };