9.06 beta

1 files changed, 15 insertions, 13 deletions

diff --git a/CPP/Windows/Control/ComboBox.h b/CPP/Windows/Control/ComboBox.h
index 58c86703..aa0eb930 100755
--- a/CPP/Windows/Control/ComboBox.h
+++ b/CPP/Windows/Control/ComboBox.h
@@ -3,11 +3,10 @@
 #ifndef __WINDOWS_CONTROL_COMBOBOX_H
 #define __WINDOWS_CONTROL_COMBOBOX_H
 
-#include "Windows/Window.h"
-#include "Windows/Defs.h"
-
 #include <commctrl.h>
 
+#include "../Window.h"
+
 namespace NWindows {
 namespace NControl {
 
@@ -15,33 +14,34 @@ class CComboBox: public CWindow
 {
 public:
   void ResetContent() { SendMessage(CB_RESETCONTENT, 0, 0); }
-  LRESULT AddString(LPCTSTR string) { return SendMessage(CB_ADDSTRING, 0, (LPARAM)string); }
+  LRESULT AddString(LPCTSTR s) { return SendMessage(CB_ADDSTRING, 0, (LPARAM)s); }
   #ifndef _UNICODE
-  LRESULT AddString(LPCWSTR string);
+  LRESULT AddString(LPCWSTR s);
   #endif
   LRESULT SetCurSel(int index) { return SendMessage(CB_SETCURSEL, index, 0); }
   int GetCurSel() { return (int)SendMessage(CB_GETCURSEL, 0, 0); }
   int GetCount() { return (int)SendMessage(CB_GETCOUNT, 0, 0); }
   
   LRESULT GetLBTextLen(int index) { return SendMessage(CB_GETLBTEXTLEN, index, 0); }
-  LRESULT GetLBText(int index, LPTSTR string) { return SendMessage(CB_GETLBTEXT, index, (LPARAM)string); }
+  LRESULT GetLBText(int index, LPTSTR s) { return SendMessage(CB_GETLBTEXT, index, (LPARAM)s); }
   LRESULT GetLBText(int index, CSysString &s);
   #ifndef _UNICODE
   LRESULT GetLBText(int index, UString &s);
   #endif
 
-  LRESULT SetItemData(int index, LPARAM lParam)
-    { return SendMessage(CB_SETITEMDATA, index, lParam); }
-  LRESULT GetItemData(int index)
-    { return SendMessage(CB_GETITEMDATA, index, 0); }
+  LRESULT SetItemData(int index, LPARAM lParam) { 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);  }
+  void ShowDropDown(bool show = true) { SendMessage(CB_SHOWDROPDOWN, show ? TRUE : FALSE, 0);  }
 };
 
+#ifndef UNDER_CE
+
 class CComboBoxEx: public CComboBox
 {
 public:
+  bool SetUnicodeFormat(bool fUnicode) { return LRESULTToBool(SendMessage(CBEM_SETUNICODEFORMAT, BOOLToBool(fUnicode), 0)); }
+
   LRESULT DeleteItem(int index) { return SendMessage(CBEM_DELETEITEM, index, 0); }
   LRESULT InsertItem(COMBOBOXEXITEM *item) { return SendMessage(CBEM_INSERTITEM, 0, (LPARAM)item); }
   #ifndef _UNICODE
@@ -54,6 +54,8 @@ public:
   HIMAGELIST SetImageList(HIMAGELIST imageList) { return (HIMAGELIST)SendMessage(CBEM_SETIMAGELIST, 0, (LPARAM)imageList); }
 };
 
+#endif
+
 }}
 
-#endif
\ No newline at end of file
+#endif