added an error message if a bitmap can't be addedto the image list

[wxWidgets.git] / src / iodbc / misc.c

diff --git a/src/iodbc/misc.c b/src/iodbc/misc.c
index 4535ecd892537d6cfc5f67df35e43597c86a2cbb..42b26a62b92a1b7fea43cafaa9eccaba190f8df7 100644 (file)
--- a/src/iodbc/misc.c
+++ b/src/iodbc/misc.c
@@ -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