removed called to deprecated wxPixelData::UseAlpha() which does nothing now

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

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 602d3f8e6209762ff8574b0f0971fd393ca8686b..6c46ae230bb415bf81c5ccac6312e3bfed744761 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/settings.cpp
+// Name:        src/msw/settings.cpp

 // Purpose:     wxSystemSettingsNative implementation for MSW
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxSystemSettingsNative implementation for MSW
 // Author:      Julian Smart
 // Modified by:


@@ -24,26 +24,23 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/settings.h"
+

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

+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/settings.h"
-

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

+#include "wx/msw/missing.h" // for SM_CXCURSOR, SM_CYCURSOR, SM_TABLETPC

 
 #ifndef SPI_GETFLATMENU
 #define SPI_GETFLATMENU                     0x1022
 #endif
 
 
 #ifndef SPI_GETFLATMENU
 #define SPI_GETFLATMENU                     0x1022
 #endif
 

-#include "wx/module.h"

 #include "wx/fontutil.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
 // ----------------------------------------------------------------------------


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

-       }
+        }

 
         if ( useDefault )
         {
 
         if ( useDefault )
         {


@@ -225,12 +222,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;
             // 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)
+            if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxOS_WINDOWS_NT && verMaj >= 5)

                 wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2"));
                 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 +307,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 +420,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") );
 


@@ -442,12 +447,12 @@ extern wxFont wxGetCCDefaultFont()
     int verMaj, verMin;
     switch ( wxGetOsVersion(&verMaj, &verMin) )
     {
     int verMaj, verMin;
     switch ( wxGetOsVersion(&verMaj, &verMin) )
     {

-        case wxWIN95:
+        case wxOS_WINDOWS_9X:

             // 4.10 is Win98
             useIconFont = verMaj == 4 && verMin >= 10;
             break;
 
             // 4.10 is Win98
             useIconFont = verMaj == 4 && verMin >= 10;
             break;
 

-        case wxWINDOWS_NT:
+        case wxOS_WINDOWS_NT:

             // 5.0 is Win2k
             useIconFont = verMaj >= 5;
             break;
             // 5.0 is Win2k
             useIconFont = verMaj >= 5;
             break;