aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Smith <dannysmith@users.sourceforge.net>2002-07-24 21:57:01 +0000
committerDanny Smith <dannysmith@users.sourceforge.net>2002-07-24 21:57:01 +0000
commit6ebbcd256328d054f0b906dab8b074f6521905a6 (patch)
tree846bd3fe1960c55077c43f44ff524ea2cb9cb906
parentb0054da2c0c42c26f4af141ffe57dc018e7b2ab8 (diff)
downloadnewlib-6ebbcd256328d054f0b906dab8b074f6521905a6.zip
newlib-6ebbcd256328d054f0b906dab8b074f6521905a6.tar.gz
newlib-6ebbcd256328d054f0b906dab8b074f6521905a6.tar.bz2
* include/shlobj.h (BFFM_VALIDATEFAILED[AW]): Add defines.
(BFFM_SETSTATUSTEXT, BFFM_SETSELECTION): UNICODE them.
-rw-r--r--winsup/w32api/ChangeLog5
-rw-r--r--winsup/w32api/include/shlobj.h17
2 files changed, 20 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 43ace8f..20c8f27 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-25 Danny Smith <dannysmith@users.sourceforge.net>
+
+ * include/shlobj.h (BFFM_VALIDATEFAILED[AW]): Add defines.
+ (BFFM_SETSTATUSTEXT, BFFM_SETSELECTION): UNICODE them.
+
2002-07-25 Mattia Barbon <mbarbon@dsi.unive.it>
* include/commctrl.h: Avoid redefinition of CDN_FIRST/LAST.
diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h
index 70264ab..4793a9e 100644
--- a/winsup/w32api/include/shlobj.h
+++ b/winsup/w32api/include/shlobj.h
@@ -29,9 +29,22 @@ extern "C" {
#define BIF_SHAREABLE 0x8000
#define BFFM_INITIALIZED 1
#define BFFM_SELCHANGED 2
-#define BFFM_SETSTATUSTEXT (WM_USER + 100)
+#define BFFM_VALIDATEFAILEDA 3
+#define BFFM_VALIDATEFAILEDW 4
+#define BFFM_SETSTATUSTEXTA (WM_USER + 100)
+#define BFFM_SETSTATUSTEXTW (WM_USER + 104)
#define BFFM_ENABLEOK (WM_USER + 101)
-#define BFFM_SETSELECTION (WM_USER + 102)
+#define BFFM_SETSELECTIONA (WM_USER + 102)
+#define BFFM_SETSELECTIONW (WM_USER + 103)
+#ifdef UNICODE
+#define BFFM_SETSTATUSTEXT BFFM_SETSTATUSTEXTW
+#define BFFM_SETSELECTION BFFM_SETSELECTIONW
+#define BFFM_VALIDATEFAILED BFFM_VALIDATEFAILEDW
+#else
+#define BFFM_SETSTATUSTEXT BFFM_SETSTATUSTEXTA
+#define BFFM_SETSELECTION BFFM_SETSELECTIONA
+#define BFFM_VALIDATEFAILED BFFM_VALIDATEFAILEDA
+#endif
#define DVASPECT_SHORTNAME 2
#define SHARD_PIDL 1
#define SHARD_PATH 2