INTEGRATION: CWS dba24b (1.156.46); FILE MERGED

2007/08/27 10:50:38 fs 1.156.46.1: prepare #i80930#: outsourced all the advanced settings into dedicated pages (they were never needed by more than one instance of the CommonBehaviourPage)

1 files changed, 9 insertions, 374 deletions

diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index 25b6ec6d8..1226eae09 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dbadmin.src,v $
  *
- *  $Revision: 1.156 $
+ *  $Revision: 1.157 $
  *
- *  last change: $Author: rt $ $Date: 2007-04-24 16:09:26 $
+ *  last change: $Author: hr $ $Date: 2007-11-01 15:11:01 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -52,256 +52,16 @@
 #include "AdabasPage.hrc"
 #endif
 
-#define ADVANCED_PAGE_X		200
-
-#define ADVANCED_CHECKBOX_OPTIONS    11
-#define ADVANCED_LISTBOX_OPTIONS      1
-#define ADVANCED_PAGE_Y \
-    /* top space */     START_X + \
-    /* label */         FIXEDTEXT_HEIGHT + RELATED_CONTROLS + \
-    /* check boxes */   ( ADVANCED_CHECKBOX_OPTIONS * ( CHECKBOX_HEIGHT + RELATED_CONTROLS ) ) + \
-    /* list boxes */    ( ADVANCED_LISTBOX_OPTIONS * ( LISTBOX_HEIGHT + RELATED_CONTROLS ) ) + \
-    /* bottom space */  START_Y - RELATED_CONTROLS
-//#define ADVANCED_PAGE_Y		(105 + 5*CHECKBOX_HEIGHT + 4*RELATED_CONTROLS)
-
-#define _LB_BOOLEANCOMPARISON                                   \
-        StringList [ en-US ] =                                  \
-        {                                                       \
-            < "Default" ; Default ; > ;                         \
-            < "SQL" ; Default ; > ;                             \
-            < "Mixed" ; Default ; > ;                           \
-            < "MS Access" ; Default ; > ;                       \
-        };                                                      
-
-
-//-------------------------------------------------------------------------
-
-#define AUTO_APPENDTABLEALIAS(AUTO_Y)												\
-    CheckBox CB_APPENDTABLEALIAS													\
-    {																				\
-        Pos		= MAP_APPFONT ( 6 , AUTO_Y ) ;										\
-        Size	= MAP_APPFONT ( ADVANCED_PAGE_X -12  , CHECKBOX_HEIGHT ) ;			\
-        TabStop = TRUE ;															\
-        HelpId = HID_DSADMIN_APPENDTABLEALIAS;										\
-        Text[ en-US ] = "Append the table alias name on SELECT statements";	        \
-    };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_AS_BEFORE_CORR_NAME(AUTO_Y)											\
-    CheckBox CB_AS_BEFORE_CORR_NAME													\
-    {																				\
-        Pos		= MAP_APPFONT ( 6 , AUTO_Y ) ;										\
-        Size	= MAP_APPFONT ( ADVANCED_PAGE_X -12  , CHECKBOX_HEIGHT ) ;			\
-        TabStop = TRUE ;															\
-        HelpId = HID_DSADMIN_AS_BEFORE_CORRELATION_NAME;							\
-        Text[ en-US ] = "Use keyword AS before table alias names";                  \
-    };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_IGNOREINDEXAPPENDIX(AUTO_Y)											\
-    CheckBox CB_IGNOREINDEXAPPENDIX													\
-    {																				\
-        Pos		= MAP_APPFONT ( 6 , AUTO_Y ) ;										\
-        Size	= MAP_APPFONT ( ADVANCED_PAGE_X -12  , CHECKBOX_HEIGHT ) ;			\
-        TabStop = TRUE ;															\
-        HelpId = HID_DSADMIN_IGNOREINDEXAPPENDIX;									\
-        Text[ en-US ] = "Create index with ASC or DESC statement";			\
-    };
-
-
-//-------------------------------------------------------------------------
-
-#define AUTO_SUPPRESVERSIONCOLUMN(AUTO_Y)											\
-    CheckBox CB_SUPPRESVERSIONCL													\
-    {																				\
-        Pos		= MAP_APPFONT ( 6 , AUTO_Y ) ;										\
-        Size	= MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ;			\
-        Group	= TRUE ;															\
-        TabStop = TRUE ;															\
-        HelpId = HID_DSADMIN_SUPPRESS_VERSIONCL;									\
-        Text [ en-US ] = "Display version columns (when available)";			    \
-    };
-
-
-//-------------------------------------------------------------------------
-
-#define AUTO_ENABLEOUTERJOIN(AUTO_Y)											    \
-    CheckBox CB_ENABLEOUTERJOIN														\
-    {																				\
-        Pos		= MAP_APPFONT ( 6 , AUTO_Y ) ;										\
-        Size	= MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ;			\
-        Group	= TRUE ;															\
-        TabStop = TRUE ;															\
-        HelpId = HID_DSADMIN_ENABLEOUTERJOIN;										\
-        Text [ en-US ] = "Use Outer Join syntax '{OJ }'";						\
-    };
-
-
-//-------------------------------------------------------------------------
-
-#define AUTO_DOSLINEENDS(AUTO_Y)											\
-    CheckBox CB_DOSLINEENDS															\
-    {																				\
-        Pos		= MAP_APPFONT ( 6 , AUTO_Y ) ;										\
-        Size	= MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ;			\
-        Group	= TRUE ;															\
-        TabStop = TRUE ;															\
-        HelpId = HID_DSADMIN_DOSLINEENDS;											\
-        Text [ en-US ] = "End text lines with CR+LF";							\
-    };
-
-
-//-------------------------------------------------------------------------
-
-#define AUTO_SCHEMA(AUTO_Y)											\
-    CheckBox CB_SCHEMA														\
-    {																				\
-        Pos		= MAP_APPFONT ( 6 , AUTO_Y ) ;										\
-        Size	= MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ;			\
-        Group	= TRUE ;															\
-        TabStop = TRUE ;															\
-        HelpId = HID_DSADMIN_SCHEMA;												\
-        Text [ en-US ] = "Use schema name in SELECT statements";				\
-    };
-
-
 //-------------------------------------------------------------------------
 
