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

A few weeks of Unicode fixes (my old win95 laptop compiles sloowly,

Browse Source 
especially when through the nullmodem cable).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-06-14 14:39:11 +00:00
parent 5f8e1c164d
commit 837e57436a
67 changed files with 778 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/taskbar.cpp
View File

@@ -48,7 +48,7 @@
LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
UINT wParam, LONG lParam );
char *wxTaskBarWindowClass = "wxTaskBarWindowClass";
wxChar *wxTaskBarWindowClass = _T("wxTaskBarWindowClass");
wxList wxTaskBarIcon::sm_taskBarIcons;
bool wxTaskBarIcon::sm_registeredClass = FALSE;
@@ -117,10 +117,10 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
notifyData.hIcon = (HICON) icon.GetHICON();
}
if (((const char*) tooltip != NULL) && (tooltip != ""))
if (((const wxChar*) tooltip != NULL) && (tooltip != _T("")))
{
notifyData.uFlags |= NIF_TIP ;
lstrcpyn(notifyData.szTip, (char*) (const char*) tooltip, sizeof(notifyData.szTip));
lstrcpyn(notifyData.szTip, WXSTRINGCAST tooltip, sizeof(notifyData.szTip));
}
notifyData.uID = 99;
@@ -239,7 +239,7 @@ bool wxTaskBarIcon::RegisterWindowClass()
return TRUE;
// Also register the taskbar message here
sm_taskbarMsg = ::RegisterWindowMessage("wxTaskBarIconMessage");
sm_taskbarMsg = ::RegisterWindowMessage(_T("wxTaskBarIconMessage"));
WNDCLASS wc;
bool rc;
@@ -271,7 +271,7 @@ WXHWND wxTaskBarIcon::CreateTaskBarWindow()
HINSTANCE hInstance = GetModuleHandle(NULL);
HWND hWnd = CreateWindowEx (0, wxTaskBarWindowClass,
"wxTaskBarWindow",
_T("wxTaskBarWindow"),
WS_OVERLAPPED,
0,
0,