replaced T() makro with wxT() due to namespace probs, _T() exists, too
fixed compilation problems, mainly in html code compiles and links fine on Solaris, runs with samples and Mahogany git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -51,7 +51,7 @@
|
||||
LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
|
||||
UINT wParam, LONG lParam );
|
||||
|
||||
wxChar *wxTaskBarWindowClass = T("wxTaskBarWindowClass");
|
||||
wxChar *wxTaskBarWindowClass = wxT("wxTaskBarWindowClass");
|
||||
|
||||
wxList wxTaskBarIcon::sm_taskBarIcons;
|
||||
bool wxTaskBarIcon::sm_registeredClass = FALSE;
|
||||
@@ -120,7 +120,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
|
||||
notifyData.hIcon = (HICON) icon.GetHICON();
|
||||
}
|
||||
|
||||
if (((const wxChar*) tooltip != NULL) && (tooltip != T("")))
|
||||
if (((const wxChar*) tooltip != NULL) && (tooltip != wxT("")))
|
||||
{
|
||||
notifyData.uFlags |= NIF_TIP ;
|
||||
lstrcpyn(notifyData.szTip, WXSTRINGCAST tooltip, sizeof(notifyData.szTip));
|
||||
@@ -262,7 +262,7 @@ bool wxTaskBarIcon::RegisterWindowClass()
|
||||
return TRUE;
|
||||
|
||||
// Also register the taskbar message here
|
||||
sm_taskbarMsg = ::RegisterWindowMessage(T("wxTaskBarIconMessage"));
|
||||
sm_taskbarMsg = ::RegisterWindowMessage(wxT("wxTaskBarIconMessage"));
|
||||
|
||||
WNDCLASS wc;
|
||||
bool rc;
|
||||
@@ -294,7 +294,7 @@ WXHWND wxTaskBarIcon::CreateTaskBarWindow()
|
||||
HINSTANCE hInstance = GetModuleHandle(NULL);
|
||||
|
||||
HWND hWnd = CreateWindowEx (0, wxTaskBarWindowClass,
|
||||
T("wxTaskBarWindow"),
|
||||
wxT("wxTaskBarWindow"),
|
||||
WS_OVERLAPPED,
|
||||
0,
|
||||
0,
|
||||
|
||||
Reference in New Issue
Block a user