Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

use GetTimeFormat for explorer, since it displays time properly for the most part.

Browse source 
svn path=/trunk/; revision=7624
This commit is contained in:
Richard Campbell 2004-01-14 20:21:16 +00:00
parent 9f007e7037
commit eb5f406f20
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/subsys/system/explorer/taskbar/traynotify.cpp
View file

@ -329,11 +329,11 @@ HWND ClockWindow::Create(HWND hwndParent)
RECT rect = {0, 0, 0, 0}; RECT rect = {0, 0, 0, 0};
DrawText(canvas, TEXT("00:00"), -1, &rect, DT_SINGLELINE|DT_NOPREFIX|DT_CALCRECT); DrawText(canvas, TEXT("00:00"), -1, &rect, DT_SINGLELINE|DT_NOPREFIX|DT_CALCRECT);
int clockwindowWidth = rect.right-rect.left + 4; int clockwindowWidth = rect.right-rect.left + 32;
return Window::Create(WINDOW_CREATOR(ClockWindow), 0, return Window::Create(WINDOW_CREATOR(ClockWindow), 0,
BtnWindowClass(CLASSNAME_CLOCKWINDOW,CS_DBLCLKS), NULL, WS_CHILD|WS_VISIBLE, BtnWindowClass(CLASSNAME_CLOCKWINDOW,CS_DBLCLKS), NULL, WS_CHILD|WS_VISIBLE,
clnt.right-(clockwindowWidth+1), 1, clockwindowWidth, clnt.bottom-2, hwndParent); clnt.right-(clockwindowWidth), 1, clockwindowWidth, clnt.bottom-2, hwndParent);
} }
LRESULT ClockWindow::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) LRESULT ClockWindow::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
@ -383,11 +383,13 @@ bool ClockWindow::FormatTime()
{ {
SYSTEMTIME systime; SYSTEMTIME systime;
TCHAR buffer[16]; TCHAR buffer[16];
TCHAR TimeFormat[] = TEXT("hh':'mm tt");
GetLocalTime(&systime); GetLocalTime(&systime);
GetTimeFormat(LOCALE_USER_DEFAULT,0,NULL,TimeFormat,buffer,sizeof(buffer));
//_stprintf(buffer, TEXT("%02d:%02d:%02d"), systime.wHour, systime.wMinute, systime.wSecond); //_stprintf(buffer, TEXT("%02d:%02d:%02d"), systime.wHour, systime.wMinute, systime.wSecond);
_stprintf(buffer, TEXT("%02d:%02d"), systime.wHour, systime.wMinute); //_stprintf(buffer, TEXT("%02d:%02d"), systime.wHour, systime.wMinute);
if (_tcscmp(buffer, _time)) { if (_tcscmp(buffer, _time)) {
_tcscpy(_time, buffer); _tcscpy(_time, buffer);

2
reactos/subsys/system/explorer/taskbar/traynotify.h
View file

@ -31,7 +31,7 @@
#define CLASSNAME_CLOCKWINDOW TEXT("TrayClockWClass") #define CLASSNAME_CLOCKWINDOW TEXT("TrayClockWClass")
#define NOTIFYAREA_WIDTH_DEF 75 #define NOTIFYAREA_WIDTH_DEF 100
#define NOTIFYICON_DIST 20 #define NOTIFYICON_DIST 20
#define NOTIFYAREA_SPACE 10 #define NOTIFYAREA_SPACE 10