From 567a9fb9e5531eda49f5b33a78991b040ce41e1d Mon Sep 17 00:00:00 2001
From: justin1014 <justin1014@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Wed, 18 Sep 2002 18:39:24 +0000
Subject: [PATCH] Added NSIS_CONFIG_ENHANCEDUI_SUPPORT to config.h

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1031 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/build.cpp  |  8 ++++++--
 Source/script.cpp | 12 ++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Source/build.cpp b/Source/build.cpp
index a540ebb3..c130d3b5 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -1126,7 +1126,9 @@ int CEXEBuild::write_output(void)
       if (resolve_call_int("uninstall callback","un.callbacks",ns_func.find("un.onUninstFailed",0),&build_uninst.common.code_onInstFailed)) return PS_ERROR;
       if (resolve_call_int("uninstall callback","un.callbacks",ns_func.find("un.onUserAbort",0),&build_uninst.common.code_onUserAbort)) return PS_ERROR;
       if (resolve_call_int("uninstall callback","un.callbacks",ns_func.find("un.onNextPage",0),&build_uninst.common.code_onNextPage)) return PS_ERROR;
+    #ifdef NSIS_CONFIG_ENHANCEDUI_SUPPORT
       if (resolve_call_int("uninstall callback","un.callbacks",ns_func.find("un.onInitDialog",0),&build_uninst.common.code_onInitDialog)) return PS_ERROR;
+    #endif
   #endif//NSIS_SUPPORT_CODECALLBACKS
       if (resolve_coderefs("uninstall")) return PS_ERROR;
       set_uninstall_mode(0);
@@ -1148,8 +1150,10 @@ int CEXEBuild::write_output(void)
   if (resolve_call_int("install callback",".callbacks",ns_func.find(".onVerifyInstDir",0),&build_header.code_onVerifyInstDir)) return PS_ERROR;
   if (resolve_call_int("install callback",".callbacks",ns_func.find(".onNextPage",0),&build_header.common.code_onNextPage)) return PS_ERROR;
   if (resolve_call_int("install callback",".callbacks",ns_func.find(".onPrevPage",0),&build_header.code_onPrevPage)) return PS_ERROR;
-  if (resolve_call_int("install callback",".callbacks",ns_func.find(".onInitDialog",0),&build_header.common.code_onInitDialog)) return PS_ERROR;
-  if (resolve_call_int("install callback",".callbacks",ns_func.find(".onMouseOverSection",0),&build_header.code_onMouseOverSection)) return PS_ERROR;
+  #ifdef NSIS_CONFIG_ENHANCEDUI_SUPPORT
+    if (resolve_call_int("install callback",".callbacks",ns_func.find(".onInitDialog",0),&build_header.common.code_onInitDialog)) return PS_ERROR;
+    if (resolve_call_int("install callback",".callbacks",ns_func.find(".onMouseOverSection",0),&build_header.code_onMouseOverSection)) return PS_ERROR;
+  #endif
 #ifdef NSIS_CONFIG_COMPONENTPAGE
   if (resolve_call_int("install callback",".callbacks",ns_func.find(".onSelChange",0),&build_header.code_onSelChange)) return PS_ERROR;
 #endif//NSIS_CONFIG_COMPONENTPAGE
diff --git a/Source/script.cpp b/Source/script.cpp
index 37bc98ac..a19b4557 100644
--- a/Source/script.cpp
+++ b/Source/script.cpp
@@ -2335,6 +2335,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
           process_jump(line,3,&ent.offsets[2])) PRINTHELP()
       SCRIPT_MSG("IsWindow(%s): %s:%s\n",line.gettoken_str(1),line.gettoken_str(2),line.gettoken_str(3));
     return add_entry(&ent);
+#ifdef NSIS_CONFIG_ENHANCEDUI_SUPPORT
     case TOK_GETDLGITEM:
       ent.which=EW_GETDLGITEM;
       ent.offsets[0]=line.gettoken_enum(1,usrvars);
@@ -2350,6 +2351,12 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
       ent.offsets[2]=add_string(line.gettoken_str(2));
       SCRIPT_MSG("SetStaticBkColor: handle=%s color=%s\n",line.gettoken_str(1),line.gettoken_str(2));
     return add_entry(&ent);
+#else//NSIS_CONFIG_ENHANCEDUI_SUPPORT
+    case TOK_GETDLGITEM:
+    case TOK_SETSTATICBKCOLOR:
+      ERROR_MSG("Error: %s specified, NSIS_CONFIG_ENHANCEDUI_SUPPORT not defined.\n",  line.gettoken_str(0));
+    return PS_ERROR;
+#endif//NSIS_CONFIG_ENHANCEDUI_SUPPORT
 #else//!NSIS_SUPPORT_HWNDS
     case TOK_ISWINDOW:
     case TOK_SENDMESSAGE:
@@ -3441,6 +3448,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
     return PS_ERROR;
 #endif// NSIS_CONFIG_VISIBLE_SUPPORT
     case TOK_CREATEFONT:
+#ifdef NSIS_CONFIG_ENHANCEDUI_SUPPORT
       ent.which=EW_CREATEFONT;
       ent.offsets[0]=line.gettoken_enum(1,usrvars);
       ent.offsets[1]=add_string(line.gettoken_str(2));
@@ -3492,6 +3500,10 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
       }
       SCRIPT_MSG("\n");
     return add_entry(&ent);
+#else//NSIS_CONFIG_ENHANCEDUI_SUPPORT
+    ERROR_MSG("Error: %s specified, NSIS_CONFIG_ENHANCEDUI_SUPPORT not defined.\n",line.gettoken_str(0));
+    return PS_ERROR;
+#endif//!NSIS_SUPPORT_CREATEFONT
 
     // end of instructions
     ///////////////////////////////////////////////////////////////////////////////