4.59 beta

CPP/Windows/Control/ComboBox.cpp

@@ -32,7 +32,7 @@ LRESULT CComboBox::GetLBText(int index, CSysString &s)
 
 #ifndef _UNICODE
 LRESULT CComboBox::AddString(LPCWSTR s)
-{ 
+{
   if (g_IsNT)
     return SendMessageW(CB_ADDSTRING, 0, (LPARAM)s);
   return AddString(GetSystemString(s));

CPP/Windows/Control/ComboBox.h

@@ -34,19 +34,24 @@ public:
     { return SendMessage(CB_SETITEMDATA, index, lParam); }
   LRESULT GetItemData(int index)
     { return SendMessage(CB_GETITEMDATA, index, 0); }
+
+  void ShowDropDown(bool show = true)
+    { SendMessage(CB_SHOWDROPDOWN, show ? TRUE : FALSE, 0);  }
 };
 
-class CComboBoxEx: public CWindow
+class CComboBoxEx: public CComboBox
 {
 public:
-  LRESULT DeleteItem(int index)
-    { return SendMessage(CBEM_DELETEITEM, index, 0); }
-  LRESULT InsertItem(COMBOBOXEXITEM *item)
-    { return SendMessage(CBEM_INSERTITEM, 0, (LPARAM)item); }
-  DWORD SetExtendedStyle(DWORD exMask, DWORD exStyle)
-    { return (DWORD)SendMessage(CBEM_SETEXTENDEDSTYLE, exMask, exStyle); }
-  HWND GetEditControl()
-    { return (HWND)SendMessage(CBEM_GETEDITCONTROL, 0, 0); }
+  LRESULT DeleteItem(int index) { return SendMessage(CBEM_DELETEITEM, index, 0); }
+  LRESULT InsertItem(COMBOBOXEXITEM *item) { return SendMessage(CBEM_INSERTITEM, 0, (LPARAM)item); }
+  #ifndef _UNICODE
+  LRESULT InsertItem(COMBOBOXEXITEMW *item) { return SendMessage(CBEM_INSERTITEMW, 0, (LPARAM)item); }
+  #endif
+
+  LRESULT SetItem(COMBOBOXEXITEM *item) { return SendMessage(CBEM_SETITEM, 0, (LPARAM)item); }
+  DWORD SetExtendedStyle(DWORD exMask, DWORD exStyle) { return (DWORD)SendMessage(CBEM_SETEXTENDEDSTYLE, exMask, exStyle); }
+  HWND GetEditControl() { return (HWND)SendMessage(CBEM_GETEDITCONTROL, 0, 0); }
+  HIMAGELIST SetImageList(HIMAGELIST imageList) { return (HIMAGELIST)SendMessage(CBEM_SETIMAGELIST, 0, (LPARAM)imageList); }
 };
 
 }}

CPP/Windows/Control/Dialog.cpp

