1 files changed, 32 insertions, 20 deletions

diff --git a/CPP/Windows/Menu.h b/CPP/Windows/Menu.h
index aacdc7c..e1de4c4 100644
--- a/CPP/Windows/Menu.h
+++ b/CPP/Windows/Menu.h
@@ -1,14 +1,27 @@
 // Windows/Menu.h
 
-#ifndef __WINDOWS_MENU_H
-#define __WINDOWS_MENU_H
+#ifndef ZIP7_INC_WINDOWS_MENU_H
+#define ZIP7_INC_WINDOWS_MENU_H
 
+#include "../Common/MyWindows.h"
 #include "../Common/MyString.h"
 
 #include "Defs.h"
 
 namespace NWindows {
 
+#ifndef MIIM_STRING
+#define MIIM_STRING      0x00000040
+#endif
+/*
+#ifndef MIIM_BITMAP
+#define MIIM_BITMAP      0x00000080
+#endif
+*/
+#ifndef MIIM_FTYPE
+#define MIIM_FTYPE       0x00000100
+#endif
+
 struct CMenuItem
 {
   UString StringValue;
@@ -23,24 +36,23 @@ struct CMenuItem
   // LPTSTR dwTypeData;
   // UINT cch;
   // HBITMAP hbmpItem;
-  bool IsString() const // change it MIIM_STRING
-    { return ((fMask & MIIM_TYPE) != 0 && (fType == MFT_STRING)); }
+  bool IsString() const { return (fMask & (MIIM_TYPE | MIIM_STRING)) != 0; }
   bool IsSeparator() const { return (fType == MFT_SEPARATOR); }
-  CMenuItem(): fMask(0), fType(0), fState(0), wID(0), hSubMenu(0), hbmpChecked(0),
-    hbmpUnchecked(0), dwItemData(0) {}
+  CMenuItem(): fMask(0), fType(0), fState(0), wID(0),
+      hSubMenu(NULL), hbmpChecked(NULL), hbmpUnchecked(NULL), dwItemData(0) {}
 };
 
 class CMenu
 {
   HMENU _menu;
 public:
-  CMenu(): _menu(NULL) {};
+  CMenu(): _menu(NULL) {}
   operator HMENU() const { return _menu; }
   void Attach(HMENU menu) { _menu = menu; }
   
   HMENU Detach()
   {
-    HMENU menu = _menu;
+    const HMENU menu = _menu;
     _menu = NULL;
     return menu;
   }
@@ -59,27 +71,27 @@ public:
   
   bool Destroy()
   {
-    if (_menu == NULL)
+    if (!_menu)
       return false;
     return BOOLToBool(::DestroyMenu(Detach()));
   }
   
-  int GetItemCount()
+  int GetItemCount() const
   {
     #ifdef UNDER_CE
-    for (int i = 0;; i++)
+    for (unsigned i = 0;; i++)
     {
       CMenuItem item;
       item.fMask = MIIM_STATE;
       if (!GetItem(i, true, item))
-        return i;
+        return (int)i;
     }
     #else
     return GetMenuItemCount(_menu);
     #endif
   }
 
-  HMENU GetSubMenu(int pos) { return ::GetSubMenu(_menu, pos); }
+  HMENU GetSubMenu(int pos) const { return ::GetSubMenu(_menu, pos); }
   #ifndef UNDER_CE
   /*
   bool GetItemString(UINT idItem, UINT flag, CSysString &result)
@@ -93,11 +105,11 @@ public:
     return (len != 0);
   }
   */
-  UINT GetItemID(int pos) { return ::GetMenuItemID(_menu, pos);   }
-  UINT GetItemState(UINT id, UINT flags) { return ::GetMenuState(_menu, id, flags);   }
+  UINT GetItemID(int pos) const { return ::GetMenuItemID(_menu, pos);   }
+  UINT GetItemState(UINT id, UINT flags)  const { return ::GetMenuState(_menu, id, flags);   }
   #endif
   
-  bool GetItemInfo(UINT itemIndex, bool byPosition, LPMENUITEMINFO itemInfo)
+  bool GetItemInfo(UINT itemIndex, bool byPosition, LPMENUITEMINFO itemInfo) const
     { return BOOLToBool(::GetMenuItemInfo(_menu, itemIndex, BoolToBOOL(byPosition), itemInfo)); }
   bool SetItemInfo(UINT itemIndex, bool byPosition, LPMENUITEMINFO itemInfo)
     { return BOOLToBool(::SetMenuItemInfo(_menu, itemIndex, BoolToBOOL(byPosition), itemInfo)); }
@@ -118,7 +130,7 @@ public:
   void RemoveAllItems() { RemoveAllItemsFrom(0); }
 
   #ifndef _UNICODE
-  bool GetItemInfo(UINT itemIndex, bool byPosition, LPMENUITEMINFOW itemInfo)
+  bool GetItemInfo(UINT itemIndex, bool byPosition, LPMENUITEMINFOW itemInfo) const
     { return BOOLToBool(::GetMenuItemInfoW(_menu, itemIndex, BoolToBOOL(byPosition), itemInfo)); }
   bool InsertItem(UINT itemIndex, bool byPosition, LPMENUITEMINFOW itemInfo)
     { return BOOLToBool(::InsertMenuItemW(_menu, itemIndex, BoolToBOOL(byPosition), itemInfo)); }
@@ -127,7 +139,7 @@ public:
   bool AppendItem(UINT flags, UINT_PTR newItemID, LPCWSTR newItem);
   #endif
 
-  bool GetItem(UINT itemIndex, bool byPosition, CMenuItem &item);
+  bool GetItem(UINT itemIndex, bool byPosition, CMenuItem &item) const;
   bool SetItem(UINT itemIndex, bool byPosition, const CMenuItem &item);
   bool InsertItem(UINT itemIndex, bool byPosition, const CMenuItem &item);
 
@@ -147,10 +159,10 @@ class CMenuDestroyer
   CMenu *_menu;
 public:
   CMenuDestroyer(CMenu &menu): _menu(&menu) {}
-  CMenuDestroyer(): _menu(0) {}
+  CMenuDestroyer(): _menu(NULL) {}
   ~CMenuDestroyer() { if (_menu) _menu->Destroy(); }
   void Attach(CMenu &menu) { _menu = &menu; }
-  void Disable() { _menu = 0; }
+  void Disable() { _menu = NULL; }
 };
 
 }