Fixed inability to select no superscript and no subscript in wxRichTextCtrl's

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 83aef42cde8cb73f565a636a90ecffa0c8dd6b8b..cc52113434070e94a6a1e188e3c1e4f5dd76e1d3 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -37,6 +37,15 @@
     #define NIN_BALLOONUSERCLICK    0x0405
 #endif
 
     #define NIN_BALLOONUSERCLICK    0x0405
 #endif
 

+#ifndef NIM_SETVERSION
+    #define NIM_SETVERSION  0x00000004
+#endif
+
+#ifndef NIF_INFO
+    #define NIF_INFO        0x00000010
+#endif
+
+

 // initialized on demand
 static UINT gs_msgTaskbar = 0;
 static UINT gs_msgRestartTaskbar = 0;
 // initialized on demand
 static UINT gs_msgTaskbar = 0;
 static UINT gs_msgRestartTaskbar = 0;


@@ -200,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,


@@ -238,6 +249,8 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
     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)