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

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index ac67acc1a749c700215d64957c340716dee5586b..7691c62d9abd6dbd6a778181b28f0b39f198cf90 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -106,6 +106,10 @@
 
 #include <commctrl.h>
 
+#ifndef __WXWINCE__
+    #include <pbt.h>
+#endif
+
 #include "wx/msw/missing.h"
 
 #if defined(__WXWINCE__)
@@ -3080,6 +3084,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
             }
             break;
 
+#ifndef __WXWINCE__
         case WM_POWERBROADCAST:
             {
                 bool vetoed;
@@ -3087,6 +3092,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
                 rc.result = processed && vetoed ? BROADCAST_QUERY_DENY : TRUE;
             }
             break;
+#endif // __WXWINCE__
     }
 
     if ( !processed )
@@ -3794,10 +3800,14 @@ bool wxWindowMSW::HandleSetCursor(WXHWND WXUNUSED(hWnd),
     return false;
 }
 
-bool wxWindowMSW::HandlePower(WXWPARAM wParam,
+bool wxWindowMSW::HandlePower(WXWPARAM WXUNUSED_IN_WINCE(wParam),
                               WXLPARAM WXUNUSED(lParam),
-                              bool *vetoed)
+                              bool *WXUNUSED_IN_WINCE(vetoed))
 {
+#ifdef __WXWINCE__
+    // FIXME
+    return false;
+#else
     wxEventType evtType;
     switch ( wParam )
     {
@@ -3829,7 +3839,9 @@ bool wxWindowMSW::HandlePower(WXWPARAM wParam,
         case PBT_APMBATTERYLOW:
         case PBT_APMPOWERSTATUSCHANGE:
         case PBT_APMOEMEVENT:
+#ifdef PBT_APMRESUMEAUTOMATIC
         case PBT_APMRESUMEAUTOMATIC:
+#endif
         case PBT_APMRESUMECRITICAL:
             evtType = wxEVT_NULL;
             break;
@@ -3848,6 +3860,7 @@ bool wxWindowMSW::HandlePower(WXWPARAM wParam,
     *vetoed = event.IsVetoed();
 
     return true;
+#endif
 }
 
 // ---------------------------------------------------------------------------