@@ -15,7 +15,7 @@ extern bool g_IsNT;
 namespace NWindows {
 namespace NControl {
 
-static INT_PTR APIENTRY DialogProcedure(HWND dialogHWND, UINT message, 
+static INT_PTR APIENTRY DialogProcedure(HWND dialogHWND, UINT message,
     WPARAM wParam, LPARAM lParam)
 {
   CWindow dialogTmp(dialogHWND);
@@ -54,8 +54,8 @@ bool CDialog::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
   }
 }
 
-bool CDialog::OnCommand(WPARAM wParam, LPARAM lParam) 
-{ 
+bool CDialog::OnCommand(WPARAM wParam, LPARAM lParam)
+{
   return OnCommand(HIWORD(wParam), LOWORD(wParam), lParam);
 }
 
@@ -63,11 +63,11 @@ bool CDialog::OnCommand(int code, int itemID, LPARAM lParam)
 {
   if (code == BN_CLICKED)
     return OnButtonClicked(itemID, (HWND)lParam);
-  return false; 
+  return false;
 }
 
-bool CDialog::OnButtonClicked(int buttonID, HWND /* buttonHWND */) 
-{ 
+bool CDialog::OnButtonClicked(int buttonID, HWND /* buttonHWND */)
+{
   switch(buttonID)
   {
     case IDOK:
@@ -86,7 +86,7 @@ bool CDialog::OnButtonClicked(int buttonID, HWND /* buttonHWND */)
 }
 
 bool CModelessDialog::Create(LPCTSTR templateName, HWND parentWindow)
-{ 
+{
   HWND aHWND = CreateDialogParam(g_hInstance, templateName, parentWindow, DialogProcedure, (LPARAM)this);
   if (aHWND == 0)
     return false;
@@ -95,14 +95,14 @@ bool CModelessDialog::Create(LPCTSTR templateName, HWND parentWindow)
 }
 
 INT_PTR CModalDialog::Create(LPCTSTR templateName, HWND parentWindow)
-{ 
+{
   return DialogBoxParam(g_hInstance, templateName, parentWindow, DialogProcedure, (LPARAM)this);
 }
 
 #ifndef _UNICODE
 
 bool CModelessDialog::Create(LPCWSTR templateName, HWND parentWindow)
-{ 
+{
   HWND aHWND;
   if (g_IsNT)
     aHWND = CreateDialogParamW(g_hInstance, templateName, parentWindow, DialogProcedure, (LPARAM)this);
@@ -126,7 +126,7 @@ bool CModelessDialog::Create(LPCWSTR templateName, HWND parentWindow)
 }
 
 INT_PTR CModalDialog::Create(LPCWSTR templateName, HWND parentWindow)
-{ 
+{
   if (g_IsNT)
     return DialogBoxParamW(g_hInstance, templateName, parentWindow, DialogProcedure, (LPARAM)this);
   AString name;
@@ -140,6 +140,6 @@ INT_PTR CModalDialog::Create(LPCWSTR templateName, HWND parentWindow)
   }
   return DialogBoxParamA(g_hInstance, templateNameA, parentWindow, DialogProcedure, (LPARAM)this);
 }
-#endif 
+#endif
 
 }}

CPP/Windows/Control/Dialog.h

@@ -29,9 +29,9 @@ public:
 
   #ifndef _UNICODE
   bool SetItemText(int itemID, LPCWSTR s)
-  { 
+  {
     CWindow window(GetItem(itemID));
-    return window.SetText(s); 
+    return window.SetText(s);
   }
   #endif
 
@@ -40,9 +40,9 @@ public:
   #ifndef _UNICODE
   /*
   bool GetItemText(int itemID, LPWSTR string, int maxCount)
-  { 
+  {
     CWindow window(GetItem(itemID));
-    return window.GetText(string, maxCount); 
+    return window.GetText(string, maxCount);
   }
   */
   #endif
@@ -50,7 +50,7 @@ public:
   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, itemID, &result, BoolToBOOL(isSigned));
       return BOOLToBool(result);

CPP/Windows/Control/ImageList.h

@@ -31,7 +31,7 @@ public:
   
   bool Create(int width, int height, UINT flags, int initialNumber, int grow)
   {
-    HIMAGELIST a = ImageList_Create(width, height, flags, 
+    HIMAGELIST a = ImageList_Create(width, height, flags,
       initialNumber, grow);
     if(a == NULL)
       return false;

CPP/Windows/Control/ListView.cpp

@@ -9,17 +9,17 @@ namespace NControl {
 
 bool CListView::CreateEx(DWORD exStyle, DWORD style,
       int x, int y, int width, int height,
-      HWND parentWindow, HMENU idOrHMenu, 
+      HWND parentWindow, HMENU idOrHMenu,
       HINSTANCE instance, LPVOID createParam)
 {
   return CWindow::CreateEx(exStyle, WC_LISTVIEW, TEXT(""), style, x, y, width,
       height, parentWindow, idOrHMenu, instance, createParam);
 }
 
-bool CListView::GetItemParam(int itemIndex, LPARAM &param) const 
-{ 
+bool CListView::GetItemParam(int index, LPARAM &param) const
+{
   LVITEM item;
-  item.iItem = itemIndex;
+  item.iItem = index;
   item.iSubItem = 0;
   item.mask = LVIF_PARAM;
   bool aResult = GetItem(&item);
@@ -27,32 +27,70 @@ bool CListView::GetItemParam(int itemIndex, LPARAM &param) const
   return aResult;
 }
 
-/*
-int CListView::InsertItem(UINT mask, int item, LPCTSTR itemText, 
-    UINT nState, UINT nStateMask, int nImage, LPARAM lParam)
+int CListView::InsertColumn(int columnIndex, LPCTSTR text, int width)
+{
+  LVCOLUMN ci;
+  ci.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM;
+  ci.pszText = (LPTSTR)text;
+  ci.iSubItem = columnIndex;
+  ci.cx = width;
+  return InsertColumn(columnIndex, &ci);
+}
+
+int CListView::InsertItem(int index, LPCTSTR text)
 {
   LVITEM item;
-  item.mask = nMask;
-  item.iItem = nItem;
+  item.mask = LVIF_TEXT | LVIF_PARAM;
+  item.iItem = index;
+  item.lParam = index;
+  item.pszText = (LPTSTR)text;
   item.iSubItem = 0;
-  item.pszText = (LPTSTR)itemText;
-  item.state = nState;
-  item.stateMask = nStateMask;
-  item.iImage = nImage;
-  item.lParam = lParam;
   return InsertItem(&item);
 }
 
-int CListView::InsertItem(int nItem, LPCTSTR itemText)
-{ 
-  return InsertItem(LVIF_TEXT, nItem, itemText, 0, 0, 0, 0); 
+int CListView::SetSubItem(int index, int subIndex, LPCTSTR text)
+{
+  LVITEM item;
+  item.mask = LVIF_TEXT;
+  item.iItem = index;
+  item.pszText = (LPTSTR)text;
+  item.iSubItem = subIndex;
+  return SetItem(&item);
 }
 
-int CListView::InsertItem(int nItem, LPCTSTR itemText, int nImage)
-{ 
-  return InsertItem(LVIF_TEXT | LVIF_IMAGE, nItem, itemText, 0, 0, nImage, 0); 
+#ifndef _UNICODE
+
+int CListView::InsertColumn(int columnIndex, LPCWSTR text, int width)
+{
+  LVCOLUMNW ci;
+  ci.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM;
+  ci.pszText = (LPWSTR)text;
+  ci.iSubItem = columnIndex;
+  ci.cx = width;
+  return InsertColumn(columnIndex, &ci);
 }
-*/
+
+int CListView::InsertItem(int index, LPCWSTR text)
+{
+  LVITEMW item;
+  item.mask = LVIF_TEXT | LVIF_PARAM;
+  item.iItem = index;
+  item.lParam = index;
+  item.pszText = (LPWSTR)text;
+  item.iSubItem = 0;
+  return InsertItem(&item);
+}
+
+int CListView::SetSubItem(int index, int subIndex, LPCWSTR text)
+{
+  LVITEMW item;
+  item.mask = LVIF_TEXT;
+  item.iItem = index;
+  item.pszText = (LPWSTR)text;
+  item.iSubItem = subIndex;
+  return SetItem(&item);
+}
+
+#endif
 
 }}
-

CPP/Windows/Control/ListView.h

@@ -16,7 +16,7 @@ class CListView: public NWindows::CWindow
 public:
   bool CreateEx(DWORD exStyle, DWORD style,
       int x, int y, int width, int height,
-      HWND parentWindow, HMENU idOrHMenu, 
+      HWND parentWindow, HMENU idOrHMenu,
       HINSTANCE instance, LPVOID createParam);
 
   bool SetUnicodeFormat(bool fUnicode)
@@ -24,27 +24,28 @@ public:
  
   bool DeleteAllItems()
     { return BOOLToBool(ListView_DeleteAllItems(_window)); }
-  int InsertColumn(int columnIndex, const LVCOLUMN *columnInfo)
-    { return ListView_InsertColumn(_window, columnIndex, columnInfo); }
-  #ifndef _UNICODE
-  int InsertColumn(int columnIndex, const LVCOLUMNW *columnInfo)
-    { return (int)SendMessage(LVM_INSERTCOLUMNW, (WPARAM)columnIndex, (LPARAM)columnInfo); }
-  #endif
+
   bool DeleteColumn(int columnIndex)
     { return BOOLToBool(ListView_DeleteColumn(_window, columnIndex)); }
 
-  int InsertItem(const LVITEM* item)
-    { return ListView_InsertItem(_window, item); }
-  #ifndef _UNICODE
-  int InsertItem(const LV_ITEMW* item)
-    { return (int)SendMessage(LVM_INSERTITEMW, 0, (LPARAM)item); }
-  #endif
+  int InsertColumn(int columnIndex, const LVCOLUMN *columnInfo)
+    { return ListView_InsertColumn(_window, columnIndex, columnInfo); }
+  int InsertColumn(int columnIndex, LPCTSTR text, int width);
+  int InsertItem(const LVITEM* item) { return ListView_InsertItem(_window, item); }
+  int InsertItem(int index, LPCTSTR text);
+  bool SetItem(const LVITEM* item) { return BOOLToBool(ListView_SetItem(_window, item)); }
+  int SetSubItem(int index, int subIndex, LPCTSTR text);
 
-  bool SetItem(const LVITEM* item)
-    { return BOOLToBool(ListView_SetItem(_window, item)); }
   #ifndef _UNICODE
-  bool SetItem(const LV_ITEMW* item)
-    { return BOOLToBool((BOOL)SendMessage(LVM_SETITEMW, 0, (LPARAM)item)); }
+
+  int InsertColumn(int columnIndex, const LVCOLUMNW *columnInfo)
+    { return (int)SendMessage(LVM_INSERTCOLUMNW, (WPARAM)columnIndex, (LPARAM)columnInfo); }
+  int InsertColumn(int columnIndex, LPCWSTR text, int width);
+  int InsertItem(const LV_ITEMW* item) { return (int)SendMessage(LVM_INSERTITEMW, 0, (LPARAM)item); }
+  int InsertItem(int index, LPCWSTR text);
+  bool SetItem(const LV_ITEMW* item) { return BOOLToBool((BOOL)SendMessage(LVM_SETITEMW, 0, (LPARAM)item)); }
+  int SetSubItem(int index, int subIndex, LPCWSTR text);
+
   #endif
 
   bool DeleteItem(int itemIndex)
@@ -70,10 +71,10 @@ public:
   int GetFocusedItem() const
     { return GetNextItem(-1, LVNI_FOCUSED); }
   
-  bool GetItem(LVITEM* item) const 
+  bool GetItem(LVITEM* item) const
     { return BOOLToBool(ListView_GetItem(_window, item)); }
   bool GetItemParam(int itemIndex, LPARAM &param) const;
-  void GetItemText(int itemIndex, int aSubItemIndex, LPTSTR aText, int aTextSizeMax) const 
+  void GetItemText(int itemIndex, int aSubItemIndex, LPTSTR aText, int aTextSizeMax) const
     { ListView_GetItemText(_window, itemIndex, aSubItemIndex, aText, aTextSizeMax); }
   bool SortItems(PFNLVCOMPARE compareFunction, LPARAM dataParam)
     { return BOOLToBool(ListView_SortItems(_window, compareFunction, dataParam)); }
@@ -119,7 +120,7 @@ public:
   bool RedrawItems(int firstIndex, int lastIndex)
     { return BOOLToBool(ListView_RedrawItems(_window, firstIndex, lastIndex)); }
   bool RedrawAllItems()
-  { 
+  {
     if (GetItemCount() > 0)
       return RedrawItems(0, GetItemCount() - 1);
     return true;
@@ -135,4 +136,5 @@ public:
 };
 
 }}
-#endif
+
+#endif

CPP/Windows/Control/PropertyPage.cpp

@@ -15,7 +15,7 @@ extern bool g_IsNT;
 namespace NWindows {
 namespace NControl {
 
-INT_PTR APIENTRY ProperyPageProcedure(HWND dialogHWND, UINT message, 
+INT_PTR APIENTRY ProperyPageProcedure(HWND dialogHWND, UINT message,
     WPARAM wParam, LPARAM lParam)
 {
   CDialog tempDialog(dialogHWND);
@@ -38,7 +38,7 @@ INT_PTR APIENTRY ProperyPageProcedure(HWND dialogHWND, UINT message,
   return dialog->OnMessage(message, wParam, lParam);
 }
 
-bool CPropertyPage::OnNotify(UINT /* controlID */, LPNMHDR lParam) 
+bool CPropertyPage::OnNotify(UINT /* controlID */, LPNMHDR lParam)
 {
   switch(lParam->code)
   {

CPP/Windows/Control/StdAfx.h

@@ -6,4 +6,4 @@
 #include "../../Common/MyWindows.h"
 #include "../../Common/NewHandler.h"
 
-#endif 
+#endif

CPP/Windows/Control/ToolBar.h

@@ -15,7 +15,7 @@ public:
   bool GetMaxSize(LPSIZE size)
     { return LRESULTToBool(SendMessage(TB_GETMAXSIZE, 0, (LPARAM)size)); }
   bool EnableButton(UINT buttonID, bool enable)
-    { return LRESULTToBool(SendMessage(TB_ENABLEBUTTON, buttonID, 
+    { return LRESULTToBool(SendMessage(TB_ENABLEBUTTON, buttonID,
           MAKELONG(BoolToBOOL(enable), 0))); }
   void ButtonStructSize()
     { SendMessage(TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON)); }

CPP/Windows/Control/Window2.cpp

@@ -20,7 +20,7 @@ ATOM MyRegisterClass(CONST WNDCLASSW *wndClass);
 
 namespace NControl {
 
-static LRESULT CALLBACK WindowProcedure(HWND aHWND, UINT message, 
+static LRESULT CALLBACK WindowProcedure(HWND aHWND, UINT message,
     WPARAM wParam, LPARAM lParam)
 {
   CWindow tempWindow(aHWND);
@@ -42,10 +42,10 @@ static LRESULT CALLBACK WindowProcedure(HWND aHWND, UINT message,
   return window->OnMessage(message, wParam, lParam);
 }
 
-bool CWindow2::CreateEx(DWORD exStyle, LPCTSTR className, 
+bool CWindow2::CreateEx(DWORD exStyle, LPCTSTR className,
       LPCTSTR windowName, DWORD style,
       int x, int y, int width, int height,
-      HWND parentWindow, HMENU idOrHMenu, 
+      HWND parentWindow, HMENU idOrHMenu,
       HINSTANCE instance)
 {
   WNDCLASS windowClass;
@@ -67,16 +67,16 @@ bool CWindow2::CreateEx(DWORD exStyle, LPCTSTR className,
       return false;
   }
   return CWindow::CreateEx(exStyle, className, windowName,
-      style, x, y, width, height, parentWindow, 
+      style, x, y, width, height, parentWindow,
       idOrHMenu, instance, this);
 }
 
 #ifndef _UNICODE
 
-bool CWindow2::CreateEx(DWORD exStyle, LPCWSTR className, 
+bool CWindow2::CreateEx(DWORD exStyle, LPCWSTR className,
       LPCWSTR windowName, DWORD style,
       int x, int y, int width, int height,
-      HWND parentWindow, HMENU idOrHMenu, 
+      HWND parentWindow, HMENU idOrHMenu,
       HINSTANCE instance)
 {
   bool needRegister;
@@ -117,7 +117,7 @@ bool CWindow2::CreateEx(DWORD exStyle, LPCWSTR className,
       return false;
   }
   return CWindow::CreateEx(exStyle, className, windowName,
-      style, x, y, width, height, parentWindow, 
+      style, x, y, width, height, parentWindow,
       idOrHMenu, instance, this);
 
 }
@@ -163,8 +163,8 @@ LRESULT CWindow2::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
   return DefProc(message, wParam, lParam);
 }
 
-bool CWindow2::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT &result) 
-{ 
+bool CWindow2::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT &result)
+{
   return OnCommand(HIWORD(wParam), LOWORD(wParam), lParam, result);
 }
 
@@ -179,8 +179,8 @@ bool CWindow2::OnCommand(int /* code */, int /* itemID */, LPARAM /* lParam */,
 }
 
 /*
-bool CDialog::OnButtonClicked(int buttonID, HWND buttonHWND) 
-{ 
+bool CDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
+{
   switch(aButtonID)
   {
     case IDOK:

CPP/Windows/Control/Window2.h

@@ -17,17 +17,17 @@ public:
   virtual ~CWindow2() {};
 
 
-  bool CreateEx(DWORD exStyle, LPCTSTR className, 
+  bool CreateEx(DWORD exStyle, LPCTSTR className,
       LPCTSTR windowName, DWORD style,
       int x, int y, int width, int height,
-      HWND parentWindow, HMENU idOrHMenu, 
+      HWND parentWindow, HMENU idOrHMenu,
       HINSTANCE instance);
 
   #ifndef _UNICODE
   bool CreateEx(DWORD exStyle, LPCWSTR className,
       LPCWSTR windowName, DWORD style,
       int x, int y, int width, int height,
-      HWND parentWindow, HMENU idOrHMenu, 
+      HWND parentWindow, HMENU idOrHMenu,
       HINSTANCE instance);
   #endif