X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7527e3f2178b3a527c50ffda6bb059f8ff8acce..b9517a0ae450f70439f88abcab474ad60035b52c:/src/msw/taskbar.cpp diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index 36d0de6c52..9b2f4eeb50 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -33,13 +33,13 @@ #include #include -#include -#include +#include "wx/msw/taskbar.h" +#include "wx/msw/private.h" #ifndef __TWIN32__ #ifdef __GNUWIN32__ #ifndef wxUSE_NORLANDER_HEADERS -#include +#include "wx/msw/gnuwin32/extra.h" #endif #endif #endif @@ -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,