WinCE build fixes.

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

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 48cda637a526534fd6b7d473fbf9e895e66d5866..73905fd61ee5dfd8133145741dc5137057cd60ee 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -447,6 +447,11 @@ bool wxPlatform::Is(int platform)
     if (platform == wxOS_WINDOWS_CE)
         return true;
 #endif
+
+#if 0
+
+// FIXME: wxWinPocketPC and wxWinSmartPhone are unknown symbols
+
 #if defined(__WXWINCE__) && defined(__POCKETPC__)
     if (platform == wxWinPocketPC)
         return true;
@@ -455,6 +460,9 @@ bool wxPlatform::Is(int platform)
     if (platform == wxWinSmartPhone)
         return true;
 #endif
+
+#endif
+
 #ifdef __WXGTK__
     if (platform == wxPORT_GTK)
         return true;

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 4aa5c5ec8f3894b7441539d745c013103d8d4e59..08f8e0779f8a387843b166dc314b3c606d71001e 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -293,7 +293,7 @@ class wxTreeItemParam
 {
 public:
     wxTreeItemParam()
-        : m_item((long int)0),
+        : m_item(NULL),
           m_data(NULL)
     {
         for ( size_t n = 0; n < WXSIZEOF(m_images); n++ )

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index cc998c4242a499762d95eac60731e201edf9e9cc..80e4f75b79d0da7cf1a21b85f7ab0ca7f05e19f2 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -1197,8 +1197,8 @@ wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
         if (verMin) *verMin = info.dwMinorVersion;
     }
 
-#if defined(__WXHANDHELD__) || defined( __WXWINCE__ )
-    return wxOS_WINDOWS_WINCE;
+#if defined( __WXWINCE__ )
+    return wxOS_WINDOWS_CE;
 #elif defined( __WXMICROWIN__ )
     return wxOS_WINDOWS_MICRO;
 #else