Document steps needed to update to newer Scintilla. (From memory, will need to be...

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

diff --git a/src/msw/power.cpp b/src/msw/power.cpp
index 022e624dadfb8c52521cea4d5170ee83442294fe..9b147e17dd5daff218a75d0ed3b27753d6e84d55 100644 (file)
--- a/src/msw/power.cpp
+++ b/src/msw/power.cpp
@@ -28,6 +28,17 @@
 #endif //WX_PRECOMP
 
 #include "wx/power.h"
 #endif //WX_PRECOMP
 
 #include "wx/power.h"

+#include "wx/msw/private.h"
+
+#if !defined(__WINCE_STANDARDSDK__)
+
+#ifdef __WXWINCE__
+    typedef SYSTEM_POWER_STATUS_EX SYSTEM_POWER_STATUS;
+    BOOL GetSystemPowerStatus(SYSTEM_POWER_STATUS *status)
+    {
+        return GetSystemPowerStatusEx(status, TRUE);
+    }
+#endif

 
 // ----------------------------------------------------------------------------
 // helper functions
 
 // ----------------------------------------------------------------------------
 // helper functions


@@ -37,19 +48,22 @@ static inline bool wxGetPowerStatus(SYSTEM_POWER_STATUS *sps)
 {
     if ( !::GetSystemPowerStatus(sps) )
     {
 {
     if ( !::GetSystemPowerStatus(sps) )
     {

-        wxLogLastError(_T("GetSystemPowerStatus()"));
+        wxLogLastError(wxT("GetSystemPowerStatus()"));

         return false;
     }
 
     return true;
 }
 
         return false;
     }
 
     return true;
 }
 

+#endif
+

 // ============================================================================
 // implementation
 // ============================================================================
 
 wxPowerType wxGetPowerType()
 {
 // ============================================================================
 // implementation
 // ============================================================================
 
 wxPowerType wxGetPowerType()
 {

+#if !defined(__WINCE_STANDARDSDK__)

     SYSTEM_POWER_STATUS sps;
     if ( wxGetPowerStatus(&sps) )
     {
     SYSTEM_POWER_STATUS sps;
     if ( wxGetPowerStatus(&sps) )
     {


@@ -62,17 +76,19 @@ wxPowerType wxGetPowerType()
                 return wxPOWER_SOCKET;
 
             default:
                 return wxPOWER_SOCKET;
 
             default:

-                wxLogDebug(_T("Unknown ACLineStatus=%u"), sps.ACLineStatus);
+                wxLogDebug(wxT("Unknown ACLineStatus=%u"), sps.ACLineStatus);

             case 255:
                 break;
         }
     }
             case 255:
                 break;
         }
     }

+#endif

 
     return wxPOWER_UNKNOWN;
 }
 
 wxBatteryState wxGetBatteryState()
 {
 
     return wxPOWER_UNKNOWN;
 }
 
 wxBatteryState wxGetBatteryState()
 {

+#if !defined(__WINCE_STANDARDSDK__)

     SYSTEM_POWER_STATUS sps;
     if ( wxGetPowerStatus(&sps) )
     {
     SYSTEM_POWER_STATUS sps;
     if ( wxGetPowerStatus(&sps) )
     {


@@ -90,8 +106,7 @@ wxBatteryState wxGetBatteryState()
                 return wxBATTERY_CRITICAL_STATE;
         }
     }
                 return wxBATTERY_CRITICAL_STATE;
         }
     }

+#endif

 
     return wxBATTERY_UNKNOWN_STATE;
 }
 
     return wxBATTERY_UNKNOWN_STATE;
 }

-
-