resolving conflicts in files I had forgot to commit (sorry)

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

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 6087406cf4c25b4fd21baeb5bed31927b2286abc..13dbf8e2d26e1dd817c2815a2557c953704929f5 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -40,6 +40,10 @@
 #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__
+

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


@@ -250,6 +254,7 @@ wxFont wxCreateFontFromStockObject(int index)
 
 wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 {
 
 wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 {

+#ifndef __WXWINCE__

     // this one is special: we don't get it from GetStockObject()
     if ( index == wxSYS_ICONTITLE_FONT )
     {
     // this one is special: we don't get it from GetStockObject()
     if ( index == wxSYS_ICONTITLE_FONT )
     {


@@ -257,6 +262,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0);
         return wxCreateFontFromLogFont(&lf);
     }
         SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0);
         return wxCreateFontFromLogFont(&lf);
     }

+#endif // __WXWINCE__

 
     // wxWindow ctor calls GetSystemFont(wxSYS_DEFAULT_GUI_FONT) so we're
     // called fairly often - this is why we cache this particular font
 
     // wxWindow ctor calls GetSystemFont(wxSYS_DEFAULT_GUI_FONT) so we're
     // called fairly often - this is why we cache this particular font