Include wx/stopwatch.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 602d3f8e6209762ff8574b0f0971fd393ca8686b..bee65992b7a4510ee1ceb5816fb5cf8be3075295 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -24,13 +24,13 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/settings.h"
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/gdicmn.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/gdicmn.h"
 #endif
 

-#include "wx/settings.h"
-

 #include "wx/msw/private.h"
 
 #ifndef SPI_GETFLATMENU
 #include "wx/msw/private.h"
 
 #ifndef SPI_GETFLATMENU


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


@@ -172,7 +171,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
                         index = wxSYS_COLOUR_MENU ;
                 }
             }
                         index = wxSYS_COLOUR_MENU ;
                 }
             }

-       }
+        }

 
         if ( useDefault )
         {
 
         if ( useDefault )
         {


@@ -225,12 +224,13 @@ wxFont wxCreateFontFromStockObject(int index)
         {
             wxNativeFontInfo info;
             info.lf = lf;
         {
             wxNativeFontInfo info;
             info.lf = lf;

+#ifndef __WXWINCE__

             // We want Windows 2000 or later to have new fonts even MS Shell Dlg
             // is returned as default GUI font for compatibility
             int verMaj;
             if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxWINDOWS_NT && verMaj >= 5)
                 wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2"));
             // We want Windows 2000 or later to have new fonts even MS Shell Dlg
             // is returned as default GUI font for compatibility
             int verMaj;
             if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxWINDOWS_NT && verMaj >= 5)
                 wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2"));

-
+#endif

             // Under MicroWindows we pass the HFONT as well
             // because it's hard to convert HFONT -> LOGFONT -> HFONT
             // It's OK to delete stock objects, the delete will be ignored.
             // Under MicroWindows we pass the HFONT as well
             // because it's hard to convert HFONT -> LOGFONT -> HFONT
             // It's OK to delete stock objects, the delete will be ignored.


@@ -309,8 +309,12 @@ static const int gs_metricsMap[] =
 
     SM_CXBORDER,
     SM_CYBORDER,
 
     SM_CXBORDER,
     SM_CYBORDER,

+#ifdef SM_CXCURSOR

     SM_CXCURSOR,
     SM_CYCURSOR,
     SM_CXCURSOR,
     SM_CYCURSOR,

+#else
+    -1, -1,
+#endif

     SM_CXDOUBLECLK,
     SM_CYDOUBLECLK,
 #if defined(__WIN32__) && defined(SM_CXDRAG)
     SM_CXDOUBLECLK,
     SM_CYDOUBLECLK,
 #if defined(__WIN32__) && defined(SM_CXDRAG)


@@ -418,6 +422,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") );