From 42afe8cca0522a88016eb893c3deffb9a44ddb64 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 31 Mar 2012 17:35:39 +0000 Subject: [PATCH] 2012-03-31 19:29 UTC+0200 Viktor Szakats (harbour syenar.net) * config/win/global.mk * config/rules.mk * moved UNICODE enabler logic to win platform make files, similarly to wce. * contrib/gtwvg/gtwvg.hbp * contrib/gtwvg/wvtwin.ch % deleted forced -DUNICODE option % deleted unused non-UNICODE macros from Harbour level header --- harbour/ChangeLog | 11 +++ harbour/config/rules.mk | 5 - harbour/config/win/global.mk | 2 + harbour/contrib/gtwvg/gtwvg.hbp | 2 - harbour/contrib/gtwvg/wvtwin.ch | 160 ++++++-------------------------- 5 files changed, 39 insertions(+), 141 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1f00a8259f..a130b13a2c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,17 @@ The license applies to all entries newer than 2009-04-28. */ +2012-03-31 19:29 UTC+0200 Viktor Szakats (harbour syenar.net) + * config/win/global.mk + * config/rules.mk + * moved UNICODE enabler logic to win platform make files, + similarly to wce. + + * contrib/gtwvg/gtwvg.hbp + * contrib/gtwvg/wvtwin.ch + % deleted forced -DUNICODE option + % deleted unused non-UNICODE macros from Harbour level header + 2012-03-31 18:55 UTC+0200 Viktor Szakats (harbour syenar.net) * config/win/global.mk * Makefile diff --git a/harbour/config/rules.mk b/harbour/config/rules.mk index 6ce95bc669..b800c40649 100644 --- a/harbour/config/rules.mk +++ b/harbour/config/rules.mk @@ -14,11 +14,6 @@ else endif endif -# Handle it here, so that it can be disabled for individual libs -ifeq ($(HB_PLATFORM),win) - HB_CFLAGS += -DUNICODE -endif - ifeq ($(HB_DYN_COPT),) OBJ_DYN_POSTFIX := else diff --git a/harbour/config/win/global.mk b/harbour/config/win/global.mk index baa5a3a2b8..0f8fb59683 100644 --- a/harbour/config/win/global.mk +++ b/harbour/config/win/global.mk @@ -8,6 +8,8 @@ RES_EXT := .res BIN_EXT := .exe DYN_EXT := .dll +HB_CFLAGS += -DUNICODE + HB_GT_LIBS += gtwvt gtgui gtwin # kernel32: needed by some compilers (pocc/watcom) diff --git a/harbour/contrib/gtwvg/gtwvg.hbp b/harbour/contrib/gtwvg/gtwvg.hbp index d5f0546b66..49b25964f5 100644 --- a/harbour/contrib/gtwvg/gtwvg.hbp +++ b/harbour/contrib/gtwvg/gtwvg.hbp @@ -9,8 +9,6 @@ -w3 -es2 --DUNICODE - -stop{!win|hbdyn} hbwin.hbc diff --git a/harbour/contrib/gtwvg/wvtwin.ch b/harbour/contrib/gtwvg/wvtwin.ch index 9ecc6f9c18..70dd374c8a 100644 --- a/harbour/contrib/gtwvg/wvtwin.ch +++ b/harbour/contrib/gtwvg/wvtwin.ch @@ -1387,15 +1387,9 @@ #define TB_SETMAXTEXTROWS (WM_USER + 60) #define TB_GETTEXTROWS (WM_USER + 61) -#ifdef UNICODE #define TB_GETBUTTONTEXT TB_GETBUTTONTEXTW #define TB_SAVERESTORE TB_SAVERESTOREW #define TB_ADDSTRING TB_ADDSTRINGW -#else -#define TB_GETBUTTONTEXT TB_GETBUTTONTEXTA -#define TB_SAVERESTORE TB_SAVERESTOREA -#define TB_ADDSTRING TB_ADDSTRINGA -#endif #define TB_GETOBJECT (WM_USER + 62) // wParam == IID, lParam void **ppv #define TB_GETHOTITEM (WM_USER + 71) @@ -1424,11 +1418,7 @@ #define TB_GETUNICODEFORMAT CCM_GETUNICODEFORMAT #define TB_MAPACCELERATORW (WM_USER + 90) // wParam == ch, lParam int * pidBtn -#ifdef UNICODE #define TB_MAPACCELERATOR TB_MAPACCELERATORW -#else -#define TB_MAPACCELERATOR TB_MAPACCELERATORA -#endif #define TBIMHT_AFTER 1 // TRUE = insert After iButton, otherwise before #define TBIMHT_BACKGROUND 2 // TRUE iff missed buttons completely @@ -1445,37 +1435,22 @@ #define TBIF_BYINDEX 2147483648 // this specifies that the wparam in Get/SetButtonInfo is an index, not id -#ifdef UNICODE #define TBBUTTONINFO TBBUTTONINFOW #define LPTBBUTTONINFO LPTBBUTTONINFOW -#else -#define TBBUTTONINFO TBBUTTONINFOA -#define LPTBBUTTONINFO LPTBBUTTONINFOA -#endif #define TB_GETBUTTONINFOW (WM_USER + 63) #define TB_SETBUTTONINFOW (WM_USER + 64) #define TB_GETBUTTONINFOA (WM_USER + 65) #define TB_SETBUTTONINFOA (WM_USER + 66) -#ifdef UNICODE #define TB_GETBUTTONINFO TB_GETBUTTONINFOW #define TB_SETBUTTONINFO TB_SETBUTTONINFOW -#else -#define TB_GETBUTTONINFO TB_GETBUTTONINFOA -#define TB_SETBUTTONINFO TB_SETBUTTONINFOA -#endif #define TB_INSERTBUTTONW (WM_USER + 67) #define TB_ADDBUTTONSW (WM_USER + 68) #define TB_ADDBUTTONSA (WM_USER + 20) #define TB_HITTEST (WM_USER + 69) -#ifdef UNICODE #define TB_INSERTBUTTON TB_INSERTBUTTONW #define TB_ADDBUTTONS TB_ADDBUTTONSW -#else -#define TB_INSERTBUTTON TB_INSERTBUTTONA -#define TB_ADDBUTTONS TB_ADDBUTTONSA -#endif #define TB_SETDRAWTEXTFLAGS (WM_USER + 70) #define TB_GETSTRING (WM_USER + 92) @@ -1627,19 +1602,11 @@ #define SB_GETTEXTLENGTHA (WM_USER+3) #define SB_GETTEXTLENGTHW (WM_USER+12) -#ifdef UNICODE #define SB_GETTEXT SB_GETTEXTW #define SB_SETTEXT SB_SETTEXTW #define SB_GETTEXTLENGTH SB_GETTEXTLENGTHW #define SB_SETTIPTEXT SB_SETTIPTEXTW #define SB_GETTIPTEXT SB_GETTIPTEXTW -#else -#define SB_GETTEXT SB_GETTEXTA -#define SB_SETTEXT SB_SETTEXTA -#define SB_GETTEXTLENGTH SB_GETTEXTLENGTHA -#define SB_SETTIPTEXT SB_SETTIPTEXTA -#define SB_GETTIPTEXT SB_GETTIPTEXTA -#endif #define SB_SETPARTS (WM_USER+4) #define SB_GETPARTS (WM_USER+6) @@ -1712,11 +1679,7 @@ #define WC_TREEVIEWA "SysTreeView32" #define WC_TREEVIEWW L"SysTreeView32" -#ifdef UNICODE - #define WC_TREEVIEW WC_TREEVIEWW -#else - #define WC_TREEVIEW WC_TREEVIEWA -#endif +#define WC_TREEVIEW WC_TREEVIEWW #define TVS_HASBUTTONS 1 #define TVS_HASLINES 2 @@ -1766,13 +1729,8 @@ #define LPTV_ITEM LPTVITEM #define TV_ITEM TVITEM -#ifdef UNICODE - #define TVITEM TVITEMW - #define LPTVITEM LPTVITEMW -#else - #define TVITEM TVITEMA - #define LPTVITEM LPTVITEMA -#endif +#define TVITEM TVITEMW +#define LPTVITEM LPTVITEMW #define TVI_ROOT (-0x10000) #define TVI_FIRST (-0x0FFFF) @@ -1789,11 +1747,7 @@ #define TVM_INSERTITEMA (TV_FIRST + 0) #define TVM_INSERTITEMW (TV_FIRST + 50) -#ifdef UNICODE - #define TVM_INSERTITEM TVM_INSERTITEMW -#else - #define TVM_INSERTITEM TVM_INSERTITEMA -#endif +#define TVM_INSERTITEM TVM_INSERTITEMW #define TVM_DELETEITEM (TV_FIRST + 1) #define TVM_EXPAND (TV_FIRST + 2) @@ -1830,28 +1784,16 @@ #define TVM_GETITEMA (TV_FIRST + 12) #define TVM_GETITEMW (TV_FIRST + 62) -#ifdef UNICODE - #define TVM_GETITEM TVM_GETITEMW -#else - #define TVM_GETITEM TVM_GETITEMA -#endif +#define TVM_GETITEM TVM_GETITEMW #define TVM_SETITEMA (TV_FIRST + 13) #define TVM_SETITEMW (TV_FIRST + 63) -#ifdef UNICODE - #define TVM_SETITEM TVM_SETITEMW -#else - #define TVM_SETITEM TVM_SETITEMA -#endif +#define TVM_SETITEM TVM_SETITEMW #define TVM_EDITLABELA (TV_FIRST + 14) #define TVM_EDITLABELW (TV_FIRST + 65) -#ifdef UNICODE - #define TVM_EDITLABEL TVM_EDITLABELW -#else - #define TVM_EDITLABEL TVM_EDITLABELA -#endif +#define TVM_EDITLABEL TVM_EDITLABELW #define TVM_GETEDITCONTROL (TV_FIRST + 15) #define TVM_GETVISIBLECOUNT (TV_FIRST + 16) #define TVM_HITTEST (TV_FIRST + 17) @@ -1880,12 +1822,7 @@ #define TVM_ENDEDITLABELNOW (TV_FIRST + 22) #define TVM_GETISEARCHSTRINGA (TV_FIRST + 23) #define TVM_GETISEARCHSTRINGW (TV_FIRST + 64) - -#ifdef UNICODE - #define TVM_GETISEARCHSTRING TVM_GETISEARCHSTRINGW -#else - #define TVM_GETISEARCHSTRING TVM_GETISEARCHSTRINGA -#endif +#define TVM_GETISEARCHSTRING TVM_GETISEARCHSTRINGW #define TVM_SETTOOLTIPS (TV_FIRST + 24) #define TVM_GETTOOLTIPS (TV_FIRST + 25) @@ -1916,14 +1853,8 @@ #define LPNM_TREEVIEW LPNMTREEVIEW #define NM_TREEVIEW NMTREEVIEW - -#ifdef UNICODE - #define NMTREEVIEW NMTREEVIEWW - #define LPNMTREEVIEW LPNMTREEVIEWW -#else - #define NMTREEVIEW NMTREEVIEWA - #define LPNMTREEVIEW LPNMTREEVIEWA -#endif +#define NMTREEVIEW NMTREEVIEWW +#define LPNMTREEVIEW LPNMTREEVIEWW #define TVN_SELCHANGINGA (TVN_FIRST-1) #define TVN_SELCHANGINGW (TVN_FIRST-50) @@ -1945,13 +1876,8 @@ #define TV_DISPINFOW NMTVDISPINFOW #define TV_DISPINFO NMTVDISPINFO -#ifdef UNICODE - #define NMTVDISPINFO NMTVDISPINFOW - #define LPNMTVDISPINFO LPNMTVDISPINFOW -#else - #define NMTVDISPINFO NMTVDISPINFOA - #define LPNMTVDISPINFO LPNMTVDISPINFOA -#endif +#define NMTVDISPINFO NMTVDISPINFOW +#define LPNMTVDISPINFO LPNMTVDISPINFOW #define TVN_ITEMEXPANDINGA (TVN_FIRST-5) #define TVN_ITEMEXPANDINGW (TVN_FIRST-54) @@ -1979,41 +1905,21 @@ #define TV_KEYDOWN NMTVKEYDOWN -#ifdef UNICODE - #define TVN_SELCHANGING TVN_SELCHANGINGW - #define TVN_SELCHANGED TVN_SELCHANGEDW - #define TVN_GETDISPINFO TVN_GETDISPINFOW - #define TVN_SETDISPINFO TVN_SETDISPINFOW - #define TVN_ITEMEXPANDING TVN_ITEMEXPANDINGW - #define TVN_ITEMEXPANDED TVN_ITEMEXPANDEDW - #define TVN_BEGINDRAG TVN_BEGINDRAGW - #define TVN_BEGINRDRAG TVN_BEGINRDRAGW - #define TVN_DELETEITEM TVN_DELETEITEMW - #define TVN_BEGINLABELEDIT TVN_BEGINLABELEDITW - #define TVN_ENDLABELEDIT TVN_ENDLABELEDITW -#else - #define TVN_SELCHANGING TVN_SELCHANGINGA - #define TVN_SELCHANGED TVN_SELCHANGEDA - #define TVN_GETDISPINFO TVN_GETDISPINFOA - #define TVN_SETDISPINFO TVN_SETDISPINFOA - #define TVN_ITEMEXPANDING TVN_ITEMEXPANDINGA - #define TVN_ITEMEXPANDED TVN_ITEMEXPANDEDA - #define TVN_BEGINDRAG TVN_BEGINDRAGA - #define TVN_BEGINRDRAG TVN_BEGINRDRAGA - #define TVN_DELETEITEM TVN_DELETEITEMA - #define TVN_BEGINLABELEDIT TVN_BEGINLABELEDITA - #define TVN_ENDLABELEDIT TVN_ENDLABELEDITA -#endif +#define TVN_SELCHANGING TVN_SELCHANGINGW +#define TVN_SELCHANGED TVN_SELCHANGEDW +#define TVN_GETDISPINFO TVN_GETDISPINFOW +#define TVN_SETDISPINFO TVN_SETDISPINFOW +#define TVN_ITEMEXPANDING TVN_ITEMEXPANDINGW +#define TVN_ITEMEXPANDED TVN_ITEMEXPANDEDW +#define TVN_BEGINDRAG TVN_BEGINDRAGW +#define TVN_BEGINRDRAG TVN_BEGINRDRAGW +#define TVN_DELETEITEM TVN_DELETEITEMW +#define TVN_BEGINLABELEDIT TVN_BEGINLABELEDITW +#define TVN_ENDLABELEDIT TVN_ENDLABELEDITW -#ifdef UNICODE - #define TVN_GETINFOTIP TVN_GETINFOTIPW - #define NMTVGETINFOTIP NMTVGETINFOTIPW - #define LPNMTVGETINFOTIP LPNMTVGETINFOTIPW -#else - #define TVN_GETINFOTIP TVN_GETINFOTIPA - #define NMTVGETINFOTIP NMTVGETINFOTIPA - #define LPNMTVGETINFOTIP LPNMTVGETINFOTIPA -#endif +#define TVN_GETINFOTIP TVN_GETINFOTIPW +#define NMTVGETINFOTIP NMTVGETINFOTIPW +#define LPNMTVGETINFOTIP LPNMTVGETINFOTIPW #define TVCDRF_NOIMAGES 65536 @@ -2113,7 +2019,6 @@ #define TTM_SETTITLEA (WM_USER + 32) // wParam = TTI_*, lParam = char* szTitle #define TTM_SETTITLEW (WM_USER + 33) // wParam = TTI_*, lParam = wchar* szTitle -#ifdef UNICODE #define TTM_ADDTOOL TTM_ADDTOOLW #define TTM_DELTOOL TTM_DELTOOLW #define TTM_NEWTOOLRECT TTM_NEWTOOLRECTW @@ -2125,19 +2030,6 @@ #define TTM_ENUMTOOLS TTM_ENUMTOOLSW #define TTM_GETCURRENTTOOL TTM_GETCURRENTTOOLW #define TTM_SETTITLE TTM_SETTITLEW -#else -#define TTM_ADDTOOL TTM_ADDTOOLA -#define TTM_DELTOOL TTM_DELTOOLA -#define TTM_NEWTOOLRECT TTM_NEWTOOLRECTA -#define TTM_GETTOOLINFO TTM_GETTOOLINFOA -#define TTM_SETTOOLINFO TTM_SETTOOLINFOA -#define TTM_HITTEST TTM_HITTESTA -#define TTM_GETTEXT TTM_GETTEXTA -#define TTM_UPDATETIPTEXT TTM_UPDATETIPTEXTA -#define TTM_ENUMTOOLS TTM_ENUMTOOLSA -#define TTM_GETCURRENTTOOL TTM_GETCURRENTTOOLA -#define TTM_SETTITLE TTM_SETTITLEA -#endif /*----------------------------------------------------------------------*/