Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

image update

Browse Source 
listbox fix
  iODBC fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-01-12 17:53:45 +00:00
parent 4a1acb45b0
commit f6fcbb63d0
19 changed files with 304 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/iodbc/itrace.h
View File

@@ -7,6 +7,8 @@
# endif
# endif
#define NO_TRACE
# define TRACE_TYPE_APP2DM 1
# define TRACE_TYPE_DM2DRV 2
# define TRACE_TYPE_DRV2DM 3

16
src/iodbc/misc.c
View File

@@ -122,7 +122,7 @@ getinitfile(char* buf, int size)
int i, j;
char* ptr;
j = STRLEN("/odbc.ini") + 1;
j = STRLEN("/iodbc.ini") + 1;
if( size < j )
{
@@ -130,13 +130,13 @@ getinitfile(char* buf, int size)
}
#ifdef FIX_INI_FILE
sprintf( buf, "%s/odbc.ini", DIR_INI_FILE );
sprintf( buf, "%s/iodbc.ini", DIR_INI_FILE );
#else
# ifdef OS2
*buf = '\0';
if( NULL != getenv("ODBC_INI") )
if( NULL != getenv("IODBC_INI") )
{
strcpy( buf, getenv("ODBC_INI") );
strcpy( buf, getenv("IODBC_INI") );
}
else
{
@@ -151,7 +151,7 @@ getinitfile(char* buf, int size)
}
else
{
strcpy( buf, "odbc.ini" );
strcpy( buf, "iodbc.ini" );
}
}
@@ -166,7 +166,7 @@ getinitfile(char* buf, int size)
return NULL;
}
sprintf( buf + i, "/odbc.ini");
sprintf( buf + i, "/iodbc.ini");
return buf;
# else
@@ -189,8 +189,8 @@ getinitfile(char* buf, int size)
return NULL;
}
sprintf( buf, "%s%s", ptr, "/.odbc.ini");
/* i.e. searching ~/.odbc.ini */
sprintf( buf, "%s%s", ptr, "/.iodbc.ini");
/* i.e. searching ~/.iodbc.ini */
# endif
# endif
#endif