Added missing wx_aui.dsp file

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index ac67acc1a749c700215d64957c340716dee5586b..3fa0e54e5c3a2a3c860214920f931b539ac92f98 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -46,6 +46,7 @@
     #include "wx/sizer.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/textctrl.h"
 #endif
 
 #if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
@@ -89,7 +90,6 @@
     #include "wx/spinctrl.h"
 #endif // wxUSE_SPINCTRL
 
-#include "wx/textctrl.h"
 #include "wx/notebook.h"
 #include "wx/listctrl.h"
 
@@ -104,7 +104,12 @@
     #include <windowsx.h>
 #endif
 
-#include <commctrl.h>
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
+
+#ifndef __WXWINCE__
+    #include <pbt.h>
+#endif
 
 #include "wx/msw/missing.h"
 
@@ -3080,6 +3085,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
             }
             break;
 
+#ifndef __WXWINCE__
         case WM_POWERBROADCAST:
             {
                 bool vetoed;
@@ -3087,6 +3093,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
                 rc.result = processed && vetoed ? BROADCAST_QUERY_DENY : TRUE;
             }
             break;
+#endif // __WXWINCE__
     }
 
     if ( !processed )
@@ -3386,7 +3393,7 @@ bool wxWindowMSW::HandleTooltipNotify(WXUINT code,
         // Truncate tooltip length if needed as otherwise we might not have
         // enough space for it in the buffer and MultiByteToWideChar() would
         // return an error
-        size_t tipLength = wxMin(ttip.Len(), WXSIZEOF(buf) - 1);
+        size_t tipLength = wxMin(ttip.length(), WXSIZEOF(buf) - 1);
 
         // Convert to WideChar without adding the NULL character. The NULL
         // character is added afterwards (this is more efficient).
@@ -3794,10 +3801,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 )
     {
@@ -3814,6 +3825,9 @@ bool wxWindowMSW::HandlePower(WXWPARAM wParam,
             break;
 
         case PBT_APMRESUMESUSPEND:
+#ifdef PBT_APMRESUMEAUTOMATIC
+        case PBT_APMRESUMEAUTOMATIC:
+#endif
             evtType = wxEVT_POWER_RESUME;
             break;
 
@@ -3829,7 +3843,6 @@ bool wxWindowMSW::HandlePower(WXWPARAM wParam,
         case PBT_APMBATTERYLOW:
         case PBT_APMPOWERSTATUSCHANGE:
         case PBT_APMOEMEVENT:
-        case PBT_APMRESUMEAUTOMATIC:
         case PBT_APMRESUMECRITICAL:
             evtType = wxEVT_NULL;
             break;
@@ -3848,6 +3861,7 @@ bool wxWindowMSW::HandlePower(WXWPARAM wParam,
     *vetoed = event.IsVetoed();
 
     return true;
+#endif
 }
 
 // ---------------------------------------------------------------------------