From: George Tasker <gtasker@allenbrook.com>
Date: Mon, 28 May 2001 12:24:22 +0000 (+0000)
Subject: Informix fixes (submitted by Roger Gammans)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/597fadcef5fb642e168fe37997e4341710a98465

Informix fixes (submitted by Roger Gammans)
Added .c_str() to some wxString instances when being Printf()'d into another wxString


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 64f7a069e2..e5e5fa368d 100644
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -351,7 +351,7 @@ void wxDbTable::cleanup()
         if (!found)
         {
             wxString msg;
-            msg.Printf(wxT("Unable to find the tableID in the linked\nlist of tables in use.\n\n%s"),s);
+            msg.Printf(wxT("Unable to find the tableID in the linked\nlist of tables in use.\n\n%s"),s.c_str());
             wxLogDebug (msg,wxT("NOTICE..."));
         }
     }
@@ -1404,6 +1404,7 @@ bool wxDbTable::CreateTable(bool attemptDrop)
     {
         switch (pDb->Dbms())
         {
+            case dbmsINFORMIX:
             case dbmsSYBASE_ASA:
             case dbmsSYBASE_ASE:
             case dbmsMY_SQL:
@@ -1441,7 +1442,8 @@ bool wxDbTable::CreateTable(bool attemptDrop)
         }
         sqlStmt += wxT(")");
 
-        if (pDb->Dbms() == dbmsSYBASE_ASA ||
+        if (pDb->Dbms() == dbmsINFORMIX ||
+            pDb->Dbms() == dbmsSYBASE_ASA ||
             pDb->Dbms() == dbmsSYBASE_ASE)
         {
             sqlStmt += wxT(" CONSTRAINT ");
@@ -2091,7 +2093,7 @@ void wxDbTable::SetColDefs(UWORD index, const wxString &fieldName, int dataType,
         wxStrncpy(colDefs[index].ColName, fieldName, DB_MAX_COLUMN_NAME_LEN);
         colDefs[index].ColName[DB_MAX_COLUMN_NAME_LEN] = 0;
         wxString tmpMsg;
-        tmpMsg.sprintf("Column name '%s' is too long. Truncated to '%s'.",fieldName,colDefs[index].ColName);
+        tmpMsg.Printf("Column name '%s' is too long. Truncated to '%s'.",fieldName.c_str(),colDefs[index].ColName);
         wxASSERT_MSG(assertColumnNameTooLong,tmpMsg.c_str());
     }
     else