Change return value of GetExtendedDBErrorMsg2 to be a const char * instead of char *.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -93,9 +93,10 @@ const int LISTDB_NO_SPACES_BETWEEN_COLS = 3;
|
|||||||
* NOTE: The value returned by this function is for temporary use only and
|
* NOTE: The value returned by this function is for temporary use only and
|
||||||
* should be copied for long term use
|
* should be copied for long term use
|
||||||
*/
|
*/
|
||||||
char *GetExtendedDBErrorMsg2(char *ErrFile, int ErrLine)
|
const char *GetExtendedDBErrorMsg2(char *ErrFile, int ErrLine)
|
||||||
{
|
{
|
||||||
static wxString msg;
|
static wxString msg;
|
||||||
|
msg = "";
|
||||||
|
|
||||||
wxString tStr;
|
wxString tStr;
|
||||||
|
|
||||||
@@ -128,12 +129,15 @@ char *GetExtendedDBErrorMsg2(char *ErrFile, int ErrLine)
|
|||||||
msg.Append(pDbList->PtrDb->errorList[i]);
|
msg.Append(pDbList->PtrDb->errorList[i]);
|
||||||
if (wxStrcmp(pDbList->PtrDb->errorList[i],"") != 0)
|
if (wxStrcmp(pDbList->PtrDb->errorList[i],"") != 0)
|
||||||
msg.Append("\n");
|
msg.Append("\n");
|
||||||
|
// Clear the errmsg buffer so the next error will not
|
||||||
|
// end up showing the previous error that have occurred
|
||||||
|
wxStrcpy(pDbList->PtrDb->errorList[i],"");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
msg += "\n";
|
msg += "\n";
|
||||||
|
|
||||||
return (char*) (const char*) msg;
|
return /*(char*) (const char*) msg*/msg.c_str();
|
||||||
} // GetExtendedDBErrorMsg
|
} // GetExtendedDBErrorMsg
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user