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

Misc fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-05-05 16:40:32 +00:00
parent 8947dc6d65
commit fbdcff4a78
15 changed files with 58 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/cmdline.cpp
View File

@@ -348,14 +348,12 @@ void wxCmdLineParser::AddParam(const wxString& desc,
wxCmdLineParam& param = m_data->m_paramDesc.Last();
wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_MULTIPLE),
_T("all parameters after the one with "
"wxCMD_LINE_PARAM_MULTIPLE style will be ignored") );
_T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style will be ignored") );
if ( !(flags & wxCMD_LINE_PARAM_OPTIONAL) )
{
wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL),
_T("a required parameter can't follow an "
"optional one") );
_T("a required parameter can't follow an optional one") );
}
}
#endif // Debug
@@ -589,8 +587,7 @@ int wxCmdLineParser::Parse()
if ( *p++ != _T('=') )
{
wxLogError(_("Option '%s' requires a value, '=' "
"expected."), name.c_str());
wxLogError(_("Option '%s' requires a value, '=' expected."), name.c_str());
ok = FALSE;
}
@@ -649,9 +646,7 @@ int wxCmdLineParser::Parse()
}
else
{
wxLogError(_("'%s' is not a correct "
"numeric value for option "
"'%s'."),
wxLogError(_("'%s' is not a correct numeric value for option '%s'."),
value.c_str(), name.c_str());
ok = FALSE;
@@ -665,8 +660,7 @@ int wxCmdLineParser::Parse()
const wxChar *res = dt.ParseDate(value);
if ( !res || *res )
{
wxLogError(_("Option '%s': '%s' cannot "
"be converted to a date."),
wxLogError(_("Option '%s': '%s' cannot be converted to a date."),
name.c_str(), value.c_str());
ok = FALSE;
@@ -699,9 +693,7 @@ int wxCmdLineParser::Parse()
else
{
wxASSERT_MSG( currentParam == countParam - 1,
_T("all parameters after the one with "
"wxCMD_LINE_PARAM_MULTIPLE style "
"are ignored") );
_T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style are ignored") );
// remember that we did have this last repeatable parameter
hadRepeatableParam = TRUE;

6
src/common/cmndata.cpp
View File

@@ -1435,8 +1435,7 @@ void wxPageSetupDialogData::SetPaperSize(wxPaperSize id)
void wxPageSetupDialogData::CalculateIdFromPaperSize()
{
wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
wxT("wxThePrintPaperDatabase should not be NULL. "
"Do not create global print dialog data objects.") );
wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
wxSize sz = GetPaperSize();
@@ -1451,8 +1450,7 @@ void wxPageSetupDialogData::CalculateIdFromPaperSize()
void wxPageSetupDialogData::CalculatePaperSizeFromId()
{
wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
wxT("wxThePrintPaperDatabase should not be NULL. "
"Do not create global print dialog data objects.") );
wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());

3
src/common/config.cpp
View File

@@ -339,8 +339,7 @@ wxString wxExpandEnvVars(const wxString& str)
// check the closing bracket
if ( bracket != Bracket_None ) {
if ( m == str.Len() || str[m] != (char)bracket ) {
wxLogWarning(_("Environment variables expansion failed: "
"missing '%c' at position %d in '%s'."),
wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %d in '%s'."),
(char)bracket, m + 1, str.c_str());
}
else {

26
src/common/db.cpp
View File

@@ -155,7 +155,7 @@ int wxColFor::Format(int Nation,int dbDataType,SWORD sqlDataType,short columnSiz
i_Nation = Nation; // 0 = timestamp , 1=EU, 2=UK, 3=International, 4=US
i_dbDataType = dbDataType;
i_sqlDataType = sqlDataType;
s_Field.Printf("%s%d",s_Menge[1].c_str(),i_Menge[1]); // OK for VARCHAR, INTEGER and FLOAT
s_Field.Printf(wxT("%s%d"),s_Menge[1].c_str(),i_Menge[1]); // OK for VARCHAR, INTEGER and FLOAT
if (i_dbDataType == 0) // Filter unsupported dbDataTypes
{
if ((i_sqlDataType == SQL_VARCHAR) || (i_sqlDataType == SQL_LONGVARCHAR))
@@ -185,8 +185,8 @@ int wxColFor::Format(int Nation,int dbDataType,SWORD sqlDataType,short columnSiz
if (decimalDigits == 0)
decimalDigits = 2;
Temp0 = "%";
Temp0.Printf("%s%d.%d",Temp0.c_str(),columnSize,decimalDigits);
s_Field.Printf("%sf",Temp0.c_str()); //
Temp0.Printf(wxT("%s%d.%d"),Temp0.c_str(),columnSize,decimalDigits);
s_Field.Printf(wxT("%sf"),Temp0.c_str()); //
break;
case DB_DATA_TYPE_DATE:
if (i_Nation == 0) // timestamp YYYY-MM-DD HH:MM:SS.SSS (tested for SYBASE)
@@ -211,7 +211,7 @@ int wxColFor::Format(int Nation,int dbDataType,SWORD sqlDataType,short columnSiz
}
break;
default:
s_Field.Printf("-E-> unknown Format(%d)-sql(%d)",dbDataType,sqlDataType); //
s_Field.Printf(wxT("-E-> unknown Format(%d)-sql(%d)"),dbDataType,sqlDataType); //
break;
};
return TRUE;
@@ -227,32 +227,32 @@ wxDB::wxDB(HENV &aHenv, bool FwdOnlyCursors)
sqlLogState = sqlLogOFF; // By default, logging is turned off
nTables = 0;
wxStrcpy(sqlState,"");
wxStrcpy(errorMsg,"");
wxStrcpy(sqlState,wxT(""));
wxStrcpy(errorMsg,wxT(""));
nativeError = cbErrorMsg = 0;
for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
wxStrcpy(errorList[i], "");
wxStrcpy(errorList[i], wxT(""));
// Init typeInf structures
wxStrcpy(typeInfVarchar.TypeName,"");
wxStrcpy(typeInfVarchar.TypeName,wxT(""));
typeInfVarchar.FsqlType = 0;
typeInfVarchar.Precision = 0;
typeInfVarchar.CaseSensitive = 0;
typeInfVarchar.MaximumScale = 0;
wxStrcpy(typeInfInteger.TypeName,"");
wxStrcpy(typeInfInteger.TypeName,wxT(""));
typeInfInteger.FsqlType = 0;
typeInfInteger.Precision = 0;
typeInfInteger.CaseSensitive = 0;
typeInfInteger.MaximumScale = 0;
wxStrcpy(typeInfFloat.TypeName,"");
wxStrcpy(typeInfFloat.TypeName,wxT(""));
typeInfFloat.FsqlType = 0;
typeInfFloat.Precision = 0;
typeInfFloat.CaseSensitive = 0;
typeInfFloat.MaximumScale = 0;
wxStrcpy(typeInfDate.TypeName,"");
wxStrcpy(typeInfDate.TypeName,wxT(""));
typeInfDate.FsqlType = 0;
typeInfDate.Precision = 0;
typeInfDate.CaseSensitive = 0;
@@ -896,8 +896,8 @@ void wxDB::Close(void)
tiu = (wxTablesInUse *)pNode->Data();
if (tiu->pDb == this)
{
s.sprintf("(%-20s) tableID:[%6lu] pDb:[%p]", tiu->tableName,tiu->tableID,tiu->pDb);
s2.sprintf("Orphaned found using pDb:[%p]",this);
s.sprintf(wxT("(%-20s) tableID:[%6lu] pDb:[%p]"), tiu->tableName,tiu->tableID,tiu->pDb);
s2.sprintf(wxT("Orphaned found using pDb:[%p]"),this);
wxLogDebug (s.c_str(),s2.c_str());
}
pNode = pNode->Next();

3
src/common/fontmap.cpp
View File

@@ -208,8 +208,7 @@ wxFontMapper::~wxFontMapper()
void wxFontMapper::SetConfigPath(const wxString& prefix)
{
wxCHECK_RET( !prefix.IsEmpty() && prefix[0] == wxCONFIG_PATH_SEPARATOR,
wxT("an absolute path should be given to "
"wxFontMapper::SetConfigPath()") );
wxT("an absolute path should be given to wxFontMapper::SetConfigPath()") );
m_configRootPath = prefix;
}