fix some harmless compilation in (release) MSVC build

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index d42b08fe47745a95a572d260151c55315f3bc307..cc52113434070e94a6a1e188e3c1e4f5dd76e1d3 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -209,6 +209,8 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
     return ok;
 }
 
     return ok;
 }
 

+#if wxUSE_TASKBARICON_BALLOONS
+

 bool
 wxTaskBarIcon::ShowBalloon(const wxString& title,
                            const wxString& text,
 bool
 wxTaskBarIcon::ShowBalloon(const wxString& title,
                            const wxString& text,


@@ -224,9 +226,7 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
     // the balloon disappearance
     NotifyIconData notifyData(hwnd);
     notifyData.uFlags = 0;
     // the balloon disappearance
     NotifyIconData notifyData(hwnd);
     notifyData.uFlags = 0;

-#if (WINVER >= 0x0500)

     notifyData.uVersion = 3 /* NOTIFYICON_VERSION for Windows XP */;
     notifyData.uVersion = 3 /* NOTIFYICON_VERSION for Windows XP */;

-#endif

 
     wxShellNotifyIcon(NIM_SETVERSION, &notifyData);
 
 
     wxShellNotifyIcon(NIM_SETVERSION, &notifyData);
 


@@ -234,7 +234,6 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
     // do show the balloon now
     notifyData = NotifyIconData(hwnd);
     notifyData.uFlags |= NIF_INFO;
     // do show the balloon now
     notifyData = NotifyIconData(hwnd);
     notifyData.uFlags |= NIF_INFO;

-#if (WINVER >= 0x0500)

     notifyData.uTimeout = msec;
     wxStrncpy(notifyData.szInfo, text.wx_str(), WXSIZEOF(notifyData.szInfo));
     wxStrncpy(notifyData.szInfoTitle, title.wx_str(),
     notifyData.uTimeout = msec;
     wxStrncpy(notifyData.szInfo, text.wx_str(), WXSIZEOF(notifyData.szInfo));
     wxStrncpy(notifyData.szInfoTitle, title.wx_str(),


@@ -246,11 +245,12 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
         notifyData.dwInfoFlags |= NIIF_WARNING;
     else if ( flags & wxICON_ERROR )
         notifyData.dwInfoFlags |= NIIF_ERROR;
         notifyData.dwInfoFlags |= NIIF_WARNING;
     else if ( flags & wxICON_ERROR )
         notifyData.dwInfoFlags |= NIIF_ERROR;

-#endif

 
     return wxShellNotifyIcon(NIM_MODIFY, &notifyData) != 0;
 }
 
 
     return wxShellNotifyIcon(NIM_MODIFY, &notifyData) != 0;
 }
 

+#endif // wxUSE_TASKBARICON_BALLOONS
+

 bool wxTaskBarIcon::RemoveIcon()
 {
     if (!m_iconAdded)
 bool wxTaskBarIcon::RemoveIcon()
 {
     if (!m_iconAdded)