wxWinCE power build fixes.

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

diff --git a/src/msw/power.cpp b/src/msw/power.cpp
index cf96885bbb9c31675195314ff517fdd5c91cf74d..83819c38fb15a0e381ed5c9bc98446142207e40c 100644 (file)
--- a/src/msw/power.cpp
+++ b/src/msw/power.cpp
@@ -30,6 +30,14 @@
 #include "wx/power.h"
 #include "wx/msw/private.h"
 
 #include "wx/power.h"
 #include "wx/msw/private.h"
 

+#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
 // ----------------------------------------------------------------------------


@@ -94,5 +102,3 @@ wxBatteryState wxGetBatteryState()
 
     return wxBATTERY_UNKNOWN_STATE;
 }
 
     return wxBATTERY_UNKNOWN_STATE;
 }

-
-

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index a28f4c0901cc77285d157a2f6cc54229c15c5a64..7691c62d9abd6dbd6a778181b28f0b39f198cf90 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -105,7 +105,10 @@
 #endif
 
 #include <commctrl.h>
 #endif
 
 #include <commctrl.h>

-#include <pbt.h>
+
+#ifndef __WXWINCE__
+    #include <pbt.h>
+#endif

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


@@ -3081,6 +3084,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
             }
             break;
 
             }
             break;
 

+#ifndef __WXWINCE__

         case WM_POWERBROADCAST:
             {
                 bool vetoed;
         case WM_POWERBROADCAST:
             {
                 bool vetoed;


@@ -3088,6 +3092,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
                 rc.result = processed && vetoed ? BROADCAST_QUERY_DENY : TRUE;
             }
             break;
                 rc.result = processed && vetoed ? BROADCAST_QUERY_DENY : TRUE;
             }
             break;

+#endif // __WXWINCE__

     }
 
     if ( !processed )
     }
 
     if ( !processed )


@@ -3795,10 +3800,14 @@ bool wxWindowMSW::HandleSetCursor(WXHWND WXUNUSED(hWnd),
     return false;
 }
 
     return false;
 }
 

-bool wxWindowMSW::HandlePower(WXWPARAM wParam,
+bool wxWindowMSW::HandlePower(WXWPARAM WXUNUSED_IN_WINCE(wParam),

                               WXLPARAM WXUNUSED(lParam),
                               WXLPARAM WXUNUSED(lParam),

-                              bool *vetoed)
+                              bool *WXUNUSED_IN_WINCE(vetoed))

 {
 {

+#ifdef __WXWINCE__
+    // FIXME
+    return false;
+#else

     wxEventType evtType;
     switch ( wParam )
     {
     wxEventType evtType;
     switch ( wParam )
     {


@@ -3851,6 +3860,7 @@ bool wxWindowMSW::HandlePower(WXWPARAM wParam,
     *vetoed = event.IsVetoed();
 
     return true;
     *vetoed = event.IsVetoed();
 
     return true;

+#endif

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------