predefine _WIN32_IE before including shellapi.h too to allow tooltips longer than...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index bbbd07203b40c01d46c7194086d4021224b398a8..6ae475f79fbe5a6b2fa2b159cfdbf4b499c18f20 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -221,6 +221,7 @@ wxMSW:
 - Fixed infinite loop in wxThread::Wait() in console applications.
 - Return the restored window size from GetSize() when window is minimized.
 - wxCheckListBox now looks more native, especially under XP (Marcin Malich).
 - Fixed infinite loop in wxThread::Wait() in console applications.
 - Return the restored window size from GetSize() when window is minimized.
 - wxCheckListBox now looks more native, especially under XP (Marcin Malich).

+- Allow tooltips longer than 64 (up to 128) characters in wxTaskBarIcon

 
 wxX11:
 
 
 wxX11:
 

diff --git a/include/wx/msw/wrapcctl.h b/include/wx/msw/wrapcctl.h
index 65c17f4d1c399b04131350f00cf6fe4bbf043d77..8d4cd2c70e1e6b8e8cea9f7a66adb29eb9f51808 100644 (file)
--- a/include/wx/msw/wrapcctl.h
+++ b/include/wx/msw/wrapcctl.h
@@ -12,28 +12,6 @@
 #ifndef _WX_MSW_WRAPCCTL_H_
 #define _WX_MSW_WRAPCCTL_H_
 
 #ifndef _WX_MSW_WRAPCCTL_H_
 #define _WX_MSW_WRAPCCTL_H_
 

-// define _WIN32_IE to a high value because we always check for the version
-// of installed DLLs at runtime anyway (see wxApp::GetComCtl32Version()) unless
-// the user really doesn't want it and had defined it to a (presumably lower)
-// value
-//
-// just for the reference, here is the table showing what the different value
-// of _WIN32_IE correspond to:
-//
-// 0x0200     for comctl32.dll 4.00 shipped with Win95/NT 4.0
-// 0x0300                      4.70              IE 3.x
-// 0x0400                      4.71              IE 4.0
-// 0x0401                      4.72              IE 4.01 and Win98
-// 0x0500                      5.80              IE 5.x
-// 0x0500                      5.81              Win2k/ME
-// 0x0600                      6.00              WinXP
-
-#ifndef _WIN32_IE
-    // use maximal set of features by default, we check for them during
-    // run-time anyhow
-    #define _WIN32_IE 0x0600
-#endif // !defined(_WIN32_IE)
-

 #include "wx/msw/wrapwin.h"
 
 #include <commctrl.h>
 #include "wx/msw/wrapwin.h"
 
 #include <commctrl.h>

diff --git a/include/wx/msw/wrapshl.h b/include/wx/msw/wrapshl.h
index 5cef66c0333baca5dd628f572ce469703e8bef9f..472df7511df16089957a39b739f47dbea8d2e07c 100644 (file)
--- a/include/wx/msw/wrapshl.h
+++ b/include/wx/msw/wrapshl.h
@@ -12,10 +12,13 @@
 #ifndef _WX_MSW_WRAPSHL_H_
 #define _WX_MSW_WRAPSHL_H_
 
 #ifndef _WX_MSW_WRAPSHL_H_
 #define _WX_MSW_WRAPSHL_H_
 

+#include "wx/msw/wrapwin.h"
+

 #ifdef __WXWINCE__
     #include <winreg.h>
     #include <objbase.h>
     #include <shlguid.h>
 #ifdef __WXWINCE__
     #include <winreg.h>
     #include <objbase.h>
     #include <shlguid.h>

+    #include <shellapi.h>

 #endif
 
 #include <shlobj.h>
 #endif
 
 #include <shlobj.h>

diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index ef3f4505a6242806c020e53ac013a9bd8fd53b6a..5f54a6f0d2dbcf1bf6f2c5a5b3548231d57d4d4d 100644 (file)
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -39,10 +39,19 @@
     #endif
 #endif
 
     #endif
 #endif
 

+// define _WIN32_WINNT and _WIN32_IE to the highest possible values because we
+// always check for the version of installed DLLs at runtime anyway (see
+// wxGetWinVersion() and wxApp::GetComCtl32Version()) unless the user really
+// doesn't want to use APIs only available on later OS versions and had defined
+// them to (presumably lower) values

 #ifndef _WIN32_WINNT
     #define _WIN32_WINNT 0x0600
 #endif
 
 #ifndef _WIN32_WINNT
     #define _WIN32_WINNT 0x0600
 #endif
 

+#ifndef _WIN32_IE
+    #define _WIN32_IE 0x0700
+#endif
+

 /* Deal with clash with __WINDOWS__ include guard */
 #if defined(__WXWINCE__) && defined(__WINDOWS__)
 #undef __WINDOWS__
 /* Deal with clash with __WINDOWS__ include guard */
 #if defined(__WXWINCE__) && defined(__WINDOWS__)
 #undef __WINDOWS__

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 0a6277803fba8dfd6c30c723d6e130b9561d1cc2..d665f81e5c831036aec4a689b5d6d59cc16115dc 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -26,17 +26,11 @@
     #include "wx/menu.h"
 #endif
 
     #include "wx/menu.h"
 #endif
 

-#include "wx/msw/private.h"
-#include "wx/msw/winundef.h"
+#include "wx/msw/wrapshl.h"

 
 #include <string.h>
 #include "wx/taskbar.h"
 
 
 #include <string.h>
 #include "wx/taskbar.h"
 

-#ifdef __WXWINCE__
-    #include <winreg.h>
-    #include <shellapi.h>
-#endif
-

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