From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 24 Feb 2008 23:28:43 +0000 (+0000)
Subject: always return 471 from wxApp::GetComCtl32Version() under CE as its commctrl.dll inclu... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6b4296f7fbee294dea1e5d8256378afea201cd9c?ds=inline

always return 471 from wxApp::GetComCtl32Version() under CE as its commctrl.dll includes all comctl32.dll v4.71 functionality (replaces patch 1890933)

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index 601c4ab932..c9703b11d8 100644
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -81,6 +81,26 @@ protected:
     DECLARE_NO_COPY_CLASS(wxApp)
 };
 
+#ifdef __WXWINCE__
+
+// under CE provide a dummy implementation of GetComCtl32Version() returning
+// the value passing all ">= 470" tests (which are the only ones used in our
+// code currently) as commctrl.dll under CE 2.0 and later support comctl32.dll
+// functionality
+inline int wxApp::GetComCtl32Version()
+{
+    return 471;
+}
+
+// this is not currently used at all under CE so it's not really clear what do
+// we need to return from here
+inline int wxApp::GetShell32Version()
+{
+    return 0;
+}
+
+#endif // __WXWINCE__
+
 // ----------------------------------------------------------------------------
 // MSW-specific wxEntry() overload and IMPLEMENT_WXWIN_MAIN definition
 // ----------------------------------------------------------------------------
diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 2d46ea6145..474e8e4839 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -607,6 +607,9 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
 // system DLL versions
 // ----------------------------------------------------------------------------
 
+// these functions have trivial inline implementations for CE
+#ifndef __WXWINCE__
+
 #if wxUSE_DYNLIB_CLASS
 
 namespace
@@ -742,6 +745,8 @@ int wxApp::GetShell32Version()
 
 #endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS
 
+#endif // !__WXWINCE__
+
 // ----------------------------------------------------------------------------
 // Yield to incoming messages
 // ----------------------------------------------------------------------------