From bd79290693ff55194907205dfba7ef2bcb45bdf5 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Mon, 4 Oct 2004 12:30:27 +0000 Subject: [PATCH] Turn off updateable cursors by default. Clarify the Updateable Cursors option as being experimental. Various GUI cleanups. --- dlg_specific.h | 2 +- psqlodbc.rc | 272 ++++++++++++++++++++++++------------------------- 2 files changed, 132 insertions(+), 142 deletions(-) diff --git a/dlg_specific.h b/dlg_specific.h index 7d27605..1b1b7bf 100644 --- a/dlg_specific.h +++ b/dlg_specific.h @@ -144,7 +144,7 @@ #define DEFAULT_DISALLOWPREMATURE 0 #define DEFAULT_TRUEISMINUS1 0 #ifdef DRIVER_CURSOR_IMPLEMENT -#define DEFAULT_UPDATABLECURSORS 1 +#define DEFAULT_UPDATABLECURSORS 0 /* Made non-default due to stability issues - DJP, 2004-1004 */ #else #define DEFAULT_UPDATABLECURSORS 0 #endif /* DRIVER_CURSOR_IMPLEMENT */ diff --git a/psqlodbc.rc b/psqlodbc.rc index 6f54e85..6cb7ba5 100644 --- a/psqlodbc.rc +++ b/psqlodbc.rc @@ -1,4 +1,4 @@ -//Microsoft Developer Studio generated resource script. +// Microsoft Visual C++ generated resource script. // #include "resource.h" @@ -14,7 +14,7 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// “ú–{Œê resources +// Japanese resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) #ifdef _WIN32 @@ -28,17 +28,17 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT // DLG_CONFIG DIALOGEX 65, 43, 359, 219 -STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | - WS_CAPTION | WS_SYSMENU +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "PostgreSQL ODBC ƒZƒbƒgƒAƒbƒv" -FONT 9, "‚l‚r ƒSƒVƒbƒN" +FONT 9, "‚l‚r ƒSƒVƒbƒN", 0, 0, 0x1 BEGIN RTEXT "ƒf|ƒ^ƒ\|ƒX–¼:(&N)",IDC_DSNAMETEXT,2,9,63,17,NOT WS_GROUP,WS_EX_TRANSPARENT | WS_EX_RIGHT EDITTEXT IDC_DSNAME,71,12,188,13,ES_AUTOHSCROLL | WS_GROUP, WS_EX_TRANSPARENT RTEXT "à–¾:(&D)",IDC_DESCTEXT,5,31,60,16,SS_CENTERIMAGE | NOT - WS_GROUP,WS_EX_TRANSPARENT | WS_EX_RIGHT + WS_GROUP,WS_EX_TRANSPARENT | WS_EX_RIGHT EDITTEXT IDC_DESC,71,32,189,13,ES_AUTOHSCROLL,WS_EX_TRANSPARENT RTEXT "ƒT|ƒo|–¼:(&S)",IDC_STATIC,17,68,48,15,NOT WS_GROUP EDITTEXT IDC_SERVER,69,66,203,14,ES_AUTOHSCROLL @@ -61,18 +61,16 @@ BEGIN IDC_STATIC,36,186,302,9 LTEXT "In the original form, Japanese patch Hiroshi-saito", IDC_STATIC,35,198,295,8 - // CONTROL "IDB_BANNER",IDC_STATIC,"Static",SS_BITMAP,8,3,16,15, - // WS_EX_TRANSPARENT | WS_EX_STATICEDGE PUSHBUTTON "ŠÇ—",IDC_MANAGEDSN,295,10,50,14 END -DLG_OPTIONS_DRV DIALOG DISCARDABLE 0, 0, 350, 241 -STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION | - WS_SYSMENU +DLG_OPTIONS_DRV DIALOGEX 0, 0, 350, 241 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | + WS_CAPTION | WS_SYSMENU CAPTION "‚“x‚Ȑݒè (ƒf[ƒ^ƒ\[ƒX‚P)" -FONT 9, "‚l‚r ƒSƒVƒbƒN" +FONT 9, "‚l‚r ƒSƒVƒbƒN", 0, 0, 0x0 BEGIN - PUSHBUTTON "Ý’è1",IDPREVPAGE,5,5,40,15 + PUSHBUTTON "Ý’è1",IDPREVPAGE,5,5,40,15,WS_DISABLED PUSHBUTTON "Ý’è2",IDNEXTPAGE,49,5,40,15 CONTROL "ˆâ“`“IÅ“K‰»ˆ—‚𖳌ø‚É‚·‚é(&O)",DRV_OPTIMIZER,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,15,26,140,10 @@ -120,13 +118,13 @@ BEGIN GROUPBOX "‚»‚Ì‘¼",IDC_STATIC,5,155,340,54 END -DLG_OPTIONS_DS DIALOG DISCARDABLE 0, 0, 306, 243 -STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION | - WS_SYSMENU +DLG_OPTIONS_DS DIALOGEX 0, 0, 306, 243 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | + WS_CAPTION | WS_SYSMENU CAPTION "‚“x‚Ȑݒè (ƒf[ƒ^ƒ\[ƒX‚Q)" -FONT 9, "‚l‚r ƒSƒVƒbƒN" +FONT 9, "‚l‚r ƒSƒVƒbƒN", 0, 0, 0x0 BEGIN - PUSHBUTTON "Ý’è2",IDNEXTPAGE,49,5,40,15 + PUSHBUTTON "Ý’è2",IDNEXTPAGE,49,5,40,15,WS_DISABLED PUSHBUTTON "Ý’è1",IDPREVPAGE,5,5,40,15 CONTROL "ƒŠ|ƒhƒIƒ“ƒŠƒB(&R)",DS_READONLY,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,15,26,102,10 @@ -182,9 +180,9 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,15,85,87,10 END -DLG_OPTIONS_GLOBAL DIALOG DISCARDABLE 0, 0, 306, 87 -STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION | - WS_SYSMENU +DLG_OPTIONS_GLOBAL DIALOG 0, 0, 306, 87 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | + WS_CAPTION | WS_SYSMENU CAPTION "‚“x‚Ȑݒè(‘S‘Ì)" FONT 9, "‚l‚r ƒSƒVƒbƒN" BEGIN @@ -200,10 +198,11 @@ BEGIN IDC_STATIC,5,5,296,58 END -DLG_DRIVER_CHANGE DIALOG DISCARDABLE 0, 0, 306, 87 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +DLG_DRIVER_CHANGE DIALOGEX 0, 0, 306, 87 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | + WS_SYSMENU CAPTION "ƒhƒ‰ƒCƒo@ƒAƒbƒv/ƒ_ƒEƒ“" -FONT 10, "Terminal" +FONT 10, "Terminal", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "OK",IDOK,82,68,50,14,WS_GROUP PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹",IDCANCEL,172,67,50,15 @@ -220,7 +219,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO BEGIN DLG_CONFIG, DIALOG BEGIN @@ -269,19 +268,19 @@ END // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "#include ""version.h""\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE BEGIN "\r\n" "\0" @@ -290,15 +289,14 @@ END #endif // APSTUDIO_INVOKED -#ifndef _MAC ///////////////////////////////////////////////////////////////////////////// // // Version // VS_VERSION_INFO VERSIONINFO - FILEVERSION PG_DRVFILE_VERSION - PRODUCTVERSION PG_DRVFILE_VERSION + FILEVERSION 7,5,0,2 + PRODUCTVERSION 7,5,0,2 FILEFLAGSMASK 0x3L #ifdef _DEBUG FILEFLAGS 0x1L @@ -313,18 +311,15 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "Comments", "PostgreSQL ODBC driver\0" - VALUE "CompanyName", "PostgreSQL Global Development Group\0" - VALUE "FileDescription", "PostgreSQL Driver\0" - VALUE "FileVersion", POSTGRES_RESOURCE_VERSION - VALUE "InternalName", "psqlodbc\0" - VALUE "LegalCopyright", "\0" - VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation. Microsoft® is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation.\0" - VALUE "OriginalFilename", "psqlodbc.dll\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Microsoft Open Database Connectivity\0" - VALUE "ProductVersion", POSTGRES_RESOURCE_VERSION - VALUE "SpecialBuild", "\0" + VALUE "Comments", "PostgreSQL ODBC driver" + VALUE "CompanyName", "PostgreSQL Global Development Group" + VALUE "FileDescription", "PostgreSQL Driver" + VALUE "FileVersion", "07.05.0002" + VALUE "InternalName", "psqlodbc" + VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation. Microsoft® is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation." + VALUE "OriginalFilename", "psqlodbc.dll" + VALUE "ProductName", "Microsoft Open Database Connectivity" + VALUE "ProductVersion", "07.05.0002" END END BLOCK "VarFileInfo" @@ -333,15 +328,13 @@ BEGIN END END -#endif // !_MAC - ///////////////////////////////////////////////////////////////////////////// // // String Table // -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_BADDSN "DSNƒGƒ“ƒgƒŠ|‚ª•s³‚Å‚·BÄ“xƒ`ƒFƒbƒNÝ’肵‚Ä‚­‚¾‚³‚¢B." IDS_MSGTITLE "DSN•s³" @@ -354,12 +347,12 @@ BEGIN IDS_ADVANCE_CONNECTION "ƒRƒlƒNƒVƒ‡ƒ“" END -#endif // “ú–{Œê resources +#endif // Japanese resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// ‰pŒê (±Òض) resources +// English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 @@ -372,151 +365,153 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Dialog // -DLG_CONFIG DIALOG DISCARDABLE 65, 43, 305, 130 -STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | - WS_SYSMENU +DLG_CONFIG DIALOGEX 65, 43, 305, 130 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "PostgreSQL ODBC Driver (psqlODBC) Setup" -FONT 10, "Terminal" +FONT 10, "Terminal", 0, 0, 0x0 BEGIN RTEXT "&Data Source",IDC_DSNAMETEXT,5,25,50,12,NOT WS_GROUP EDITTEXT IDC_DSNAME,57,24,72,12,ES_AUTOHSCROLL | WS_GROUP RTEXT "Des&cription",IDC_DESCTEXT,145,24,45,12,NOT WS_GROUP - EDITTEXT IDC_DESC,192,24,107,12,ES_AUTOHSCROLL + EDITTEXT IDC_DESC,192,22,104,12,ES_AUTOHSCROLL RTEXT "Data&base",IDC_STATIC,16,40,38,12,NOT WS_GROUP EDITTEXT IDC_DATABASE,57,39,72,12,ES_AUTOHSCROLL RTEXT "&Server",IDC_STATIC,26,55,29,12,NOT WS_GROUP EDITTEXT IDC_SERVER,57,54,72,12,ES_AUTOHSCROLL RTEXT "&Port",IDC_STATIC,168,56,22,12 - EDITTEXT IDC_PORT,192,55,37,12,ES_AUTOHSCROLL + EDITTEXT IDC_PORT,192,54,37,12,ES_AUTOHSCROLL RTEXT "&User Name",IDC_STATIC,16,70,39,12 EDITTEXT IDC_USER,57,69,72,12,ES_AUTOHSCROLL RTEXT "Pass&word",IDC_STATIC,156,72,34,9 - EDITTEXT IDC_PASSWORD,192,71,72,12,ES_PASSWORD | ES_AUTOHSCROLL + EDITTEXT IDC_PASSWORD,192,70,72,12,ES_PASSWORD | ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,12,100,44,15,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,77,100,44,15 - GROUPBOX "Options",IDC_OPTIONS,152,88,140,35,BS_LEFT - PUSHBUTTON "Datasource",IDC_DATASOURCE,172,101,50,14 - PUSHBUTTON "Global",IDC_DRIVER,232,101,50,14 - CTEXT "Please supply any missing information required to -connect.", - DRV_MSG_LABEL,12,4,249,10 - PUSHBUTTON "Manage(DSN)",IDC_MANAGEDSN,257,1,52,14 + PUSHBUTTON "Cancel",IDCANCEL,66,100,44,15 + GROUPBOX "Options",IDC_OPTIONS,121,87,177,35,BS_LEFT + PUSHBUTTON "Datasource",IDC_DATASOURCE,128,101,50,14 + PUSHBUTTON "Global",IDC_DRIVER,184,101,50,14 + LTEXT "Please supply any missing information required to connect.", + DRV_MSG_LABEL,12,5,249,10 + PUSHBUTTON "Manage DSN",IDC_MANAGEDSN,240,101,52,14 END -DLG_OPTIONS_DRV DIALOG DISCARDABLE 0, 0, 287, 231 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +DLG_OPTIONS_DRV DIALOGEX 0, 0, 303, 228 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | + WS_SYSMENU CAPTION "Advanced Options (DataSource)" -FONT 10, "Terminal" +FONT 10, "Terminal", 0, 0, 0x0 BEGIN - PUSHBUTTON "Page 1",IDPREVPAGE,5,5,40,15 + PUSHBUTTON "Page 1",IDPREVPAGE,5,5,40,15,WS_DISABLED PUSHBUTTON "Page 2",IDNEXTPAGE,49,5,40,15 CONTROL "Disable Genetic &Optimizer",DRV_OPTIMIZER,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,15,26,116,10 CONTROL "Comm&Log (C:\\psqlodbc_xxxx.log)",DRV_COMMLOG,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,149,26,131,10 + BS_AUTOCHECKBOX | WS_TABSTOP,161,26,133,10 CONTROL "&KSQO(Keyset Query Optimization)",DRV_KSQO,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,41,132,10 CONTROL "Recognize Unique &Indexes",DRV_UNIQUEINDEX,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,110,10 CONTROL "P&arse Statements",DRV_PARSE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,149,41,80,10 + WS_TABSTOP,161,41,80,10 CONTROL "&Use Declare/Fetch",DRV_USEDECLAREFETCH,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,71,83,10 CONTROL "Cancel as FreeStmt (Exp)",DRV_CANCELASFREESTMT,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,149,56,114,10 + BS_AUTOCHECKBOX | WS_TABSTOP,161,56,114,10 CONTROL "MyLog (C:\\mylog_xxxx.log)",DRV_DEBUG,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,149,71,112,10 - GROUPBOX "Unknown Sizes",IDC_STATIC,5,85,277,25 + BS_AUTOCHECKBOX | WS_TABSTOP,161,71,112,10 + GROUPBOX "Unknown Sizes",IDC_STATIC,5,85,293,25 CONTROL "Maximum",DRV_UNKNOWN_MAX,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,15,96,45,10 CONTROL "Don't Know",DRV_UNKNOWN_DONTKNOW,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,105,96,53,10 CONTROL "Longest",DRV_UNKNOWN_LONGEST,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,215,95,50,10 - GROUPBOX "Data Type Options",IDC_STATIC,5,115,277,25 + GROUPBOX "Data Type Options",IDC_STATIC,5,115,293,25 CONTROL "Text as LongVarChar",DRV_TEXT_LONGVARCHAR,"Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,15,125,90,10 CONTROL "Unknowns as LongVarChar",DRV_UNKNOWNS_LONGVARCHAR, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,125,105,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,125,105,10 CONTROL "Bools as Char",DRV_BOOLS_CHAR,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,215,125,67,10 - LTEXT "&Cache Size:",IDC_STATIC,14,183,52,8 + WS_TABSTOP,226,125,67,10 + LTEXT "&Cache Size",IDC_STATIC,14,183,52,8 EDITTEXT DRV_CACHE_SIZE,69,181,35,12,ES_AUTOHSCROLL - LTEXT "Max &Varchar:",IDC_STATIC,13,161,54,8 + LTEXT "Max &Varchar",IDC_STATIC,13,161,54,8 EDITTEXT DRV_VARCHAR_SIZE,70,160,35,12,ES_AUTOHSCROLL - LTEXT "Max Lon&gVarChar:",IDC_STATIC,125,161,67,8 - EDITTEXT DRV_LONGVARCHAR_SIZE,199,160,35,12,ES_AUTOHSCROLL - LTEXT "SysTable &Prefixes:",IDC_STATIC,125,183,61,18 - EDITTEXT DRV_EXTRASYSTABLEPREFIXES,199,181,71,12,ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,5,212,50,14,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,81,211,50,15 - PUSHBUTTON "Apply",IDAPPLY,156,212,50,14 - PUSHBUTTON "Defaults",IDDEFAULTS,232,211,50,15 - GROUPBOX "Miscellanous",IDC_STATIC,5,145,277,58 + LTEXT "Max Lon&gVarChar",IDC_STATIC,136,161,67,8 + EDITTEXT DRV_LONGVARCHAR_SIZE,215,160,35,12,ES_AUTOHSCROLL + LTEXT "SysTable &Prefixes",IDC_STATIC,136,183,80,9 + EDITTEXT DRV_EXTRASYSTABLEPREFIXES,215,181,71,12,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,136,208,50,14,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,246,207,50,15 + PUSHBUTTON "Apply",IDAPPLY,191,208,50,14 + PUSHBUTTON "Defaults",IDDEFAULTS,5,207,50,15 + GROUPBOX "Miscellanous",IDC_STATIC,5,145,293,58 END -DLG_OPTIONS_DS DIALOG DISCARDABLE 0, 0, 287, 234 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +DLG_OPTIONS_DS DIALOGEX 0, 0, 287, 239 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | + WS_SYSMENU CAPTION "Advanced Options (DataSource)" -FONT 10, "Terminal" +FONT 10, "Terminal", 0, 0, 0x0 BEGIN - PUSHBUTTON "Page 2",IDNEXTPAGE,49,5,40,15,BS_BITMAP + PUSHBUTTON "Page 2",IDNEXTPAGE,49,5,40,15,WS_DISABLED PUSHBUTTON "Page 1",IDPREVPAGE,5,5,40,15 CONTROL "&Read Only",DS_READONLY,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,15,26,102,10 CONTROL "Row &Versioning",DS_ROWVERSIONING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,149,26,85,10 + BS_AUTOCHECKBOX | WS_TABSTOP,175,26,85,10 CONTROL "Show System &Tables",DS_SHOWSYSTEMTABLES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,41,100,10 CONTROL "Disallow &Premature",DS_DISALLOWPREMATURE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,149,41,85,10 + BS_AUTOCHECKBOX | WS_TABSTOP,175,41,85,10 CONTROL "LF <-> CR/LF conversion",DS_LFCONVERSION,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,106,10 CONTROL "True is -1",DS_TRUEISMINUS1,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,149,56,86,10 - CONTROL "Updatable Cursors",DS_UPDATABLECURSORS,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,71,87,10 + WS_TABSTOP,175,56,86,10 + CONTROL "Updatable Cursors (Experimental)",DS_UPDATABLECURSORS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,70,147,10 CONTROL "Server side prepare",DS_SERVERSIDEPREPARE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,149,71,90,10 + BS_AUTOCHECKBOX | WS_TABSTOP,175,71,90,10 CONTROL "bytea as LO",DS_BYTEAASLONGVARBINARY,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,16,84,87,10 - GROUPBOX "Int8 As",IDC_STATIC,5,95,277,25 + GROUPBOX "Int8 As",IDC_STATIC,5,97,277,25 CONTROL "default",DS_INT8_AS_DEFAULT,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,12,105,40,10 + WS_GROUP,12,108,40,10 CONTROL "bigint",DS_INT8_AS_BIGINT,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,55,105,35,10 + WS_TABSTOP,55,108,35,10 CONTROL "numeric",DS_INT8_AS_NUMERIC,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,98,105,40,10 + WS_TABSTOP,98,108,40,10 CONTROL "varchar",DS_INT8_AS_VARCHAR,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,141,105,40,10 + WS_TABSTOP,141,108,40,10 CONTROL "double",DS_INT8_AS_DOUBLE,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,184,105,40,10 + WS_TABSTOP,184,108,40,10 CONTROL "int4",DS_INT8_AS_INT4,"Button",BS_AUTORADIOBUTTON | - WS_TABSTOP,227,105,29,10 - GROUPBOX "Protocol",IDC_STATIC,5,125,277,25 + WS_TABSTOP,227,108,29,10 + GROUPBOX "Protocol",IDC_STATIC,5,126,277,25 CONTROL "7.X,6.4+",DS_PG64,"Button",BS_AUTORADIOBUTTON | - WS_GROUP,44,136,49,10 + WS_GROUP,44,137,49,10 CONTROL "6.3",DS_PG63,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 117,136,26,10 + 117,137,26,10 CONTROL "6.2",DS_PG62,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 191,136,26,10 + 191,137,26,10 GROUPBOX "OID Options",IDC_STATIC,5,155,277,25 CONTROL "Show &Column",DS_SHOWOIDCOLUMN,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,53,167,59,10 CONTROL "Fake &Index",DS_FAKEOIDINDEX,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,155,166,51,10 - LTEXT "Connect &Settings:",IDC_STATIC,5,192,62,17 - EDITTEXT DS_CONNSETTINGS,71,188,211,27,ES_MULTILINE | + LTEXT "Connect &Settings",IDC_STATIC,5,188,62,17 + EDITTEXT DS_CONNSETTINGS,47,188,235,27,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN - DEFPUSHBUTTON "OK",IDOK,5,220,50,14,WS_GROUP - PUSHBUTTON "Cancel",IDCANCEL,81,220,50,14 - PUSHBUTTON "Apply",IDAPPLY,156,220,50,14 + DEFPUSHBUTTON "OK",IDOK,121,220,50,14,WS_GROUP + PUSHBUTTON "Cancel",IDCANCEL,231,220,50,14 + PUSHBUTTON "Apply",IDAPPLY,176,220,50,14 END -DLG_OPTIONS_GLOBAL DIALOG DISCARDABLE 0, 0, 306, 87 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +DLG_OPTIONS_GLOBAL DIALOGEX 0, 0, 306, 87 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | + WS_SYSMENU CAPTION "Global settings" -FONT 10, "Terminal" +FONT 10, "Terminal", 0, 0, 0x0 BEGIN CONTROL "Comm&Log (C:\\psqlodbc_xxxx.log - Communications log)", DRV_COMMLOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,24, @@ -530,10 +525,11 @@ BEGIN 296,58 END -DLG_DRIVER_CHANGE DIALOG DISCARDABLE 0, 0, 306, 87 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +DLG_DRIVER_CHANGE DIALOGEX 0, 0, 306, 87 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | + WS_SYSMENU CAPTION "Driver up/downgrade" -FONT 10, "Terminal" +FONT 10, "Terminal", 0, 0, 0x0 BEGIN DEFPUSHBUTTON "OK",IDOK,82,68,50,14,WS_GROUP PUSHBUTTON "Cancel",IDCANCEL,172,67,50,15 @@ -550,7 +546,7 @@ END // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO BEGIN DLG_CONFIG, DIALOG BEGIN @@ -560,9 +556,9 @@ BEGIN DLG_OPTIONS_DRV, DIALOG BEGIN LEFTMARGIN, 5 - RIGHTMARGIN, 282 + RIGHTMARGIN, 298 TOPMARGIN, 5 - BOTTOMMARGIN, 226 + BOTTOMMARGIN, 222 END DLG_OPTIONS_DS, DIALOG @@ -570,7 +566,7 @@ BEGIN LEFTMARGIN, 5 RIGHTMARGIN, 282 TOPMARGIN, 5 - BOTTOMMARGIN, 231 + BOTTOMMARGIN, 236 END DLG_OPTIONS_GLOBAL, DIALOG @@ -592,15 +588,14 @@ END #endif // APSTUDIO_INVOKED -#ifndef _MAC ///////////////////////////////////////////////////////////////////////////// // // Version // VS_VERSION_INFO VERSIONINFO - FILEVERSION PG_DRVFILE_VERSION - PRODUCTVERSION PG_DRVFILE_VERSION + FILEVERSION 7,5,0,2 + PRODUCTVERSION 7,5,0,2 FILEFLAGSMASK 0x3L #ifdef _DEBUG FILEFLAGS 0x1L @@ -615,18 +610,15 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "Comments", "PostgreSQL ODBC driver\0" - VALUE "CompanyName", "PostgreSQL Global Development Group\0" - VALUE "FileDescription", "PostgreSQL Driver\0" - VALUE "FileVersion", POSTGRES_RESOURCE_VERSION - VALUE "InternalName", "psqlodbc\0" - VALUE "LegalCopyright", "\0" - VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation. Microsoft? is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation.\0" - VALUE "OriginalFilename", "psqlodbc.dll\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "Microsoft Open Database Connectivity\0" - VALUE "ProductVersion", POSTGRES_RESOURCE_VERSION - VALUE "SpecialBuild", "\0" + VALUE "Comments", "PostgreSQL ODBC driver" + VALUE "CompanyName", "PostgreSQL Global Development Group" + VALUE "FileDescription", "PostgreSQL Driver" + VALUE "FileVersion", "07.05.0002" + VALUE "InternalName", "psqlodbc" + VALUE "LegalTrademarks", "ODBC(TM) is a trademark of Microsoft Corporation. Microsoft? is a registered trademark of Microsoft Corporation. Windows(TM) is a trademark of Microsoft Corporation." + VALUE "OriginalFilename", "psqlodbc.dll" + VALUE "ProductName", "Microsoft Open Database Connectivity" + VALUE "ProductVersion", "07.05.0002" END END BLOCK "VarFileInfo" @@ -635,15 +627,13 @@ BEGIN END END -#endif // !_MAC - ///////////////////////////////////////////////////////////////////////////// // // String Table // -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_BADDSN "Invalid DSN entry, please recheck." IDS_MSGTITLE "Invalid DSN" @@ -656,7 +646,7 @@ BEGIN IDS_ADVANCE_CONNECTION "Connection" END -#endif // ‰pŒê (±Òض) resources +#endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// -- 2.39.5