diff options
Diffstat (limited to 'apps/FaCE/FaCE.cpp')
| -rw-r--r-- | apps/FaCE/FaCE.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/apps/FaCE/FaCE.cpp b/apps/FaCE/FaCE.cpp index 7d7c50ffcd3..49f413065b1 100644 --- a/apps/FaCE/FaCE.cpp +++ b/apps/FaCE/FaCE.cpp @@ -18,7 +18,7 @@ #include <sipapi.h> -ACE_TCHAR* g_ParameterFileName = ACE_LIB_TEXT("Parameters.txt"); +ACE_TCHAR* g_ParameterFileName = ACE_TEXT("Parameters.txt"); /** * This simple and small class manages user-input command line @@ -90,7 +90,7 @@ void ParameterList::addParameter(char* newParameter) delete w_output; #else - this->addParameter(ACE_TEXT_CHAR_TO_TCHAR(newParameter)); + this->addParameter(ACE_TEXT_TO_TCHAR_IN(newParameter)); #endif // NO_ACE } @@ -112,12 +112,12 @@ void ParameterList::addParameter(ACE_TCHAR* newParameter) void ParameterList::saveParameter(FILE* outputFile) { if ( (outputFile == 0) && (this->param_ != 0) ) { - outputFile = _wfopen(g_ParameterFileName, ACE_LIB_TEXT("w+")); + outputFile = _wfopen(g_ParameterFileName, ACE_TEXT("w+")); } if (outputFile != 0) { if (this->param_ != 0) { - fwprintf(outputFile, ACE_LIB_TEXT("%s\n"), this->param_); + fwprintf(outputFile, ACE_TEXT("%s\n"), this->param_); this->next_->saveParameter(outputFile); } else { @@ -173,7 +173,7 @@ void InitSetup() void LoadParameterHistory() { - FILE* parameterFile = _wfopen(g_ParameterFileName, ACE_LIB_TEXT("r")); + FILE* parameterFile = _wfopen(g_ParameterFileName, ACE_TEXT("r")); if (parameterFile != NULL) { while (feof(parameterFile) == 0) { @@ -328,12 +328,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_SETTING_RUN: { #ifdef NO_ACE - cout << ACE_LIB_TEXT("START with command line: ") << g_CommandLine << endl; + cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl; CE_ARGV ce_argv(g_CommandLine); main_i(ce_argv.argc(), ce_argv.argv()); - cout << ACE_LIB_TEXT("END") << endl << endl; + cout << ACE_TEXT("END") << endl << endl; #else - cout << ACE_LIB_TEXT("START with command line: ") << g_CommandLine << endl; + cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl; ACE_CE_ARGV ce_argv(g_CommandLine); ACE::init(); ACE_MAIN_OBJECT_MANAGER @@ -341,7 +341,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) ACE_LOG_MSG->set_flags(ACE_Log_Msg::MSG_CALLBACK); // set call back flag ace_main_i(ce_argv.argc(), ce_argv.argv()); ACE::fini(); - cout << ACE_LIB_TEXT("END") << endl << endl; + cout << ACE_TEXT("END") << endl << endl; #endif // NO_ACE } break; @@ -388,7 +388,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) GetClientRect(hWnd, &textRect); nCmdHt = CommandBar_Height(mbi.hwndMB); - hWndEdit = CreateWindow(ACE_LIB_TEXT("EDIT"), + hWndEdit = CreateWindow(ACE_TEXT("EDIT"), NULL, WS_CHILD | WS_VISIBLE | ES_READONLY | ES_MULTILINE | WS_VSCROLL | WS_HSCROLL, 0, @@ -457,7 +457,7 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { SHINITDLGINFO shidi; - ACE_TCHAR* copyrightNote = ACE_LIB_TEXT( + ACE_TCHAR* copyrightNote = ACE_TEXT( "ACE® and TAO® are copyrighted by Dr. Douglas C. Schmidt and Center for Distributed Object \ Computing at Washington University,© 1993-2002, all rights reserved. \ FaCE is copyrighted by Object Computing, Inc.,© 2002,\n all rights reserved.\n\ @@ -552,7 +552,7 @@ LRESULT CALLBACK SaveFileName(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa GetDlgItemText(hDlg, IDC_SAVEFILE, tempBuffer, MAX_LOADSTRING - 1); EndDialog(hDlg, wmId); - tempFile = _wfopen(tempBuffer, ACE_LIB_TEXT("r")); + tempFile = _wfopen(tempBuffer, ACE_TEXT("r")); if (tempFile != NULL) // if file exists { |