#include "std.h"
//----------------------------------------------------------------------------------------
// Global structure for holding ODBC connection information
-// - darf nur einmal im Projekte definiert werden ?? Extra Databasse Klasse ?
-wxDbConnectInf DbConnectInf; // Für DBase
+wxDbConnectInf DbConnectInf;
#if !wxUSE_ODBC
#error Demo cannot be compiled unless setup.h has wxUSE_ODBC set to 1
extern WXDLLEXPORT_DATA(wxDbList*) PtrBegDbList; /* from db.cpp, used in getting back error results from db connections */
//----------------------------------------------------------------------------------------
-char *GetExtendedDBErrorMsg(char *ErrFile, int ErrLine)
+wxChar *GetExtendedDBErrorMsg(wxChar *ErrFile, int ErrLine)
{
static wxString msg;
wxString tStr;
if (ErrFile || ErrLine)
{
- msg += "File: ";
+ msg += _T("File: ");
msg += ErrFile;
- msg += " Line: ";
- tStr.Printf("%d",ErrLine);
+ msg += _T(" Line: ");
+ tStr.Printf(_T("%d"),ErrLine);
msg += tStr.GetData();
- // msg += "\n";
+ // msg += _T("\n");
}
- msg.Append ("\nODBC errors:\n");
- // msg += "\n";
+ msg.Append (_T("\nODBC errors:\n"));
+ // msg += _T("\n");
/* Scan through each database connection displaying
* any ODBC errors that have occured. */
wxDbList *pDbList;
if (pDbList->PtrDb->errorList[i])
{
msg.Append(pDbList->PtrDb->errorList[i]);
- if (strcmp(pDbList->PtrDb->errorList[i],"") != 0)
- msg.Append("\n");
+ if (wxStrcmp(pDbList->PtrDb->errorList[i],_T("")) != 0)
+ msg.Append(_T("\n"));
}
}
}
- msg += "\n";
- return (char*) (const char*) msg;
+ msg += _T("\n");
+ return (wxChar*) (const wxChar*) msg;
} // GetExtendedDBErrorMsg
//----------------------------------------------------------------------------------------
BrowserDB::BrowserDB()
{
PointerToNULL(0);
- ODBCSource = ""; // ODBC data source name (created with ODBC Administrator under Win95/NT)
- UserName = ""; // database username - must already exist in the data source
- Password = ""; // password database username
+ ODBCSource = _T(""); // ODBC data source name (created with ODBC Administrator under Win95/NT)
+ UserName = _T(""); // database username - must already exist in the data source
+ Password = _T(""); // password database username
OnFillSqlTyp();
OnFilldbTyp();
} // BrowserDB Constructor
// Connect to datasource
//---------------------------------------------------------------------------------------
DlgUser *p_Dlg;
- p_Dlg = new DlgUser(pDoc->p_MainFrame,pDoc,"");
+ p_Dlg = new DlgUser(pDoc->p_MainFrame,pDoc,_T(""));
p_Dlg->s_DSN = ODBCSource;
p_Dlg->s_User = UserName;
p_Dlg->s_Password = Password;
SDWORD cb;
int i_dbDataType;
int i=0;
- char s_temp[1024+1];
+ wxChar s_temp[1024+1];
long l_temp;
double f_temp;
int AnzError=0;
{
return FALSE;
Temp0.Printf(_("\n-E-> BrowserDB::OnGetNext - ODBC-Error with GetNext \n-E-> "));
- Temp0 += GetExtendedDBErrorMsg(__FILE__,__LINE__);
+ Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
wxLogMessage(Temp0);
wxMessageBox(Temp0);
}
{
for (i=0;i<Cols;i++)
{
- strcpy((cl_BrowserDB+i)->tableName,"-E->");
+ wxStrcpy((cl_BrowserDB+i)->tableName,_T("-E->"));
i_dbDataType = (cl_BrowserDB+i)->pColFor->i_dbDataType;
if (i_dbDataType == 0) // Filter unsupported dbDataTypes
{
switch(i_dbDataType)
{
case DB_DATA_TYPE_VARCHAR:
- strcpy(s_temp,"");
+ wxStrcpy(s_temp,_T(""));
if (!db_BrowserDB->GetData(i+1,(cl_BrowserDB+i)->pColFor->i_dbDataType,&s_temp,sizeof(s_temp), &cb))
{
Temp0.Printf(_("\n-E-> BrowserDB::OnGetNext - ODBC-Error with GetNext of >%s<.\n-E-> "),(cl_BrowserDB+i)->tableName);
- Temp0 += GetExtendedDBErrorMsg(__FILE__,__LINE__);
+ Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
wxLogMessage(Temp0);
}
Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,s_temp);
- strcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
+ wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
break;
case DB_DATA_TYPE_INTEGER:
l_temp = 0;
if (!db_BrowserDB->GetData(i+1,(cl_BrowserDB+i)->pColFor->i_sqlDataType,&l_temp,sizeof(l_temp), &cb))
{
Temp0.Printf(_("\n-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n-E-> "));
- Temp0 += GetExtendedDBErrorMsg(__FILE__,__LINE__);
+ Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
}
else
{
Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,l_temp);
- strcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
+ wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
}
break;
case DB_DATA_TYPE_FLOAT:
if (!db_BrowserDB->GetData(i+1,(cl_BrowserDB+i)->pColFor->i_sqlDataType,&f_temp,sizeof(f_temp), &cb))
{
Temp0.Printf(_("\n-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n-E-> "));
- Temp0 += GetExtendedDBErrorMsg(__FILE__,__LINE__);
+ Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
wxMessageBox(Temp0);
}
else
{
Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,f_temp);
- strcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
+ wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
}
break;
case DB_DATA_TYPE_DATE:
if (!db_BrowserDB->GetData(i+1,(cl_BrowserDB+i)->pColFor->i_sqlDataType,&t_temp,sizeof(t_temp), &cb))
{
Temp0.Printf(_("\n-E-> BrowserDB::OnGetData - ODBC-Error with GetNext \n-E-> "));
- Temp0 += GetExtendedDBErrorMsg(__FILE__,__LINE__);
+ Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
}
else
{
{
Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,t_temp.year,t_temp.month,t_temp.day,
t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);
- strcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
+ wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
}
if (((cl_BrowserDB+i)->pColFor->i_Nation == 1) || // EU DD.MM.YYYY
((cl_BrowserDB+i)->pColFor->i_Nation == 2)) // UK DD/MM/YYYY
{
Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,t_temp.day,t_temp.month,t_temp.year,
t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);
- strcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
+ wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
}
if ((cl_BrowserDB+i)->pColFor->i_Nation == 3) // US MM/DD/YYYY
{
Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,t_temp.month,t_temp.day,t_temp.year,
t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);
- strcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
+ wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
}
}
break;
else
return TRUE;
Temp0.Printf(_("-E-> unknown Format(%d) - sql(%d)"),(cl_BrowserDB+i)->pColFor->i_dbDataType,(cl_BrowserDB+i)->pColFor->i_sqlDataType);
- strcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
+ wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
break;
}; // switch
} // for
wxString SQLStmt;
i_Records = 0;
//---------------------------------------------------------------------------------------
- SQLStmt.sprintf("SELECT * FROM %s",db_BrowserDB->SQLTableName(tb_Name.c_str()));
- if (!db_BrowserDB->ExecSql((char *)(SQLStmt.GetData())))
+ SQLStmt.sprintf(_T("SELECT * FROM %s"),db_BrowserDB->SQLTableName(tb_Name.c_str()));
+ if (!db_BrowserDB->ExecSql((wxChar *)(SQLStmt.GetData())))
{
Temp0.Printf(_("\n-E-> BrowserDB::OnSelect - ODBC-Error with ExecSql of >%s<.\n-E-> "),tb_Name.c_str());
- Temp0 += GetExtendedDBErrorMsg(__FILE__,__LINE__);
+ Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
wxLogMessage(Temp0);
- wxMessageBox("-E-> BrowserDB::OnSelect - GetData()");
+ wxMessageBox(_T("-E-> BrowserDB::OnSelect - GetData()"));
return FALSE;
}
//---------------------------------------------------------------------------------------
i_Records++;
}
//---------------------------------------------------------------------------------------
- if (!db_BrowserDB->ExecSql((char *)(SQLStmt.GetData())))
+ if (!db_BrowserDB->ExecSql((wxChar *)(SQLStmt.GetData())))
{
Temp0.Printf(_("\n-E-> BrowserDB::OnSelect - ODBC-Error with ExecSql of >%s<.\n-E-> "),tb_Name.c_str());
- Temp0 += GetExtendedDBErrorMsg(__FILE__,__LINE__);
+ Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
wxLogMessage(Temp0);
return FALSE;
}
bool BrowserDB::OnExecSql(wxString SQLStmt, int Quiet)
{
//---------------------------------------------------------------------------------------
- if (!db_BrowserDB->ExecSql((char *)(SQLStmt.GetData())))
+ if (!db_BrowserDB->ExecSql((wxChar *)(SQLStmt.GetData())))
{
Temp0.Printf(_("\n-E-> BrowserDB::OnExecSQL - ODBC-Error with ExecSql of >%s<.\n-E-> "),SQLStmt.c_str());
- Temp0 += GetExtendedDBErrorMsg(__FILE__,__LINE__);
+ Temp0 += GetExtendedDBErrorMsg(__TFILE__,__LINE__);
if (!Quiet)
wxLogMessage(Temp0);
else
- wxMessageBox("-E-> BrowserDB::OnExecSql - ExecSql()");
+ wxMessageBox(_T("-E-> BrowserDB::OnExecSql - ExecSql()"));
return FALSE;
}
if (!Quiet)
//----------------------------------------------------------------------------------------
wxDbInf* BrowserDB::OnGetCatalog(int Quiet)
{
- char UName[255];
- strcpy(UName,UserName);
+ wxChar UName[255];
+ wxStrcpy(UName,UserName);
ct_BrowserDB = db_BrowserDB->GetCatalog(UName);
return ct_BrowserDB;
}
//----------------------------------------------------------------------------------------
-wxDbColInf* BrowserDB::OnGetColumns(char *tableName, UWORD numCols, int Quiet)
+wxDbColInf* BrowserDB::OnGetColumns(wxChar *tableName, UWORD numCols, int Quiet)
{
- char UName[255];
+ wxChar UName[255];
int i;
- strcpy(UName,UserName);
+ wxStrcpy(UName,UserName);
cl_BrowserDB = db_BrowserDB->GetColumns(tableName,&numCols,UName);
// cl_BrowserDB->pColFor = new wxDbColFor[numCols];
for (i=0;i<numCols;i++)
//----------------------------------------------------------------------------------------
void BrowserDB::OnFillSqlTyp()
{
- i_SqlTyp[1] = SQL_C_BINARY; s_SqlTyp[1] = "SQL_C_BINARY";
- i_SqlTyp[2] = SQL_C_BIT; s_SqlTyp[2] = "SQL_C_BIT";
- i_SqlTyp[3] = SQL_C_BOOKMARK; s_SqlTyp[3] = "SQL_C_BOOKMARK";
- i_SqlTyp[4] = SQL_C_CHAR; s_SqlTyp[4] = "SQL_C_CHAR";
- i_SqlTyp[5] = SQL_C_DATE; s_SqlTyp[5] = "SQL_C_DATE";
- i_SqlTyp[6] = SQL_C_DEFAULT; s_SqlTyp[6] = "SQL_C_DEFAULT";
- i_SqlTyp[7] = SQL_C_DOUBLE; s_SqlTyp[7] = "SQL_C_DOUBLE";
- i_SqlTyp[8] = SQL_C_FLOAT; s_SqlTyp[8] = "SQL_C_FLOAT";
- i_SqlTyp[9] = SQL_C_LONG; s_SqlTyp[9] = "SQL_C_LONG";
- i_SqlTyp[10] = SQL_C_SHORT; s_SqlTyp[10] = "SQL_C_SHORT";
- i_SqlTyp[11] = SQL_C_SLONG; s_SqlTyp[11] = "SQL_C_SLONG";
- i_SqlTyp[12] = SQL_C_SSHORT; s_SqlTyp[12] = "SQL_C_SSHORT";
- i_SqlTyp[13] = SQL_C_STINYINT; s_SqlTyp[13] = "SQL_C_STINYINT";
- i_SqlTyp[14] = SQL_C_TIME; s_SqlTyp[14] = "SQL_C_TIME";
- i_SqlTyp[15] = SQL_C_TIMESTAMP; s_SqlTyp[15] = "SQL_C_TIMESTAMP";
- i_SqlTyp[16] = SQL_C_TINYINT; s_SqlTyp[16] = "SQL_C_TINYINT";
- i_SqlTyp[17] = SQL_C_ULONG; s_SqlTyp[17] = "SQL_C_ULONG";
- i_SqlTyp[18] = SQL_C_USHORT; s_SqlTyp[18] = "SQL_C_USHORT";
- i_SqlTyp[19] = SQL_C_UTINYINT; s_SqlTyp[19] = "SQL_C_UTINYINT";
- i_SqlTyp[20] = SQL_VARCHAR; s_SqlTyp[20] = "SQL_VARCHAR";
- i_SqlTyp[21] = SQL_NUMERIC; s_SqlTyp[21] = "SQL_NUMERIC";
- i_SqlTyp[22] = SQL_LONGVARCHAR; s_SqlTyp[22] = "SQL_LONGVARCHAR";
- i_SqlTyp[23] = SQL_REAL; s_SqlTyp[23] = "SQL_REAL";
- i_SqlTyp[0] = 23; s_SqlTyp[0] = "";
+ i_SqlTyp[1] = SQL_C_BINARY; s_SqlTyp[1] = _T("SQL_C_BINARY");
+ i_SqlTyp[2] = SQL_C_BIT; s_SqlTyp[2] = _T("SQL_C_BIT");
+ i_SqlTyp[3] = SQL_C_BOOKMARK; s_SqlTyp[3] = _T("SQL_C_BOOKMARK");
+ i_SqlTyp[4] = SQL_C_CHAR; s_SqlTyp[4] = _T("SQL_C_CHAR");
+ i_SqlTyp[5] = SQL_C_DATE; s_SqlTyp[5] = _T("SQL_C_DATE");
+ i_SqlTyp[6] = SQL_C_DEFAULT; s_SqlTyp[6] = _T("SQL_C_DEFAULT");
+ i_SqlTyp[7] = SQL_C_DOUBLE; s_SqlTyp[7] = _T("SQL_C_DOUBLE");
+ i_SqlTyp[8] = SQL_C_FLOAT; s_SqlTyp[8] = _T("SQL_C_FLOAT");
+ i_SqlTyp[9] = SQL_C_LONG; s_SqlTyp[9] = _T("SQL_C_LONG");
+ i_SqlTyp[10] = SQL_C_SHORT; s_SqlTyp[10] = _T("SQL_C_SHORT");
+ i_SqlTyp[11] = SQL_C_SLONG; s_SqlTyp[11] = _T("SQL_C_SLONG");
+ i_SqlTyp[12] = SQL_C_SSHORT; s_SqlTyp[12] = _T("SQL_C_SSHORT");
+ i_SqlTyp[13] = SQL_C_STINYINT; s_SqlTyp[13] = _T("SQL_C_STINYINT");
+ i_SqlTyp[14] = SQL_C_TIME; s_SqlTyp[14] = _T("SQL_C_TIME");
+ i_SqlTyp[15] = SQL_C_TIMESTAMP; s_SqlTyp[15] = _T("SQL_C_TIMESTAMP");
+ i_SqlTyp[16] = SQL_C_TINYINT; s_SqlTyp[16] = _T("SQL_C_TINYINT");
+ i_SqlTyp[17] = SQL_C_ULONG; s_SqlTyp[17] = _T("SQL_C_ULONG");
+ i_SqlTyp[18] = SQL_C_USHORT; s_SqlTyp[18] = _T("SQL_C_USHORT");
+ i_SqlTyp[19] = SQL_C_UTINYINT; s_SqlTyp[19] = _T("SQL_C_UTINYINT");
+ i_SqlTyp[20] = SQL_VARCHAR; s_SqlTyp[20] = _T("SQL_VARCHAR");
+ i_SqlTyp[21] = SQL_NUMERIC; s_SqlTyp[21] = _T("SQL_NUMERIC");
+ i_SqlTyp[22] = SQL_LONGVARCHAR; s_SqlTyp[22] = _T("SQL_LONGVARCHAR");
+ i_SqlTyp[23] = SQL_REAL; s_SqlTyp[23] = _T("SQL_REAL");
+ i_SqlTyp[0] = 23; s_SqlTyp[0] = _T("");
}
//----------------------------------------------------------------------------------------
void BrowserDB::OnFilldbTyp()
{
- i_dbTyp[1] = DB_DATA_TYPE_VARCHAR; s_dbTyp[1] = "DB_DATA_TYPE_VARCHAR";
- i_dbTyp[2] = DB_DATA_TYPE_INTEGER; s_dbTyp[2] = "DB_DATA_TYPE_INTEGER";
- i_dbTyp[3] = DB_DATA_TYPE_FLOAT; s_dbTyp[3] = "DB_DATA_TYPE_FLOAT";
- i_dbTyp[4] = DB_DATA_TYPE_DATE; s_dbTyp[4] = "DB_DATA_TYPE_DATE";
- i_dbTyp[0] = 4; s_dbTyp[0] = "";
+ i_dbTyp[1] = DB_DATA_TYPE_VARCHAR; s_dbTyp[1] = _T("DB_DATA_TYPE_VARCHAR");
+ i_dbTyp[2] = DB_DATA_TYPE_INTEGER; s_dbTyp[2] = _T("DB_DATA_TYPE_INTEGER");
+ i_dbTyp[3] = DB_DATA_TYPE_FLOAT; s_dbTyp[3] = _T("DB_DATA_TYPE_FLOAT");
+ i_dbTyp[4] = DB_DATA_TYPE_DATE; s_dbTyp[4] = _T("DB_DATA_TYPE_DATE");
+ i_dbTyp[0] = 4; s_dbTyp[0] = _T("");
}
//----------------------------------------------------------------------------------------
bool OnExecSql(wxString SQLStmt,int Quiet);
bool OnGetNext(int Cols,int Quiet);
wxDbInf* OnGetCatalog(int Quiet);
- wxDbColInf* OnGetColumns(char *tableName, UWORD numCols,int Quiet);
+ wxDbColInf* OnGetColumns(wxChar *tableName, UWORD numCols,int Quiet);
void OnFillSqlTyp();
void OnFilldbTyp();
//---------------------------------------------------------------------------------------
wxString Temp0; // Use as needed
//---------------------------------------------------------------------------------------
// set the language to use // Help.?? (.std = english, .de = german etc.)
- const char *language = NULL; // czech, german, french, polish
- const char *langid = NULL; // std = english , cz, de = german, fr = french, pl = polish
+ const wxChar *language = NULL; // czech, german, french, polish
+ const wxChar *langid = NULL; // std = english , cz, de = german, fr = french, pl = polish
wxString s_LangHelp; // Directory/Filename.hhp of the Help-Project file
wxString s_LangId, s_Language;
s_Language.Empty(); s_LangId.Empty(); s_LangHelp.Empty();
//---------------------------------------------------------------------------------------
// Win-Registry : Workplace\HKEY_CURRENT_USERS\Software\%GetVendorName()\%GetAppName()
//---------------------------------------------------------------------------------------
- SetVendorName("mj10777"); // Needed to get Configuration Information
- SetAppName("DBBrowse"); // "" , also needed for s_LangHelp
+ SetVendorName(_T("mj10777")); // Needed to get Configuration Information
+ SetAppName(_T("DBBrowse")); // "" , also needed for s_LangHelp
//---------------------------------------------------------------------------------------
// we're using wxConfig's "create-on-demand" feature: it will create the
// config object when it's used for the first time. It has a number of
//---------------------------------------------------------------------------------------
p_ProgramCfg = wxConfigBase::Get(); // Get Program Configuration from Registry
// p_ProgramCfg->DeleteAll(); // This is how the Config can be erased
- p_ProgramCfg->SetPath("/"); // Start at root
+ p_ProgramCfg->SetPath(_T("/")); // Start at root
//---------------------------------------------------------------------------------------
//-- Set the Language and remember it for the next time. --------------------------------
//---------------------------------------------------------------------------------------
if (langid == NULL) // No Parameter was given
{
Temp0.Empty();
- p_ProgramCfg->Read("/Local/langid",&Temp0); // >const char *langid< can't be used here
- if (Temp0 == "")
- langid = "std"; // Standard language is "std" = english
+ p_ProgramCfg->Read(_T("/Local/langid"),&Temp0); // >const char *langid< can't be used here
+ if (Temp0 == _T(""))
+ langid = _T("std"); // Standard language is "std" = english
else
langid = Temp0;
}
- Temp0.Printf("%s",langid);
+ Temp0.Printf(_T("%s"),langid);
//---------------------------------------------------------------------------------------
// Support the following languages (std = english)
- if ((Temp0 == "a") || (Temp0 == "cz") || (Temp0 == "de") ||
- (Temp0 == "fr") || (Temp0 == "pl"))
+ if ((Temp0 == _T("a")) || (Temp0 == _T("cz")) || (Temp0 == _T("de")) ||
+ (Temp0 == _T("fr")) || (Temp0 == _T("pl")))
{ // The three-letter language-string codes are only valid in Windows NT and Windows 95.
- if (Temp0 == "cz")
- language = "czech"; // csy or czech
- if ((Temp0 == "de") || (Temp0 == "a"))
+ if (Temp0 == _T("cz"))
+ language = _T("czech"); // csy or czech
+ if ((Temp0 == _T("de")) || (Temp0 == _T("a")))
{
- language = "german"; // deu or german
- if (Temp0 == "a")
- { langid = Temp0 = "de"; } // Austrian = german
+ language = _T("german"); // deu or german
+ if (Temp0 == _T("a"))
+ { langid = Temp0 = _T("de"); } // Austrian = german
} // german / austrian
- if (Temp0 == "fr")
- language = "french"; // fra or french
- if (Temp0 == "pl")
- language = "polish"; // plk or polish
+ if (Temp0 == _T("fr"))
+ language = _T("french"); // fra or french
+ if (Temp0 == _T("pl"))
+ language = _T("polish"); // plk or polish
if (!m_locale.Init(language, langid, language)) // Don't do this for english (std)
{ // You should recieve errors here for cz and pl since there is no cz/ and pl/ directory
- wxLogMessage("-E-> %s : SetLocale error : langid(%s) ; language(%s)",GetAppName().c_str(),langid,language);
- langid = "std";
- language = "C"; // english, english-aus , -can , -nz , -uk , -usa
+ wxLogMessage(_T("-E-> %s : SetLocale error : langid(%s) ; language(%s)"),GetAppName().c_str(),langid,language);
+ langid = _T("std");
+ language = _T("C"); // english, english-aus , -can , -nz , -uk , -usa
}
else
{ // Read in Foreign language's text for GetAppName() and Help
Temp0 = GetAppName();
Temp0 = Temp0.Lower();
m_locale.AddCatalog(Temp0.c_str());
- m_locale.AddCatalog("help");
+ m_locale.AddCatalog(_T("help"));
}
} // Support the following languages (std = english)
else
{
- langid = "std";
- language = "C"; // english, english-aus , -can , -nz , -uk , -usa
+ langid = _T("std");
+ language = _T("C"); // english, english-aus , -can , -nz , -uk , -usa
}
- s_Language.Printf("%s",language); // language is a pointer
- s_LangId.Printf("%s",langid); // langid is a pointer
- p_ProgramCfg->Write("/Local/language",s_Language);
- p_ProgramCfg->Write("/Local/langid",s_LangId);
- s_LangHelp.Printf("help.%s/%s.hhp",s_LangId.c_str(),GetAppName().c_str()); // "help.std/Garantie.hhp";
+ s_Language.Printf(_T("%s"),language); // language is a pointer
+ s_LangId.Printf(_T("%s"),langid); // langid is a pointer
+ p_ProgramCfg->Write(_T("/Local/language"),s_Language);
+ p_ProgramCfg->Write(_T("/Local/langid"),s_LangId);
+ s_LangHelp.Printf(_T("help.%s/%s.hhp"),s_LangId.c_str(),GetAppName().c_str()); // "help.std/Garantie.hhp";
s_LangHelp = s_LangHelp.Lower(); // A must for Linux
//---------------------------------------------------------------------------------------
- Temp0 = "NONE"; // I don't remember why I did this
- p_ProgramCfg->Write("/NONE",Temp0); // I don't remember why I did this
- p_ProgramCfg->Write("/Paths/NONE",Temp0); // I don't remember why I did this
- p_ProgramCfg->Write("/MainFrame/NONE",Temp0); // I don't remember why I did this
+ Temp0 = _T("NONE"); // I don't remember why I did this
+ p_ProgramCfg->Write(_T("/NONE"),Temp0); // I don't remember why I did this
+ p_ProgramCfg->Write(_T("/Paths/NONE"),Temp0); // I don't remember why I did this
+ p_ProgramCfg->Write(_T("/MainFrame/NONE"),Temp0); // I don't remember why I did this
//---------------------------------------------------------------------------------------
- p_ProgramCfg->Write("/Paths/Work",wxGetCwd()); // Get current Working Path
- p_ProgramCfg->SetPath("/");
+ p_ProgramCfg->Write(_T("/Paths/Work"),wxGetCwd()); // Get current Working Path
+ p_ProgramCfg->SetPath(_T("/"));
//---------------------------------------------------------------------------------------
// restore frame position and size, if empty start Values (1,1) and (750,600)
- int x = p_ProgramCfg->Read("/MainFrame/x", 1), y = p_ProgramCfg->Read("/MainFrame/y", 1),
- w = p_ProgramCfg->Read("/MainFrame/w", 750), h = p_ProgramCfg->Read("/MainFrame/h", 600);
+ int x = p_ProgramCfg->Read(_T("/MainFrame/x"), 1), y = p_ProgramCfg->Read(_T("/MainFrame/y"), 1),
+ w = p_ProgramCfg->Read(_T("/MainFrame/w"), 750), h = p_ProgramCfg->Read(_T("/MainFrame/h"), 600);
//---------------------------------------------------------------------------------------
// Create the main frame window
- Temp0.Printf("%s - %s",GetAppName().c_str(),GetVendorName().c_str());
- frame = new MainFrame((wxFrame *) NULL,(char *) Temp0.c_str(),wxPoint(x,y),wxSize(w,h));
+ Temp0.Printf(_T("%s - %s"),GetAppName().c_str(),GetVendorName().c_str());
+ frame = new MainFrame((wxFrame *) NULL,(wxChar *) Temp0.c_str(),wxPoint(x,y),wxSize(w,h));
//---------------------------------------------------------------------------------------
// Set the Backgroundcolour (only need if your are NOT using wxSYS_COLOUR_BACKGROUND)
frame->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BACKGROUND));
// You should recieve errors here for fr since there is no help.fr/ directory
if (!frame->p_Help->AddBook(s_LangHelp)) // Use the language set
{ // You should recieve errors here for fr since there is no help.fr/ but a fr/ directory
- wxLogMessage("-E-> %s : AddBook error : s_LangHelp(%s)",GetAppName().c_str(),s_LangHelp.c_str());
+ wxLogMessage(_T("-E-> %s : AddBook error : s_LangHelp(%s)"),GetAppName().c_str(),s_LangHelp.c_str());
}
frame->pDoc->p_Help = frame->p_Help; // Save the information to the document
//---------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------
// My frame constructor
//----------------------------------------------------------------------------------------
-MainFrame::MainFrame(wxFrame *frame, char *title, const wxPoint& pos, const wxSize& size):
+MainFrame::MainFrame(wxFrame *frame, wxChar *title, const wxPoint& pos, const wxSize& size):
wxFrame(frame, -1, title, pos, size)
{
p_Splitter = NULL; pDoc = NULL; p_Help = NULL; // Keep the Pointers clean !
int x, y, w, h;
GetPosition(&x, &y);
GetClientSize(&w, &h); w -= DiffW; h -= DiffH;
- p_ProgramCfg->Write("/MainFrame/x", (long) x);
- p_ProgramCfg->Write("/MainFrame/y", (long) y);
- p_ProgramCfg->Write("/MainFrame/w", (long) w);
- p_ProgramCfg->Write("/MainFrame/h", (long) h);
- p_ProgramCfg->Write("/MainFrame/Sash", (long) pDoc->Sash);
+ p_ProgramCfg->Write(_T("/MainFrame/x"), (long) x);
+ p_ProgramCfg->Write(_T("/MainFrame/y"), (long) y);
+ p_ProgramCfg->Write(_T("/MainFrame/w"), (long) w);
+ p_ProgramCfg->Write(_T("/MainFrame/h"), (long) h);
+ p_ProgramCfg->Write(_T("/MainFrame/Sash"), (long) pDoc->Sash);
// clean up: Set() returns the active config object as Get() does, but unlike
// Get() it doesn't try to create one if there is none (definitely not what
// we want here!)
//----------------------------------------------------------------------------------------
void MainFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
{
- p_Help->Display("Main page");
+ p_Help->Display(_T("Main page"));
}
//----------------------------------------------------------------------------------------
class MainFrame: public wxFrame
{
public:
- MainFrame(wxFrame *frame, char *title, const wxPoint& pos, const wxSize& size);
+ MainFrame(wxFrame *frame, wxChar *title, const wxPoint& pos, const wxSize& size);
~MainFrame(void);
public:
{
b_EditModus = FALSE;
//---------------------------------------------------------------------------------------
- popupMenu1 = new wxMenu("");
+ popupMenu1 = new wxMenu(_T(""));
popupMenu1->Append(GRID_EDIT, _("Edit Modus"));
- popupMenu2 = new wxMenu("");
+ popupMenu2 = new wxMenu(_T(""));
popupMenu2->Append(GRID_BROWSE, _("Browse Modus"));
}
// The Grid has been created, now fill it
for (z=0;z<(db_Br+i_Which)->i_Records;z++) // Loop through the Records
{
- Temp0.Printf("%06d",z+1); SetRowLabelValue(z,Temp0); // Set Row Lable Value
+ Temp0.Printf(_T("%06d"),z+1); SetRowLabelValue(z,Temp0); // Set Row Lable Value
(db_Br+i_Which)->OnGetNext((ct_BrowserDB->pTableInf+ValidTable)->numCols,FALSE);
for (y=0;y<(ct_BrowserDB->pTableInf+ValidTable)->numCols;y++) // Loop through the Fields
{ // BrowserDB::OnGetNext Formats the field Value into tablename
//----------------------------------------------------------------------------------------
void DBGrid::OnSelectCell( wxGridEvent& ev )
{
- logBuf = "";
- logBuf << "Selected cell at row " << ev.GetRow()
- << " col " << ev.GetCol();
- wxLogMessage( "%s", logBuf.c_str() );
+ logBuf = _T("");
+ logBuf << _T("Selected cell at row ") << ev.GetRow()
+ << _T(" col ") << ev.GetCol();
+ wxLogMessage( _T("%s"), logBuf.c_str() );
// you must call Skip() if you want the default processing
// to occur in wxGrid
ev.Skip();
//----------------------------------------------------------------------------------------
void DBGrid::OnLabelLeftClick( wxGridEvent& ev )
{
- logBuf = "DBGrid::OnLabelLeftClick : ";
+ logBuf = _T("DBGrid::OnLabelLeftClick : ");
if ( ev.GetRow() != -1 )
{
- logBuf << "row label " << ev.GetRow();
+ logBuf << _T("row label ") << ev.GetRow();
}
else if ( ev.GetCol() != -1 )
{
- logBuf << "col label " << ev.GetCol();
+ logBuf << _T("col label ") << ev.GetCol();
}
else
{
- logBuf << "corner label";
+ logBuf << _T("corner label");
}
if ( ev.ShiftDown() )
- logBuf << " (shift down)";
+ logBuf << _T(" (shift down)");
// wxLogMessage( "%s", logBuf.c_str() );
- logBuf += "\n";
+ logBuf += _T("\n");
wxLogMessage(logBuf.c_str());
ev.Skip();
}
else
PopupMenu(popupMenu1,MousePos.x,MousePos.y);
//-------------------
- logBuf = "DBGrid::OnLabelRightClick : ";
+ logBuf = _T("DBGrid::OnLabelRightClick : ");
if ( ev.GetRow() != -1 )
{
- logBuf << "row label " << ev.GetRow();
+ logBuf << _T("row label ") << ev.GetRow();
}
else if ( ev.GetCol() != -1 )
{
- logBuf << "col label " << ev.GetCol();
+ logBuf << _T("col label ") << ev.GetCol();
}
else
{
- logBuf << "corner label";
+ logBuf << _T("corner label");
}
if ( ev.ShiftDown() )
- logBuf << " (shift down)";
+ logBuf << _T(" (shift down)");
// wxLogMessage( "%s", logBuf.c_str() );
- logBuf += "\n";
+ logBuf += _T("\n");
wxLogMessage(logBuf.c_str());
ev.Skip();
}
//----------------------------------------------------------------------------------------
void DBGrid::OnLabelLeftDClick( wxGridEvent& ev )
{
- logBuf = "DBGrid::OnLabelLeftDClick : ";
+ logBuf = _T("DBGrid::OnLabelLeftDClick : ");
if ( ev.GetRow() != -1 )
{
- logBuf << "row label " << ev.GetRow();
+ logBuf << _T("row label ") << ev.GetRow();
}
else if ( ev.GetCol() != -1 )
{
- logBuf << "col label " << ev.GetCol();
+ logBuf << _T("col label ") << ev.GetCol();
}
else
{
- logBuf << "corner label";
+ logBuf << _T("corner label");
}
if ( ev.ShiftDown() )
- logBuf << " (shift down)";
+ logBuf << _T(" (shift down)");
- // wxLogMessage( "%s", logBuf.c_str() );
- logBuf += "\n";
+ // wxLogMessage( _T("%s"), logBuf.c_str() );
+ logBuf += _T("\n");
wxLogMessage(logBuf.c_str());
ev.Skip();
}
//----------------------------------------------------------------------------------------
void DBGrid::OnLabelRightDClick( wxGridEvent& ev )
{
- logBuf = "DBGrid::OnLabelRightDClick : ";
+ logBuf = _T("DBGrid::OnLabelRightDClick : ");
if ( ev.GetRow() != -1 )
{
- logBuf << "row label " << ev.GetRow();
+ logBuf << _T("row label ") << ev.GetRow();
}
else if ( ev.GetCol() != -1 )
{
- logBuf << "col label " << ev.GetCol();
+ logBuf << _T("col label ") << ev.GetCol();
}
else
{
- logBuf << "corner label";
+ logBuf << _T("corner label");
}
if ( ev.ShiftDown() )
- logBuf << " (shift down)";
+ logBuf << _T(" (shift down)");
// wxLogMessage( "%s", logBuf.c_str() );
- logBuf += "\n";
+ logBuf += _T("\n");
wxLogMessage(logBuf.c_str());
ev.Skip();
}
//----------------------------------------------------------------------------------------
void DBGrid::OnCellLeftClick( wxGridEvent& ev )
{
- logBuf = "DBGrid::OnCellLeftClick : ";
- logBuf << "Cell at row " << ev.GetRow()
- << " col " << ev.GetCol();
+ logBuf = _T("DBGrid::OnCellLeftClick : ");
+ logBuf << _T("Cell at row ") << ev.GetRow()
+ << _T(" col ") << ev.GetCol();
// wxLogMessage( "%s", logBuf.c_str() );
// wxMessageBox(logBuf);
- logBuf += "\n";
+ logBuf += _T("\n");
wxLogMessage(logBuf.c_str());
// you must call event skip if you want default grid processing
// (cell highlighting etc.)
//----------------------------------------------------------------------------------------
void DBGrid::OnCellRightClick( wxGridEvent& ev )
{
- logBuf = "DBGrid::OnCellRightClick : ";
- logBuf << "Cell at row " << ev.GetRow()
- << " col " << ev.GetCol();
+ logBuf = _T("DBGrid::OnCellRightClick : ");
+ logBuf << _T("Cell at row ") << ev.GetRow()
+ << _T(" col ") << ev.GetCol();
// wxLogMessage( "%s", logBuf.c_str() );
// wxMessageBox(logBuf);
- logBuf += "\n";
+ logBuf += _T("\n");
wxLogMessage(logBuf.c_str());
// you must call event skip if you want default grid processing
// (cell highlighting etc.)
//----------------------------------------------------------------------------------------
void DBGrid::OnCellLeftDClick( wxGridEvent& ev )
{
- logBuf = "DBGrid::OnCellLeftDClick : ";
- logBuf << "Cell at row " << ev.GetRow()
- << " col " << ev.GetCol();
+ logBuf = _T("DBGrid::OnCellLeftDClick : ");
+ logBuf << _T("Cell at row ") << ev.GetRow()
+ << _T(" col ") << ev.GetCol();
// wxLogMessage( "%s", logBuf.c_str() );
// wxMessageBox(logBuf);
- logBuf += "\n";
+ logBuf += _T("\n");
wxLogMessage(logBuf.c_str());
// you must call event skip if you want default grid processing
// (cell highlighting etc.)
//----------------------------------------------------------------------------------------
void DBGrid::OnCellRightDClick( wxGridEvent& ev )
{
- logBuf = "DBGrid::OnCellRightDClick : ";
- logBuf << "Cell at row " << ev.GetRow()
- << " col " << ev.GetCol();
+ logBuf = _T("DBGrid::OnCellRightDClick : ");
+ logBuf << _T("Cell at row ") << ev.GetRow()
+ << _T(" col ") << ev.GetCol();
// wxLogMessage( "%s", logBuf.c_str() );
// wxMessageBox(logBuf);
- logBuf += "\n";
+ logBuf += _T("\n");
wxLogMessage(logBuf.c_str());
// you must call event skip if you want default grid processing
// (cell highlighting etc.)
//----------------------------------------------------------------------------------------
void DBGrid::OnCellChange( wxGridEvent& ev )
{
- logBuf = "DBGrid::OnCellChange : ";
- logBuf << "Cell at row " << ev.GetRow()
- << " col " << ev.GetCol();
+ logBuf = _T("DBGrid::OnCellChange : ");
+ logBuf << _T("Cell at row ") << ev.GetRow()
+ << _T(" col ") << ev.GetCol();
// wxLogMessage( "%s", logBuf.c_str() );
// wxMessageBox(logBuf);
- logBuf += "\n";
+ logBuf += _T("\n");
wxLogMessage(logBuf.c_str());
// you must call event skip if you want default grid processing
// (cell highlighting etc.)
//----------------------------------------------------------------------------------------
void DBGrid::OnRowSize( wxGridSizeEvent& ev )
{
- logBuf = "DBGrid::OnRowSize : ";
- logBuf << "Resized row " << ev.GetRowOrCol();
+ logBuf = _T("DBGrid::OnRowSize : ");
+ logBuf << _T("Resized row ") << ev.GetRowOrCol();
// wxLogMessage( "%s", logBuf.c_str() );
- logBuf += "\n";
+ logBuf += _T("\n");
wxLogMessage(logBuf.c_str());
ev.Skip();
}
//----------------------------------------------------------------------------------------
void DBGrid::OnColSize( wxGridSizeEvent& ev )
{
- logBuf = "DBGrid::OnColSize : ";
- logBuf << "Resized col " << ev.GetRowOrCol();
+ logBuf = _T("DBGrid::OnColSize : ");
+ logBuf << _T("Resized col ") << ev.GetRowOrCol();
// wxLogMessage( "%s", logBuf.c_str() );
- logBuf += "\n";
+ logBuf += _T("\n");
wxLogMessage(logBuf.c_str());
ev.Skip();
}
//----------------------------------------------------------------------------------------
void DBGrid::OnRangeSelected( wxGridRangeSelectEvent& ev )
{
- logBuf = "DBGrid::OnRangeSelected : ";
- logBuf << "Selected cells from row " << ev.GetTopRow()
- << " col " << ev.GetLeftCol()
- << " to row " << ev.GetBottomRow()
- << " col " << ev.GetRightCol();
- logBuf += "\n";
+ logBuf = _T("DBGrid::OnRangeSelected : ");
+ logBuf << _T("Selected cells from row ") << ev.GetTopRow()
+ << _T(" col ") << ev.GetLeftCol()
+ << _T(" to row ") << ev.GetBottomRow()
+ << _T(" col ") << ev.GetRightCol();
+ logBuf += _T("\n");
// wxLogMessage( "%s", logBuf.c_str() );
wxLogMessage(logBuf.c_str());
ev.Skip();
//----------------------------------------------------------------------------------------
//-- Global functions --------------------------------------------------------------------
//----------------------------------------------------------------------------------------
-static inline const char *bool2String(bool b)
+static inline const wxChar *bool2String(bool b)
{
- return b ? "" : "not ";
+ return b ? _T("") : _T("not ");
}
//----------------------------------------------------------------------------------------
DBTree::DBTree(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size, long style)
: wxTreeCtrl(parent, id, pos, size, style)
{
+ const int image_size = 16;
// Make an image list containing small icons
- p_imageListNormal = new wxImageList(16, 16, TRUE);
+ p_imageListNormal = new wxImageList(image_size, image_size, TRUE);
// should correspond to TreeIc_xxx enum
#if !defined(__WXMSW__)
#include "bitmaps/logo.xpm"
#include "bitmaps/d_open.xpm"
#include "bitmaps/d_closed.xpm"
#endif
- p_imageListNormal->Add(wxICON(aLogo));
- p_imageListNormal->Add(wxICON(DsnClosed));
- p_imageListNormal->Add(wxICON(DsnOpen));
- p_imageListNormal->Add(wxICON(TAB));
- p_imageListNormal->Add(wxICON(VIEW));
- p_imageListNormal->Add(wxICON(COL));
- p_imageListNormal->Add(wxICON(KEY));
- p_imageListNormal->Add(wxICON(KEYF));
- p_imageListNormal->Add(wxICON(DocOpen));
- p_imageListNormal->Add(wxICON(DocOpen));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(aLogo)).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DsnClosed)).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DsnOpen)).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(TAB)).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(VIEW)).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(COL)).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(KEY)).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(KEYF)).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DocOpen)).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DocOpen)).ConvertToImage().Rescale(image_size, image_size)));
SetImageList(p_imageListNormal);
ct_BrowserDB = NULL;
popupMenu1 = NULL;
ct_BrowserDB = (pDoc->db_Br+i_Which)->OnGetCatalog(FALSE);
if (ct_BrowserDB)
{ // Use the wxDatabase Information
- Temp0.Printf("%s - (%s) (%s)", s_DSN.c_str(),ct_BrowserDB->catalog, ct_BrowserDB->schema);
- Root = AddRoot(Temp0,TreeIc_DsnOpen,TreeIc_DsnOpen,new DBTreeData("Root"));
+ Temp0.Printf(_T("%s - (%s) (%s)"), s_DSN.c_str(),ct_BrowserDB->catalog, ct_BrowserDB->schema);
+ Root = AddRoot(Temp0,TreeIc_DsnOpen,TreeIc_DsnOpen,new DBTreeData(_T("Root")));
for (x=0;x<ct_BrowserDB->numTables;x++)
{
wxYield();
TableType = 0; // TABLE = 1 ; VIEW = 2 ; 0 We are not interested in
- if (!wxStrcmp((ct_BrowserDB->pTableInf+x)->tableType,"TABLE")) // only TABLES
+ if (!wxStrcmp((ct_BrowserDB->pTableInf+x)->tableType,_T("TABLE"))) // only TABLES
TableType = 1;
- if (!wxStrcmp((ct_BrowserDB->pTableInf+x)->tableType,"VIEW")) // and VIEWS
+ if (!wxStrcmp((ct_BrowserDB->pTableInf+x)->tableType,_T("VIEW"))) // and VIEWS
TableType = 2;
if (TableType) // only TABLES or Views
{
- Temp1.Printf("TN(%s",(ct_BrowserDB->pTableInf+x)->tableName);
+ Temp1.Printf(_T("TN(%s"),(ct_BrowserDB->pTableInf+x)->tableName);
//----
(ct_BrowserDB->pTableInf+x)->pColInf = (pDoc->db_Br+i_Which)->OnGetColumns((ct_BrowserDB->pTableInf+x)->tableName,(ct_BrowserDB->pTableInf+x)->numCols,FALSE);
//----
}
for (y=0;y<(ct_BrowserDB->pTableInf+x)->numCols;y++)
{
- Temp1.Printf("FN(%s",((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName);
+ Temp1.Printf(_T("FN(%s"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName);
// Here is where we find out if the Column is a Primary / Foreign Key
if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkCol != 0) // Primary Key
{
- Temp2.Printf("(%d) - %s",((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkCol,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName);
+ Temp2.Printf(_T("(%d) - %s"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkCol,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName);
Docu = AppendItem(Folder,Temp2,TreeIc_KEY,TreeIc_KEY,new DBTreeData(Temp1));
Temp2 = ((ct_BrowserDB->pTableInf+x)->pColInf+y)->PkTableName;
- if (Temp2 == "")
+ if (Temp2 == _T(""))
Temp2 = _("None");
Temp2.Printf(_("This Primary Key is used in the following Tables : %s"),Temp2.c_str());
- Funkt = AppendItem(Docu,Temp2,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData("KEY"));
+ Funkt = AppendItem(Docu,Temp2,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData(_T("KEY")));
}
else
{
if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->FkCol != 0) // Foreign Key
{
- Temp2.Printf("(%d) - %s",((ct_BrowserDB->pTableInf+x)->pColInf+y)->FkCol,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName);
+ Temp2.Printf(_T("(%d) - %s"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->FkCol,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName);
Docu = AppendItem(Folder,Temp2,TreeIc_KEYF,TreeIc_KEYF,new DBTreeData(Temp1));
Temp2.Printf(_("This Foreign Key comes from the following Table : %s"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->FkTableName);
- Funkt = AppendItem(Docu,Temp2,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData("KEYF"));
+ Funkt = AppendItem(Docu,Temp2,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData(_T("KEYF")));
}
else
Docu = AppendItem(Folder,((ct_BrowserDB->pTableInf+x)->pColInf+y)->colName,TreeIc_COL,TreeIc_COL,new DBTreeData(Temp1));
}
- SQL_TYPE.Printf("SQL_C_???? (%d)",((ct_BrowserDB->pTableInf+x)->pColInf+y)->sqlDataType);
- DB_TYPE.Printf("DB_DATA_TYPE_???? (%d)",((ct_BrowserDB->pTableInf+x)->pColInf+y)->dbDataType);
+ SQL_TYPE.Printf(_T("SQL_C_???? (%d)"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->sqlDataType);
+ DB_TYPE.Printf(_T("DB_DATA_TYPE_???? (%d)"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->dbDataType);
for (i=1;i<=(pDoc->db_Br+i_Which)->i_SqlTyp[0];i++)
{
if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->sqlDataType == (pDoc->db_Br+i_Which)->i_SqlTyp[i])
{
- SQL_TYPE.Printf("%s(%d) ; ",(pDoc->db_Br+i_Which)->s_SqlTyp[i].c_str(),(pDoc->db_Br+i_Which)->i_SqlTyp[i]);
+ SQL_TYPE.Printf(_T("%s(%d) ; "),(pDoc->db_Br+i_Which)->s_SqlTyp[i].c_str(),(pDoc->db_Br+i_Which)->i_SqlTyp[i]);
}
} // for (i=1;i<=i_SqlTyp[0];i++)
wxYield();
{
if (((ct_BrowserDB->pTableInf+x)->pColInf+y)->dbDataType == (pDoc->db_Br+i_Which)->i_dbTyp[i])
{
- DB_TYPE.Printf("%s(%d)",(pDoc->db_Br+i_Which)->s_dbTyp[i].c_str(),(pDoc->db_Br+i_Which)->i_dbTyp[i]);
+ DB_TYPE.Printf(_T("%s(%d)"),(pDoc->db_Br+i_Which)->s_dbTyp[i].c_str(),(pDoc->db_Br+i_Which)->i_dbTyp[i]);
}
} // for (i=1;i<=i_dbTyp[0];i++)
wxYield();
SQL_TYPE += DB_TYPE;
Funkt = AppendItem(Docu,SQL_TYPE,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData(SQL_TYPE));
- SQL_TYPE.Printf("%10s %d,%d",((ct_BrowserDB->pTableInf+x)->pColInf+y)->typeName,
+ SQL_TYPE.Printf(_T("%10s %d,%d"),((ct_BrowserDB->pTableInf+x)->pColInf+y)->typeName,
((ct_BrowserDB->pTableInf+x)->pColInf+y)->columnSize,((ct_BrowserDB->pTableInf+x)->pColInf+y)->decimalDigits);
Funkt = AppendItem(Docu,SQL_TYPE,TreeIc_DocClosed,TreeIc_DocOpen,new DBTreeData(SQL_TYPE));
} // for (y=0;y<(ct_BrowserDB->pTableInf+x)->numCols;y++)
Expand(Root);
//---------------------------------------------------------------------------------------
popupMenu1 = NULL;
- popupMenu1 = new wxMenu("");
+ popupMenu1 = new wxMenu(_T(""));
popupMenu1->Append(DATA_DB, _("Make wxDB.cpp/h "));
popupMenu1->AppendSeparator();
popupMenu1->Append(DATA_TABLE_ALL, _("Make all wxTable.cpp/h classes"));
popupMenu2 = NULL;
- popupMenu2 = new wxMenu("");
+ popupMenu2 = new wxMenu(_T(""));
popupMenu2->Append(DATA_SHOW, _("Show Data"));
popupMenu2->AppendSeparator();
popupMenu2->Append(DATA_TABLE, _("Make wxTable.cpp/h "));
if ( item != NULL )
{
int Treffer = 0;
- Temp1.Printf("%s",item->m_desc.c_str());
+ Temp1.Printf(_T("%s"),item->m_desc.c_str());
//-------------------------------------------------------------------------------------
- if (Temp1.Contains("ODBC-"))
+ if (Temp1.Contains(_T("ODBC-")))
{
Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
for (i=0;i<pDoc->i_DSN;i++)
if ( item != NULL )
{
int Treffer = 0;
- Temp1.Printf("%s",item->m_desc.c_str());
+ Temp1.Printf(_T("%s"),item->m_desc.c_str());
//--------------------------------------------------------------------------------------
- if (!wxStrcmp("Root",Temp1))
+ if (!wxStrcmp(_T("Root"),Temp1))
{
PopupMenu(popupMenu1,TreePos.x,TreePos.y);
Treffer++;
}
for (i=0;i<ct_BrowserDB->numTables;i++)
{
- Temp2.Printf("TN(%s",(ct_BrowserDB->pTableInf+i)->tableName);
+ Temp2.Printf(_T("TN(%s"),(ct_BrowserDB->pTableInf+i)->tableName);
if (!wxStrcmp(Temp2,Temp1))
{
PopupMenu(popupMenu2,TreePos.x,TreePos.y);
DBTreeData *item = (DBTreeData *)GetItemData(itemId);
if ( item != NULL )
{
- Temp1.Printf("%s",item->m_desc.c_str());
+ Temp1.Printf(_T("%s"),item->m_desc.c_str());
for (i=0;i<ct_BrowserDB->numTables;i++)
{
- Temp2.Printf("TN(%s",(ct_BrowserDB->pTableInf+i)->tableName);
+ Temp2.Printf(_T("TN(%s"),(ct_BrowserDB->pTableInf+i)->tableName);
if (!wxStrcmp(Temp2,Temp1))
{
// Temp0.Printf("(%d) Here is where a GridCtrl for >%s< will be called! ",i,(ct_BrowserDB->pTableInf+i)->tableName);
DBTreeData *item = (DBTreeData *)GetItemData(itemId);
if ( item != NULL )
{
- Temp1.Printf("%s",item->m_desc.c_str());
+ Temp1.Printf(_T("%s"),item->m_desc.c_str());
for (i=0;i<ct_BrowserDB->numTables;i++)
{
- Temp2.Printf("TN(%s",(ct_BrowserDB->pTableInf+i)->tableName);
+ Temp2.Printf(_T("TN(%s"),(ct_BrowserDB->pTableInf+i)->tableName);
if (!wxStrcmp(Temp2,Temp1))
{
Temp0.Printf(_("(%d) Here is where a wxTable Class for >%s< will be made! "),i,(ct_BrowserDB->pTableInf+i)->tableName);
ratio = (float)2.1;
#endif
- SetBackgroundColour("wheat");
+ SetBackgroundColour(_T("wheat"));
pDoc = p_Doc;
wxLayoutConstraints* layout;
SetAutoLayout(TRUE);
int w;
m_Label1->GetSize(&w, &chSize);
- m_UserName = new wxTextCtrl(this, -1, "");
+ m_UserName = new wxTextCtrl(this, -1, _T(""));
m_UserName->SetFont(* pDoc->ft_Doc);
chSize = (int) (m_UserName->GetCharHeight()*ratio);
layout->width.SameAs(m_Label1, wxWidth);
m_Label2->SetConstraints(layout);
- m_Password = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD);
+ m_Password = new wxTextCtrl(this, -1, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD);
m_Password->SetFont(* pDoc->ft_Doc);
layout = new wxLayoutConstraints;
layout->left.SameAs(m_UserName, wxLeft);
m_OK->SetDefault();
m_UserName->SetFocus();
- s_User = "";
- s_Password = "";
+ s_User = _T("");
+ s_Password = _T("");
Layout();
}
//----------------------------------------------------------------------------------------
void DlgUser::OnInit()
{
- wxString Temp; Temp.Printf(">>> %s <<<",s_DSN.c_str());
+ wxString Temp; Temp.Printf(_T(">>> %s <<<"),s_DSN.c_str());
SetTitle(Temp);
m_UserName->SetLabel(s_User);
m_Password->SetLabel(s_Password);
p_PageArea = NULL;
i_TabNr = 0;
i_PageNr = 0;
- s_BColour = "WHEAT";
+ s_BColour = _T("WHEAT");
ft_Doc = new wxFont(wxSystemSettings::GetFont(wxSYS_SYSTEM_FONT));
}
//----------------------------------------------------------------------------------------
bool MainDoc::OnInitView()
{
- Sash = p_ProgramCfg->Read("/MainFrame/Sash", 200);
+ Sash = p_ProgramCfg->Read(_T("/MainFrame/Sash"), 200);
// wxMessageBox("OnInitView() - Begin ","-I->MainDoc::OnInitView");
//---------------------------------------------------------------------------------------
// create "workplace" window
p_PgmCtrl->i_TabArt = 0; // 0 = Tab ; 1 = Page
p_PgmCtrl->i_ViewNr = p_TabArea->GetTabCount()-1;
//---------------------------------------------------------------------------------------
- wxBitmap *p_FolderClose = new wxBitmap("PgmCtrl"); //, wxBITMAP_TYPE_BMP_RESOURCE); // BJO20000115
+ wxBitmap *p_FolderClose = new wxBitmap(_T("PgmCtrl")); //, wxBITMAP_TYPE_BMP_RESOURCE); // BJO20000115
//---------------------------------------------------------------------------------------
- p_TabArea->AddTab(p_PgmCtrl,"PgmCtrl",p_FolderClose);
+ p_TabArea->AddTab(p_PgmCtrl,_T("PgmCtrl"),p_FolderClose);
delete p_FolderClose; // Memory leak
p_FolderClose = NULL;
//---------------------------------------------------------------------------------------
p_LogBook->SetActiveTarget(p_LogBook);
p_LogBook->SetTimestamp( NULL );
//---------------------------------------------------------------------------------------
- p_PageArea->AddTab(p_LogWin,_("LogBook"), "what is this?" );
+ p_PageArea->AddTab(p_LogWin,_("LogBook"), _T("what is this?") );
i_TabNr = p_TabArea->GetTabCount()-1; // Add one when a new AddTab is done;
i_PageNr = p_PageArea->GetTabCount()-1; // Add one when a new AddTab is done;
//---------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------
bool MainDoc::OnInitODBC()
{
- char Dsn[SQL_MAX_DSN_LENGTH + 1];
- char DsDesc[255]; // BJO20002501 instead of 512
- Temp0 = "";
+ wxChar Dsn[SQL_MAX_DSN_LENGTH + 1];
+ wxChar DsDesc[255]; // BJO20002501 instead of 512
+ Temp0 = _T("");
i_DSN = 0; // Counter
int i = 0;
//---------------------------------------------------------------------------------------
while(wxDbGetDataSource(DbConnectInf.GetHenv(), Dsn, sizeof(Dsn), DsDesc, sizeof(DsDesc)))
{
i_DSN++; // How many Dsn have we ?
- KeyString.Printf("%s%c%s",Dsn, sep, DsDesc);
+ KeyString.Printf(_T("%s%c%s"),Dsn, sep, DsDesc);
s_SortDSNList.Add(Dsn);
s_SortDsDescList.Add(KeyString);
}
s_SortDSNList.Sort(); //BJO
s_SortDsDescList.Sort(); //BJO
- char ** s_SortDSN = s_SortDSNList.ListToArray(); //BJO
- char ** s_SortDsDesc = s_SortDsDescList.ListToArray(); //BJO
+ wxChar ** s_SortDSN = s_SortDSNList.ListToArray(); //BJO
+ wxChar ** s_SortDsDesc = s_SortDsDescList.ListToArray(); //BJO
//---------------------------------------------------------------------------------------
// Allocate n ODBC-DSN objects to hold the information
p_DSN = new DSN[i_DSN]; //BJO
{
KeyString = s_SortDsDesc[i];
KeyString = KeyString.AfterFirst(sep);
- strcpy(s_SortDsDesc[i],KeyString.c_str());
+ wxStrcpy(s_SortDsDesc[i],KeyString.c_str());
(p_DSN+i)->Dsn = s_SortDSN[i];
(p_DSN+i)->Drv = s_SortDsDesc[i];
- (p_DSN+i)->Usr = "";
- (p_DSN+i)->Pas = "";
- Temp0.Printf("%02d) Dsn(%s) DsDesc(%s)",i,(p_DSN+i)->Dsn.c_str(),(p_DSN+i)->Drv.c_str());
+ (p_DSN+i)->Usr = _T("");
+ (p_DSN+i)->Pas = _T("");
+ Temp0.Printf(_T("%02d) Dsn(%s) DsDesc(%s)"),i,(p_DSN+i)->Dsn.c_str(),(p_DSN+i)->Drv.c_str());
wxLogMessage(Temp0);
}
i = 0;
//---------------------------------------------------------------------------------------
if (!i_DSN)
{
- wxMessageBox(_("No Dataset names found in ODBC!\n" \
- " Program will exit!\n\n" \
- " Ciao"),"-E-> Fatal situation");
+ wxString message = _("No Dataset names found in ODBC!\n");
+ message += _(" Program will exit!\n\n");
+ message += _(" Ciao");
+ wxMessageBox( message,_("-E-> Fatal situation"));
return FALSE;
}
//---------------------------------------------------------------------------------------
p_TabArea->Show(FALSE); // Deactivate the Window
p_TabArea->RemoveTab(p_DBTree->i_ViewNr);
p_TabArea->Show(TRUE); // Activate the Window
- OnChosenTbl(77,"");
+ OnChosenTbl(77,_T(""));
}
//-------------------------
p_TabArea->Show(FALSE); // Deactivate the Window
p_DBTree = new DBTree(p_TabArea, TREE_CTRL_DB,wxDefaultPosition, wxDefaultSize,
wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
- p_TabArea->AddTab(p_DBTree,(p_DSN+Which)->Dsn," ? ");
+ p_TabArea->AddTab(p_DBTree,(p_DSN+Which)->Dsn,_T(" ? "));
p_DBTree->i_ViewNr = p_TabArea->GetTabCount()-1;
p_TabArea->Show(TRUE); // Deactivate the Window
p_DBTree->i_Which = Which;
p_TabArea->Show(FALSE); // Deactivate the Window
p_DBGrid = new DBGrid(p_TabArea,GRID_CTRL_DB,wxDefaultPosition, wxDefaultSize,
wxSUNKEN_BORDER);
- p_TabArea->AddTab(p_DBGrid, Table, "");
+ p_TabArea->AddTab(p_DBGrid, Table, _T(""));
p_DBGrid->i_ViewNr = p_TabArea->GetTabCount()-1;
p_DBGrid->pDoc = this;
p_DBGrid->db_Br = db_Br;
p_PageArea->Show(FALSE); // Deactivate the Window
p_DBGrid = new DBGrid(p_PageArea,GRID_CTRL_DB,wxDefaultPosition, wxDefaultSize,
wxSUNKEN_BORDER);
- p_PageArea->AddTab(p_DBGrid, Table, "");
+ p_PageArea->AddTab(p_DBGrid, Table, _T(""));
p_DBGrid->i_ViewNr = p_PageArea->GetTabCount()-1;
p_DBGrid->pDoc = this;
p_DBGrid->db_Br = db_Br;
//----------------------------------------------------------------------------------------
//-- Global functions --------------------------------------------------------------------
//----------------------------------------------------------------------------------------
-static inline const char *bool2String(bool b)
+static inline const wxChar *bool2String(bool b)
{
- return b ? "" : "not ";
+ return b ? _T("") : _T("not ");
}
//----------------------------------------------------------------------------------------
PgmCtrl::PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size, long style)
: wxTreeCtrl(parent, id, pos, size, style)
{
+ const int image_size = 16;
// Make an image list containing small icons
- p_imageListNormal = new wxImageList(16, 16, TRUE);
+ p_imageListNormal = new wxImageList(image_size, image_size, TRUE);
// should correspond to TreeIc_xxx enum
#if defined(__WXMSW__) && defined(__WIN16__)
// This is required in 16-bit Windows mode only because we can't load a specific (16x16)
// icon image, so it comes out stretched
- p_imageListNormal->Add(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE));
- p_imageListNormal->Add(wxBitmap("bitmap2", wxBITMAP_TYPE_BMP_RESOURCE));
+ p_imageListNormal->Add(wxBitmap(wxBitmap("bitmap1", wxBITMAP_TYPE_BMP_RESOURCE).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap("bitmap2", wxBITMAP_TYPE_BMP_RESOURCE).ConvertToImage().Rescale(image_size, image_size)));
#else
- p_imageListNormal->Add(wxICON(aLogo));
- p_imageListNormal->Add(wxICON(DsnClosed));
- p_imageListNormal->Add(wxICON(DsnOpen));
- p_imageListNormal->Add(wxICON(DocClosed));
- p_imageListNormal->Add(wxICON(DocOpen));
- p_imageListNormal->Add(wxICON(FolderClosed));
- p_imageListNormal->Add(wxICON(FolderOpen));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(aLogo)).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DsnClosed)).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DsnOpen)).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DocClosed)).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(DocOpen)).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(FolderClosed)).ConvertToImage().Rescale(image_size, image_size)));
+ p_imageListNormal->Add(wxBitmap(wxBitmap(wxICON(FolderOpen)).ConvertToImage().Rescale(image_size, image_size)));
#endif
SetImageList(p_imageListNormal);
}
int i;
double dTmp = 1234567.89;
Temp0.Printf(_("%s Functions"),p_ProgramCfg->GetAppName().c_str());
- Root = AddRoot(Temp0,TreeIc_Logo,TreeIc_Logo, new TreeData("Root"));
+ Root = AddRoot(Temp0,TreeIc_Logo,TreeIc_Logo, new TreeData(_T("Root")));
//---------------------------------------------------------------------------------------
- Folder = AppendItem(Root, _("Program settings") ,TreeIc_FolderClosed, TreeIc_FolderOpen, new TreeData("Settings"));
- p_ProgramCfg->Read("/Local/langid",&Temp0); p_ProgramCfg->Read("/Local/language",&Temp2);
+ Folder = AppendItem(Root, _("Program settings") ,TreeIc_FolderClosed, TreeIc_FolderOpen, new TreeData(_T("Settings")));
+ p_ProgramCfg->Read(_T("/Local/langid"),&Temp0); p_ProgramCfg->Read(_T("/Local/language"),&Temp2);
Temp1.Printf(_("locale (%s) ; Language (%s) ; Number(%2.2f)"),Temp0.c_str(), Temp2.c_str(), dTmp); Temp0.Empty(); Temp2.Empty();
- Docu = AppendItem(Folder, Temp1,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData("Setting Language"));
- p_ProgramCfg->Read("/Paths/Work",&Temp0); Temp1.Printf(_("Work Path : %s"),Temp0.c_str()); Temp0.Empty();
- Docu = AppendItem(Folder,Temp1,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData("Path Work"));
- Docu = AppendItem(Folder, _("Change the language to English") ,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData("Language English"));
- Docu = AppendItem(Folder, _("Change the language to German") ,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData("Language German"));
- Docu = AppendItem(Folder, _("Delete all wxConfigBase Entry's"),TreeIc_DocClosed,TreeIc_DocOpen,new TreeData("wxConfigBase Delete"));
- Folder = AppendItem(Root, "ODBC DSN",TreeIc_FolderClosed,TreeIc_FolderOpen,new TreeData("ODBC-DSN"));
+ Docu = AppendItem(Folder, Temp1,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData(_T("Setting Language")));
+ p_ProgramCfg->Read(_T("/Paths/Work"),&Temp0); Temp1.Printf(_("Work Path : %s"),Temp0.c_str()); Temp0.Empty();
+ Docu = AppendItem(Folder,Temp1,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData(_T("Path Work")));
+ Docu = AppendItem(Folder, _("Change the language to English") ,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData(_T("Language English")));
+ Docu = AppendItem(Folder, _("Change the language to German") ,TreeIc_DocClosed,TreeIc_DocOpen,new TreeData(_T("Language German")));
+ Docu = AppendItem(Folder, _("Delete all wxConfigBase Entry's"),TreeIc_DocClosed,TreeIc_DocOpen,new TreeData(_T("wxConfigBase Delete")));
+ Folder = AppendItem(Root, _T("ODBC DSN"),TreeIc_FolderClosed,TreeIc_FolderOpen,new TreeData(_T("ODBC-DSN")));
for (i=0;i<pDoc->i_DSN;i++)
{
- Temp0.Printf("ODBC-%s",(pDoc->p_DSN+i)->Dsn.c_str());
+ Temp0.Printf(_T("ODBC-%s"),(pDoc->p_DSN+i)->Dsn.c_str());
Docu = AppendItem(Folder,(pDoc->p_DSN+i)->Dsn ,TreeIc_DsnClosed,TreeIc_DsnOpen, new TreeData(Temp0));
}
//---------------------------------------------------------------------------------------
popupMenu1 = NULL;
- popupMenu1 = new wxMenu("");
+ popupMenu1 = new wxMenu(_T(""));
popupMenu1->Append(PGMCTRL_ODBC_USER, _("Set Username and Password"));
// popupMenu1->AppendSeparator();
//---------------------------------------------------------------------------------------
if (item != NULL )
{
int Treffer = 0;
- Temp1.Printf("%s",item->m_desc.c_str());
+ Temp1.Printf(_T("%s"),item->m_desc.c_str());
//--------------------------------------------------------------------------------------
- if (Temp1 == "Language English")
+ if (Temp1 == _T("Language English"))
{
- Temp0 = "std";
- p_ProgramCfg->Write("/Local/langid",Temp0);
+ Temp0 = _T("std");
+ p_ProgramCfg->Write(_T("/Local/langid"),Temp0);
Temp0 = _("-I-> After a programm restart, the language will be changed to English.");
wxMessageBox(Temp0);
}
- if (Temp1 == "Language German")
+ if (Temp1 == _T("Language German"))
{
- Temp0 = "de";
- p_ProgramCfg->Write("/Local/langid",Temp0);
+ Temp0 = _T("de");
+ p_ProgramCfg->Write(_T("/Local/langid"),Temp0);
Temp0 = _("-I-> After a programm restart, the language will be changed to German.");
wxMessageBox(Temp0);
}
//--------------------------------------------------------------------------------------
- if (Temp1 == "wxConfigBase Delete")
+ if (Temp1 == _T("wxConfigBase Delete"))
{
if (p_ProgramCfg->DeleteAll()) // Default Diretory for wxFileSelector
Temp0 = _("-I-> wxConfigBase.p_ProgramCfg->DeleteAll() was succesfull.");
Treffer++;
}
//--------------------------------------------------------------------------------------
- if (Temp1.Contains("ODBC-"))
+ if (Temp1.Contains(_T("ODBC-")))
{
Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
for (i=0;i<pDoc->i_DSN;i++)
if (Treffer == 0)
{
//-------------------------------------------------------------------------------------
- Temp0.Printf(_("Item '%s': %sselected, %sexpanded, %sbold,"
- "%u children (%u immediately under this item)."),
+ Temp0.Printf(_("Item '%s': %sselected, %sexpanded, %sbold, %u children (%u immediately under this item)."),
item->m_desc.c_str(),
bool2String(IsSelected(itemId)),
bool2String(IsExpanded(itemId)),
bool2String(IsBold(itemId)),
GetChildrenCount(itemId),
GetChildrenCount(itemId));
- LogBuf.Printf("-I-> PgmCtrl::OnSelChanged - %s",Temp0.c_str());
- wxLogMessage( "%s", LogBuf.c_str() );
+ LogBuf.Printf(_T("-I-> PgmCtrl::OnSelChanged - %s"),Temp0.c_str());
+ wxLogMessage( _T("%s"), LogBuf.c_str() );
//-------------------------------------------------------------------------------------
}
}
if ( item != NULL )
{
int Treffer = 0;
- Temp1.Printf("%s",item->m_desc.c_str());
+ Temp1.Printf(_T("%s"),item->m_desc.c_str());
//--------------------------------------------------------------------------------------
- if (Temp1.Contains("ODBC-"))
+ if (Temp1.Contains(_T("ODBC-")))
{
Temp1 = Temp1.Mid(5,wxSTRING_MAXLEN);
for (i=0;i<pDoc->i_DSN;i++)
// wxMessageBox(SaveDSN);
int i;
//--------------------------------------------
- DlgUser *p_Dlg = new DlgUser(this,pDoc,"");
+ DlgUser *p_Dlg = new DlgUser(this,pDoc,_T(""));
//-------------------------------------------
for (i=0;i<pDoc->i_DSN;i++)
{
{
wxFont font;
#ifdef __WINDOWS__
- font.SetFaceName("MS Sans Serif");
+ font.SetFaceName(_T("MS Sans Serif"));
#else
font.SetFamily( wxSWISS );
#endif
wxFont font;
#ifdef __WINDOWS__
- font.SetFaceName("Comic Sans MS");
+ font.SetFaceName(_T("Comic Sans MS"));
#else
font.SetFamily( wxSWISS );
#endif
virtual void AddTab( wxWindow* pContent, // contained window
wxString tabText, // tab label
- wxString imageFileName = "", // if "", only text label is displayed
+ wxString imageFileName = _T(""), // if "", only text label is displayed
wxBitmapType imageType = wxBITMAP_TYPE_BMP );
// NOTE:: if this AddTab(..) overload is called, the
projects / wxWidgets.git / commitdiff
