Modified wxGetHomeDir to take environment variable HOME into account.

[wxWidgets.git] / src / msw / taskbar.cpp

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index cc2b9bc9c52edf7672433dcab67c609f5dd5b02f..23e002515465976cd64f8c0b5ec7a50e621cf2d6 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -10,7 +10,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "taskbar.h"
 #endif
 
 #pragma implementation "taskbar.h"
 #endif
 


@@ -184,7 +184,6 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 
     s_inPopup = true;
 
 
     s_inPopup = true;
 

-    bool        rval = false;

     wxWindow*   win;
     int         x, y;
     wxGetMousePosition(&x, &y);
     wxWindow*   win;
     int         x, y;
     wxGetMousePosition(&x, &y);


@@ -202,7 +201,7 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
     // Work around a WIN32 bug
     ::SetForegroundWindow ((HWND) win->GetHWND ());
 
     // Work around a WIN32 bug
     ::SetForegroundWindow ((HWND) win->GetHWND ());
 

-    rval = win->PopupMenu(menu, 0, 0);
+    bool rval = win->PopupMenu(menu, 0, 0);

 
     // Work around a WIN32 bug
     ::PostMessage ((HWND) win->GetHWND(),WM_NULL,0,0L);
 
     // Work around a WIN32 bug
     ::PostMessage ((HWND) win->GetHWND(),WM_NULL,0,0L);