-#define AUTO_CATALOG(AUTO_Y)											\
-    CheckBox CB_CATALOG														\
-    {																				\
-        Pos		= MAP_APPFONT ( 6 , AUTO_Y ) ;										\
-        Size	= MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ;			\
-        Group	= TRUE ;															\
-        TabStop = TRUE ;															\
-        HelpId = HID_DSADMIN_CATALOG;												\
-        Text [ en-US ] = "Use catalog name in SELECT statements";				\
-    };
-
-
-//-------------------------------------------------------------------------
-
-
-
-#define AUTO_BOOLEANCOMPARISON(AUTO_Y)							\
-    FixedText FT_BOOLEANCOMPARISON								\
+#define AUTO_USECATALOG(AUTO_Y)                                 \
+    CheckBox CB_USECATALOG										\
     {															\
-        Pos		= MAP_APPFONT ( 6 , AUTO_Y + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 ) ;   \
-        Size	= MAP_APPFONT ( 100 , CHECKBOX_HEIGHT );        \
-        Text [ en-US ] = "Comparison of Boolean values";		\
-    };															\
-    ListBox LB_BOOLEANCOMPARISON                                \
-    {                                                           \
-        Pos		= MAP_APPFONT ( 107 , AUTO_Y ) ;                \
-        Size	= MAP_APPFONT ( 60 , LISTBOX_HEIGHT ) ;         \
-        Group	= TRUE ;                                        \
-        TabStop = TRUE ;                                        \
-        SvLook = TRUE;                                          \
-        DropDown = TRUE;                                        \
-        Border = TRUE;                                          \
-        HelpId = HID_DSADMIN_BOOLEANCOMPARISON;                 \
-        _LB_BOOLEANCOMPARISON                                   \
-    };                                                          \
-
-
-//-------------------------------------------------------------------------
-
-#define AUTO_IGNOREDRIVER_PRIV(AUTO_Y)												\
-    CheckBox CB_IGNOREDRIVER_PRIV													\
-    {																				\
-        Pos		= MAP_APPFONT ( 6 , AUTO_Y ) ;										\
-        Size	= MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ;							\
-        TabStop = TRUE ;															\
-        HelpId = HID_DSADMIN_IGNOREDRIVER_PRIV;										\
-        Text[ en-US ] = "Ignore the privileges from the database driver";		\
-    };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_SQL92CHECK(AUTO_Y)														\
-    CheckBox CB_SQL92CHECK															\
-    {																				\
-        Pos		= MAP_APPFONT ( 6 , AUTO_Y) ;										\
-        Size	= MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ;							\
-        TabStop = TRUE ;															\
-        HelpId = HID_DSADMIN_SQL92CHECK;											\
-        Text[ en-US ] = "Use SQL92 naming constraints";						\
-    };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_USECATALOG(AUTO_Y)														\
-    CheckBox CB_USECATALOG																																	\
-    {																																						\
-        Pos		= MAP_APPFONT ( 6 ,AUTO_Y) ;																												\
-        Size	= MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ;																									\
-        TabStop = TRUE ;																																	\
-        HelpId = HID_DSADMIN_USECATALOG;																													\
-        Text[ en-US ] = "Use catalog for file-based databases";																						\
-    };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_PARAMETERNAMESUBST(AUTO_Y)												\
-    CheckBox CB_PARAMETERNAMESUBST													\
-    {																				\
-        Pos		= MAP_APPFONT ( 6 , AUTO_Y) ;										\
-        Size	= MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ;			\
-        TabStop = TRUE ;															\
-        HelpId = HID_DSADMIN_PARAMETERNAMESUBST;									\
-        Text[ en-US ] = "Replace named parameters with '?'";					\
-    };
-
-//-------------------------------------------------------------------------
-
-#define AUTO_INCREMENT_CONTROLS(AUTO_Y)										\
-    FixedLine FL_SEPARATORAUTO												\
-    {																		\
-        Pos = MAP_APPFONT ( 4 , AUTO_Y ) ;									\
-        Size = MAP_APPFONT ( ADVANCED_PAGE_X - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;						\
-        Text [ en-US ] = "Settings";									\
-    };																		\
-    CheckBox CB_RETRIEVE_AUTO												\
-    {																		\
-        Pos		= MAP_APPFONT ( 6 , AUTO_Y + FIXEDTEXT_HEIGHT + RELATED_CONTROLS) ;	\
-        Size	= MAP_APPFONT ( ADVANCED_PAGE_X - 2*UNRELATED_CONTROLS , CHECKBOX_HEIGHT ) ;					\
-        TabStop = TRUE ;													\
-        HelpId = HID_DSADMIN_AUTORETRIEVEENABLED;							\
-        Text [ en-US ] = "Re~trieve generated values";\
-    };																		\
-                                                                            \
-    FixedText FT_AUTOINCREMENTVALUE											\
-    {																		\
-        Pos		= MAP_APPFONT ( 15 , AUTO_Y + FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS + CHECKBOX_HEIGHT ) ;		\
-        Size = MAP_APPFONT ( ADVANCED_PAGE_X - 15 - 6 , FIXEDTEXT_HEIGHT ) ;			\
-        Text[ en-US ] = "~Auto-increment statement";\
-    };																		 \
-                                                                             \
-    Edit ET_AUTOINCREMENTVALUE												 \
-    {																		 \
-        Border = TRUE ;														 \
-        Pos		= MAP_APPFONT ( 15 , AUTO_Y + 2*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT + 3*RELATED_CONTROLS ) ;		 \
-        Size = MAP_APPFONT ( ADVANCED_PAGE_X - 15 - 2*UNRELATED_CONTROLS , EDIT_HEIGHT ) ;									 \
-        TabStop = TRUE ;													 \
-        HelpId = HID_DSADMIN_AUTOINCREMENTVALUE;							 \
-    };																		 \
-                                                                             \
-    FixedText FT_RETRIEVE_AUTO												 \
-    {																		 \
-        Pos		= MAP_APPFONT ( 15 , AUTO_Y + 2*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT + 4*RELATED_CONTROLS + EDIT_HEIGHT) ;		 \
-        Size = MAP_APPFONT ( ADVANCED_PAGE_X - 15 - 6 , 10 ) ;						 \
-        Text [ en-US ] = "~Query of generated values";\
-    };																		\
-                                                                            \
-    Edit ET_RETRIEVE_AUTO													\
-    {																		\
-        Border = TRUE ;														\
-        Pos		= MAP_APPFONT ( 15 , AUTO_Y + 3*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT + 5*RELATED_CONTROLS + EDIT_HEIGHT ) ;		\
-        Size = MAP_APPFONT ( ADVANCED_PAGE_X - 15 - 2*UNRELATED_CONTROLS, EDIT_HEIGHT ) ;									\
-        TabStop = TRUE ;													\
-        HelpId = HID_DSADMIN_RETRIEVE_AUTO;									\
+        Pos		= MAP_APPFONT ( 6 ,AUTO_Y) ;					\
+        Size	= MAP_APPFONT ( PAGE_X -12 , CHECKBOX_HEIGHT ) ;   \
+        TabStop = TRUE ;										\
+        HelpId = HID_DSADMIN_USECATALOG;						\
+        Text[ en-US ] = "Use catalog for file-based databases";	\
     };
 
 //-------------------------------------------------------------------------
@@ -332,16 +92,6 @@
 
 //-------------------------------------------------------------------------
 
-#define AUTO_DATAHANDLING(AUTO_Y)											\
-    FixedLine FL_DATAHANDLING												\
-    {																		\
-        Pos = MAP_APPFONT ( RELATED_CONTROLS , AUTO_Y ) ;					\
-        Size = MAP_APPFONT ( ADVANCED_PAGE_X - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ;		\
-        Text [ en-US ] = "Options";								\
-    };
-
-//-------------------------------------------------------------------------
-
 #define AUTO_SPECIAL_JDBC(AUTO_Y)																		\
     FixedLine FL_SEPARATOR1																				\
     {																									\
@@ -643,121 +393,6 @@ TabPage PAGE_ADO
 
 //.........................................................................
 
-TabPage PAGE_GENERATED_VALUES
-{
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
-    Hide = TRUE;
-    AUTO_INCREMENT_CONTROLS	( UNRELATED_CONTROLS)
-};
-
-//.........................................................................
-
-TabPage PAGE_DS_ADABAS_SETTINGS
-{
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
-    Hide = TRUE;
-    AUTO_DATAHANDLING(			  RELATED_CONTROLS )
-    AUTO_SQL92CHECK(			  RELATED_CONTROLS + FIXEDTEXT_HEIGHT +   RELATED_CONTROLS )
-    AUTO_APPENDTABLEALIAS(		2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT +   CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_SUPPRESVERSIONCOLUMN(	3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_DOSLINEENDS(			4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 3*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-    AUTO_BOOLEANCOMPARISON(		5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-};
-
-//.........................................................................
-
-TabPage PAGE_DS_ADO_SETTINGS
-{
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
-    Hide = TRUE;
-    AUTO_DATAHANDLING(			  RELATED_CONTROLS )
-    AUTO_SQL92CHECK(			1*RELATED_CONTROLS + FIXEDTEXT_HEIGHT +   RELATED_CONTROLS )
-    AUTO_APPENDTABLEALIAS(		2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 1*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_AS_BEFORE_CORR_NAME(   3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_ENABLEOUTERJOIN(		4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 3*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_SUPPRESVERSIONCOLUMN(	5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_DOSLINEENDS(			6*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 5*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-    AUTO_BOOLEANCOMPARISON(		7*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 6*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-};
-
-//.........................................................................
-
-TabPage PAGE_DS_PROPERTIES_FILE
-{
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
-    Hide = TRUE;
-    AUTO_DATAHANDLING(			  RELATED_CONTROLS )
-    AUTO_SQL92CHECK(			  RELATED_CONTROLS + FIXEDTEXT_HEIGHT +   RELATED_CONTROLS )
-    AUTO_DOSLINEENDS(			2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-};
-
-//.........................................................................
-
-TabPage PAGE_DS_PROPERTIES_ACCESS
-{
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
-    Hide = TRUE;
-    AUTO_DATAHANDLING(			  RELATED_CONTROLS )
-    AUTO_SQL92CHECK(			  RELATED_CONTROLS + FIXEDTEXT_HEIGHT +   RELATED_CONTROLS )
-    AUTO_APPENDTABLEALIAS(		2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT +   CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_ENABLEOUTERJOIN(		3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_DOSLINEENDS(			4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 3*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-    AUTO_BOOLEANCOMPARISON(		5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-};
-
-//.........................................................................
-
-TabPage PAGE_DS_MYSQL_SETTINGS
-{
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
-    Hide = TRUE;
-    AUTO_DATAHANDLING(			  RELATED_CONTROLS )
-    AUTO_ENABLEOUTERJOIN(		  RELATED_CONTROLS + FIXEDTEXT_HEIGHT +   RELATED_CONTROLS )
-    AUTO_IGNOREDRIVER_PRIV(		2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT +   CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_APPENDTABLEALIAS(		3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_PARAMETERNAMESUBST(	4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 3*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_SUPPRESVERSIONCOLUMN(	5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_DOSLINEENDS(			6*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 5*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-    AUTO_BOOLEANCOMPARISON(		7*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 6*CHECKBOX_HEIGHT + UNRELATED_CONTROLS )
-};
-
-//.........................................................................
-
-TabPage PAGE_DS_FULL_ADVANCED_SETTINGS
-{
-    SVLook = TRUE ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( ADVANCED_PAGE_X , ADVANCED_PAGE_Y ) ;
-    Hide = TRUE;
-    AUTO_DATAHANDLING(			  RELATED_CONTROLS )
-    AUTO_SQL92CHECK(			1*RELATED_CONTROLS + FIXEDTEXT_HEIGHT +   RELATED_CONTROLS )
-    AUTO_APPENDTABLEALIAS(		2*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 1*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_AS_BEFORE_CORR_NAME(   3*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_ENABLEOUTERJOIN(		4*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 3*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_IGNOREDRIVER_PRIV(		5*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 4*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_PARAMETERNAMESUBST(	6*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 5*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_SUPPRESVERSIONCOLUMN(	7*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 6*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_CATALOG(				8*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 7*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_SCHEMA(				9*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 8*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_IGNOREINDEXAPPENDIX(  10*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 9*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_DOSLINEENDS(		   11*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 10*CHECKBOX_HEIGHT + RELATED_CONTROLS )
-    AUTO_BOOLEANCOMPARISON(	   12*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 11*CHECKBOX_HEIGHT + RELATED_CONTROLS + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 )
-};
-
-//.........................................................................
-
 TabPage PAGE_ODBC
 {
     SVLook = TRUE ;