Added wxSYS_TABLET_PRESENT to check for tablet capability

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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 1702717ce4fb660122793c82b059d347ebcd90ee..451b3646113a4fc1f443ce089a47030ec6776149 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -96,6 +96,27 @@
     #define VK_OEM_PERIOD   0xBE
 #endif
 
     #define VK_OEM_PERIOD   0xBE
 #endif
 

+#ifndef SM_TABLETPC
+    #define SM_TABLETPC 86
+#endif
+
+#ifndef INKEDIT_CLASS
+#   define INKEDIT_CLASSW  L"INKEDIT"
+#   ifdef UNICODE
+#       define INKEDIT_CLASS   INKEDIT_CLASSW
+#   else
+#       define INKEDIT_CLASS   "INKEDIT"
+#   endif
+#endif
+
+#ifndef EM_SETINKINSERTMODE
+#   define EM_SETINKINSERTMODE (WM_USER + 0x0204)
+#endif
+
+#ifndef EM_SETUSEMOUSEFORINPUT
+#define EM_SETUSEMOUSEFORINPUT (WM_USER + 0x224)
+#endif
+

 // ----------------------------------------------------------------------------
 // ListView common control
 // Needed by listctrl.cpp
 // ----------------------------------------------------------------------------
 // ListView common control
 // Needed by listctrl.cpp

diff --git a/include/wx/settings.h b/include/wx/settings.h
index 24cee957a2385d3a211139a6e3f9921ce2fea4e1..556e932500b36222b789c3d81e295cc29005154b 100644 (file)
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -132,7 +132,8 @@ enum wxSystemMetric
 enum wxSystemFeature
 {
     wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1,
 enum wxSystemFeature
 {
     wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1,

-    wxSYS_CAN_ICONIZE_FRAME
+    wxSYS_CAN_ICONIZE_FRAME,
+    wxSYS_TABLET_PRESENT

 };
 
 // values for different screen designs
 };
 
 // values for different screen designs

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 76d77a96bfceb083f2d395fa53bd494136ecbdb9..a9b58c8a3546fa7aba85105ed107d5fee5dfb7c8 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -40,9 +40,8 @@
 #include "wx/module.h"
 #include "wx/fontutil.h"
 
 #include "wx/module.h"
 #include "wx/fontutil.h"
 

-#ifdef __WXWINCE__ // for SM_CXCURSOR and SM_CYCURSOR
-#include "wx/msw/wince/missing.h"
-#endif // __WXWINCE__
+// for SM_CXCURSOR, SM_CYCURSOR, SM_TABLETPC
+#include "wx/msw/missing.h"

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -419,6 +418,9 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
             return true;
 
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
             return true;
 

+        case wxSYS_TABLET_PRESENT:
+            return ::GetSystemMetrics(SM_TABLETPC) != 0;
+

         default:
             wxFAIL_MSG( _T("unknown system feature") );
 
         default:
             wxFAIL_MSG( _T("unknown system feature") );