Changeset 21603 for trunk/testapp/gui/systray/StealthDialog.cpp

Timestamp:

Mar 23, 2011, 11:45:41 PM (14 years ago)

Author:

dmik

Message:

testapp/systray: Added "TaskbarCreated" support.

File:

• trunk/testapp/gui/systray/StealthDialog.cpp (modified) (11 diffs)

trunk/testapp/gui/systray/StealthDialog.cpp

@@ -23 +23 @@
                      LPTSTR    lpCmdLine,
                      int       nCmdShow);
-                     
+
 //Win32 resource table (produced by wrc)
 extern DWORD Resource_PEResTab;
-                     
+
 int main(int argc, char **argv)
 {
@@ -64 +64 @@
         {
                 if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)||
-                        !IsDialogMessage(msg.hwnd,&msg) ) 
+                        !IsDialogMessage(msg.hwnd,&msg) )
                 {
                         TranslateMessage(&msg);
@@ -73 +73 @@
 }
 
-//      Initialize the window and tray icon
-BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
-{
-        // prepare for XP style controls
-        InitCommonControls();
-
-         // store instance handle and create dialog
-        hInst = hInstance;
-        HWND hWnd = CreateDialog( hInstance, MAKEINTRESOURCE(IDD_DLG_DIALOG),
-                NULL, (DLGPROC)DlgProc );
-        if (!hWnd) return FALSE;
-
+//      Add tray icon
+VOID AddTrayIcon(HWND hWnd)
+{
         // Fill the NOTIFYICONDATA structure and call Shell_NotifyIcon
 
@@ -126 +117 @@
 
         // load the icon
-        niData.hIcon = (HICON)LoadImage(hInstance,MAKEINTRESOURCE(IDI_STEALTHDLG),
+        niData.hIcon = (HICON)LoadImage(hInst,MAKEINTRESOURCE(IDI_STEALTHDLG),
                 IMAGE_ICON, GetSystemMetrics(SM_CXSMICON),GetSystemMetrics(SM_CYSMICON),
                 LR_DEFAULTCOLOR);
@@ -144 +135 @@
         if(niData.hIcon && DestroyIcon(niData.hIcon))
                 niData.hIcon = NULL;
+}
+
+//      Initialize the window
+BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
+{
+        // prepare for XP style controls
+        InitCommonControls();
+
+         // store instance handle and create dialog
+        hInst = hInstance;
+        HWND hWnd = CreateDialog( hInstance, MAKEINTRESOURCE(IDD_DLG_DIALOG),
+                NULL, (DLGPROC)DlgProc );
+        if (!hWnd) return FALSE;
+
+        AddTrayIcon(hWnd);
 
         // call ShowWindow here to make the dialog initially visible
@@ -161 +167 @@
                 MAKEINTRESOURCE(IDI_STEALTHDLG),
                 IMAGE_ICON, 0,0, LR_SHARED|LR_DEFAULTSIZE);
-printf("### hIcon %x\n", hIcon);
         SendMessage(hWnd,WM_SETICON,ICON_BIG,(LPARAM)hIcon);
         SendMessage(hWnd,WM_SETICON,ICON_SMALL,(LPARAM)hIcon);
@@ -221 +226 @@
 INT_PTR CALLBACK DlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
+    static UINT wmTaskbarCreated;
+
         int wmId, wmEvent;
 
-        switch (message) 
+        switch (message)
         {
         case SWM_TRAYMSG:
@@ -247 +254 @@
         case WM_COMMAND:
                 wmId    = LOWORD(wParam);
-                wmEvent = HIWORD(wParam); 
+                wmEvent = HIWORD(wParam);
 
                 switch (wmId)
@@ -267 +274 @@
                 return 1;
         case WM_INITDIALOG:
+            wmTaskbarCreated = RegisterWindowMessage(TEXT("TaskbarCreated"));
                 return OnInitDialog(hWnd);
         case WM_CLOSE:
@@ -276 +284 @@
                 PostQuitMessage(0);
                 break;
+        default:
+                if (message == wmTaskbarCreated)
+                        AddTrayIcon(hWnd);
+                break;
         }
         return 0;
@@ -289 +301 @@
 
         case WM_COMMAND:
-                if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) 
+                if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)
                 {
                         EndDialog(hDlg, LOWORD(wParam));