replaced T() makro with wxT() due to namespace probs, _T() exists, too

[wxWidgets.git] / src / msw / app.cpp

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 36199a3d67642da4c2a9b72eaa5cf781094e511c..7eddf6e213acde5268c7471c0d0a1975acaa4f6e 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -113,14 +113,14 @@ wxApp *wxTheApp = NULL;
 
 // NB: all "NoRedraw" classes must have the same names as the "normal" classes
 //     with NR suffix - wxWindow::MSWCreate() supposes this
-wxChar wxFrameClassName[]         = T("wxFrameClass");
-wxChar wxFrameClassNameNoRedraw[] = T("wxFrameClassNR");
-wxChar wxMDIFrameClassName[]      = T("wxMDIFrameClass");
-wxChar wxMDIFrameClassNameNoRedraw[] = T("wxMDIFrameClassNR");
-wxChar wxMDIChildFrameClassName[] = T("wxMDIChildFrameClass");
-wxChar wxMDIChildFrameClassNameNoRedraw[] = T("wxMDIChildFrameClassNR");
-wxChar wxPanelClassName[]         = T("wxPanelClass");
-wxChar wxCanvasClassName[]        = T("wxCanvasClass");
+wxChar wxFrameClassName[]         = wxT("wxFrameClass");
+wxChar wxFrameClassNameNoRedraw[] = wxT("wxFrameClassNR");
+wxChar wxMDIFrameClassName[]      = wxT("wxMDIFrameClass");
+wxChar wxMDIFrameClassNameNoRedraw[] = wxT("wxMDIFrameClassNR");
+wxChar wxMDIChildFrameClassName[] = wxT("wxMDIChildFrameClass");
+wxChar wxMDIChildFrameClassNameNoRedraw[] = wxT("wxMDIChildFrameClassNR");
+wxChar wxPanelClassName[]         = wxT("wxPanelClass");
+wxChar wxCanvasClassName[]        = wxT("wxCanvasClass");
 
 HICON wxSTD_FRAME_ICON = (HICON) NULL;
 HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL;
@@ -176,7 +176,7 @@ bool wxApp::Initialize()
     wxClassInfo::InitializeClasses();
 
 #if wxUSE_RESOURCES
-    wxGetResource(T("wxWindows"), T("OsVersion"), &wxOsVersion);
+    wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion);
 #endif
 
     // I'm annoyed ... I don't know where to put this and I don't want to
@@ -202,7 +202,7 @@ bool wxApp::Initialize()
     InitCommonControls();
 
 #if wxUSE_RICHEDIT
-    gs_hRichEdit = LoadLibrary(T("RICHED32.DLL"));
+    gs_hRichEdit = LoadLibrary(wxT("RICHED32.DLL"));
 
     if (gs_hRichEdit == (HINSTANCE) NULL)
     {
@@ -227,20 +227,20 @@ bool wxApp::Initialize()
 
 #if wxUSE_CTL3D
     if (!Ctl3dRegister(wxhInstance))
-        wxLogError(T("Cannot register CTL3D"));
+        wxLogError(wxT("Cannot register CTL3D"));
 
     Ctl3dAutoSubclass(wxhInstance);
 #endif
 
     g_globalCursor = new wxCursor;
 
-    wxSTD_FRAME_ICON = LoadIcon(wxhInstance, T("wxSTD_FRAME"));
-    wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, T("wxSTD_MDIPARENTFRAME"));
-    wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, T("wxSTD_MDICHILDFRAME"));
+    wxSTD_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_FRAME"));
+    wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_MDIPARENTFRAME"));
+    wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_MDICHILDFRAME"));
 
-    wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, T("wxDEFAULT_FRAME"));
-    wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, T("wxDEFAULT_MDIPARENTFRAME"));
-    wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, T("wxDEFAULT_MDICHILDFRAME"));
+    wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_FRAME"));
+    wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_MDIPARENTFRAME"));
+    wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_MDICHILDFRAME"));
 
     RegisterWindowClasses();
 
@@ -248,7 +248,7 @@ bool wxApp::Initialize()
 
     LOGBRUSH lb;
     lb.lbStyle = BS_PATTERN;
-    lb.lbHatch = (int)LoadBitmap( wxhInstance, T("wxDISABLE_BUTTON_BITMAP") );
+    lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") );
     if ( lb.lbHatch )
     {
         wxDisableButtonBrush = ::CreateBrushIndirect( & lb );
@@ -425,11 +425,11 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
 
         if (i < len)
         {
-            if (cmdLine.GetChar(i) == T('"')) // We found the start of a string
+            if (cmdLine.GetChar(i) == wxT('"')) // We found the start of a string
             {
                 i ++;
                 int first = i;
-                while ((i < len) && (cmdLine.GetChar(i) != T('"')))
+                while ((i < len) && (cmdLine.GetChar(i) != wxT('"')))
                     i ++;
 
                 wxString arg(cmdLine.Mid(first, (i - first)));
@@ -578,7 +578,7 @@ void wxApp::CleanUp()
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {
-        wxLogDebug(T("There were memory leaks."));
+        wxLogDebug(wxT("There were memory leaks."));
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
@@ -635,12 +635,12 @@ int wxEntry(WXHINSTANCE hInstance,
             // the IMPLEMENT_APP macro is used instead, which sets an initializer
             // function for delayed, dynamic app object construction.
             wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
-                         T("No initializer - use IMPLEMENT_APP macro.") );
+                         wxT("No initializer - use IMPLEMENT_APP macro.") );
 
             wxTheApp = (*wxApp::GetInitializerFunction()) ();
         }
 
-        wxCHECK_MSG( wxTheApp, 0, T("You have to define an instance of wxApp!") );
+        wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
 
         // save the WinMain() parameters
         wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);
@@ -818,7 +818,7 @@ bool wxApp::DoMessage()
     {
 #if wxUSE_THREADS
         wxASSERT_MSG( wxThread::IsMain(),
-                      T("only the main thread can process Windows messages") );
+                      wxT("only the main thread can process Windows messages") );
 
         static bool s_hadGuiLock = TRUE;
         static wxMsgArray s_aSavedMessages;
@@ -1112,7 +1112,7 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
 int wxApp::GetComCtl32Version() const
 {
     // have we loaded COMCTL32 yet?
-    HMODULE theModule = ::GetModuleHandle(T("COMCTL32"));
+    HMODULE theModule = ::GetModuleHandle(wxT("COMCTL32"));
     int version = 0;
 
     // if so, then we can check for the version
@@ -1197,7 +1197,7 @@ wxApp::GetStdIcon(int which) const
             return wxIcon("wxICON_WARNING");
 
         default:
-            wxFAIL_MSG(T("requested non existent standard icon"));
+            wxFAIL_MSG(wxT("requested non existent standard icon"));
             // still fall through
 
         case wxICON_HAND: