Compilaton fixes.

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 8bb2ed22f146946676e555f3eb2dec3b5d517076..3d223612143b4bea990573a6a6fe8bee271e0e40 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -29,8 +29,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include <windows.h>
-    #include "wx/msw/winundef.h"
+    #include "wx/msw/wrapwin.h"

     #include "wx/window.h"
     #include "wx/accel.h"
     #include "wx/setup.h"
     #include "wx/window.h"
     #include "wx/accel.h"
     #include "wx/setup.h"


@@ -95,7 +94,7 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-#if (!defined(__GNUWIN32_OLD__) && !defined(__WXMICROWIN__)) || defined(__CYGWIN10__)
+#if (!defined(__GNUWIN32_OLD__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)) || defined(__CYGWIN10__)

     #include <shellapi.h>
     #include <mmsystem.h>
 #endif
     #include <shellapi.h>
     #include <mmsystem.h>
 #endif


@@ -104,11 +103,11 @@
     #include <windowsx.h>
 #endif
 
     #include <windowsx.h>
 #endif
 

-#if (!defined(__GNUWIN32_OLD__) && !defined(__WXMICROWIN__)) || defined(__CYGWIN10__)
+#if (!defined(__GNUWIN32_OLD__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)) || defined(__CYGWIN10__)

     #ifdef __WIN95__
         #include <commctrl.h>
     #endif
     #ifdef __WIN95__
         #include <commctrl.h>
     #endif

-#elif !defined(__WXMICROWIN__) // broken compiler
+#elif !defined(__WXMICROWIN__) && !defined(__WXWINCE__) // broken compiler

     #include "wx/msw/gnuwin32/extra.h"
 #endif
 
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 


@@ -116,6 +115,10 @@
 #include "wx/msw/missing.h"
 #endif
 
 #include "wx/msw/missing.h"
 #endif
 

+#if defined(__WXWINCE__)
+#include "wx/msw/wince/missing.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // standard constants not available with all compilers/headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // standard constants not available with all compilers/headers
 // ----------------------------------------------------------------------------


@@ -262,7 +265,7 @@ wxWindow *wxWindowMSW::FindItem(long id) const
     }
 #endif // wxUSE_CONTROLS
 
     }
 #endif // wxUSE_CONTROLS
 

-    wxWindowList::Node *current = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator current = GetChildren().GetFirst();

     while (current)
     {
         wxWindow *childWin = current->GetData();
     while (current)
     {
         wxWindow *childWin = current->GetData();


@@ -280,7 +283,7 @@ wxWindow *wxWindowMSW::FindItem(long id) const
 // Find an item given the MS Windows handle
 wxWindow *wxWindowMSW::FindItemByHWND(WXHWND hWnd, bool controlOnly) const
 {
 // Find an item given the MS Windows handle
 wxWindow *wxWindowMSW::FindItemByHWND(WXHWND hWnd, bool controlOnly) const
 {

-    wxWindowList::Node *current = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator current = GetChildren().GetFirst();

     while (current)
     {
         wxWindow *parent = current->GetData();
     while (current)
     {
         wxWindow *parent = current->GetData();


@@ -448,7 +451,7 @@ void wxWindowMSW::SetFocus()
     HWND hWnd = GetHwnd();
     wxCHECK_RET( hWnd, _T("can't set focus to invalid window") );
 
     HWND hWnd = GetHwnd();
     wxCHECK_RET( hWnd, _T("can't set focus to invalid window") );
 

-#ifndef __WXMICROWIN__
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

     ::SetLastError(0);
 #endif
 
     ::SetLastError(0);
 #endif
 


@@ -517,7 +520,7 @@ bool wxWindowMSW::Enable(bool enable)
     // well but when it is enabled back, only those of the children which
     // hadn't been already disabled in the beginning should be enabled again,
     // so we have to keep the list of those children
     // well but when it is enabled back, only those of the children which
     // hadn't been already disabled in the beginning should be enabled again,
     // so we have to keep the list of those children

-    for ( wxWindowList::Node *node = GetChildren().GetFirst();
+    for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

           node;
           node = node->GetNext() )
     {
           node;
           node = node->GetNext() )
     {


@@ -744,7 +747,17 @@ inline int GetScrollPosition(HWND hWnd, int wOrient)
 #ifdef __WXMICROWIN__
     return ::GetScrollPosWX(hWnd, wOrient);
 #else
 #ifdef __WXMICROWIN__
     return ::GetScrollPosWX(hWnd, wOrient);
 #else

-    return ::GetScrollPos(hWnd, wOrient);
+    SCROLLINFO scrollInfo;
+    scrollInfo.cbSize = sizeof(SCROLLINFO);
+    scrollInfo.fMask = SIF_POS;
+    if ( !::GetScrollInfo(hWnd,
+                                  wOrient,
+                                  &scrollInfo) )
+    {
+        wxLogLastError(_T("GetScrollInfo"));
+    }
+    return scrollInfo.nPos;
+//    return ::GetScrollPos(hWnd, wOrient);

 #endif
 }
 
 #endif
 }
 


@@ -760,13 +773,23 @@ int wxWindowMSW::GetScrollPos(int orient) const
 // of positions that we can scroll.
 int wxWindowMSW::GetScrollRange(int orient) const
 {
 // of positions that we can scroll.
 int wxWindowMSW::GetScrollRange(int orient) const
 {

-    int minPos, maxPos;
+    int maxPos;

     HWND hWnd = GetHwnd();
     if ( !hWnd )
         return 0;
     HWND hWnd = GetHwnd();
     if ( !hWnd )
         return 0;

-
+#if 0

     ::GetScrollRange(hWnd, orient == wxHORIZONTAL ? SB_HORZ : SB_VERT,
                      &minPos, &maxPos);
     ::GetScrollRange(hWnd, orient == wxHORIZONTAL ? SB_HORZ : SB_VERT,
                      &minPos, &maxPos);

+#endif
+    SCROLLINFO scrollInfo;
+    scrollInfo.fMask = SIF_RANGE;
+    if ( !::GetScrollInfo(hWnd,
+                                  orient == wxHORIZONTAL ? SB_HORZ : SB_VERT,
+                                  &scrollInfo) )
+    {
+        wxLogLastError(_T("GetScrollInfo"));
+    }
+    maxPos = scrollInfo.nMax;

 
     // undo "range - 1" done in SetScrollbar()
     return maxPos + 1;
 
     // undo "range - 1" done in SetScrollbar()
     return maxPos + 1;


@@ -843,7 +866,12 @@ void wxWindowMSW::ScrollWindow(int dx, int dy, const wxRect *prect)
         pr = NULL;
     }
 
         pr = NULL;
     }
 

+#ifdef __WXWINCE__
+    // FIXME: is this the exact equivalent of the line below?
+    ::ScrollWindowEx(GetHwnd(), dx, dy, pr, pr, 0, 0, SW_ERASE|SW_INVALIDATE);
+#else

     ::ScrollWindow(GetHwnd(), dx, dy, pr, pr);
     ::ScrollWindow(GetHwnd(), dx, dy, pr, pr);

+#endif

 }
 
 static bool ScrollVertically(HWND hwnd, int kind, int count)
 }
 
 static bool ScrollVertically(HWND hwnd, int kind, int count)


@@ -903,7 +931,7 @@ void wxWindowMSW::SubclassWin(WXHWND hWnd)
 
     // we don't need to subclass the window of our own class (in the Windows
     // sense of the word)
 
     // we don't need to subclass the window of our own class (in the Windows
     // sense of the word)

-    if ( !wxCheckWindowWndProc(hWnd, (WXFARPROC)wxWndProc) )
+       if ( !wxCheckWindowWndProc(hWnd, (WXFARPROC)wxWndProc) )

     {
         ::SetWindowLong(hwnd, GWL_WNDPROC, (LONG) wxWndProc);
     }
     {
         ::SetWindowLong(hwnd, GWL_WNDPROC, (LONG) wxWndProc);
     }


@@ -949,6 +977,28 @@ bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc)
     // unicows.dll, we can override unicows hooks by setting
     // Unicows_{Set,Get}WindowLong and Unicows_RegisterClass to our own
     // versions that keep track of fake<->real wnd proc mapping.
     // unicows.dll, we can override unicows hooks by setting
     // Unicows_{Set,Get}WindowLong and Unicows_RegisterClass to our own
     // versions that keep track of fake<->real wnd proc mapping.

+
+       // On WinCE (at least), the wndproc comparison doesn't work,
+       // so have to use something like this.
+#ifdef __WXWINCE__
+       extern const wxChar *wxCanvasClassName;
+       extern const wxChar *wxCanvasClassNameNR;
+       extern const wxChar *wxMDIFrameClassName;
+       extern const wxChar *wxMDIFrameClassNameNoRedraw;
+       extern const wxChar *wxMDIChildFrameClassName;
+       extern const wxChar *wxMDIChildFrameClassNameNoRedraw;
+       wxString str(wxGetWindowClass(hWnd));
+       if (str == wxCanvasClassName ||
+               str == wxCanvasClassNameNR ||
+               str == wxMDIFrameClassName || 
+               str == wxMDIFrameClassNameNoRedraw || 
+               str == wxMDIChildFrameClassName || 
+               str == wxMDIChildFrameClassNameNoRedraw || 
+               str == _T("wxTLWHiddenParent"))
+               return TRUE; // Effectively means don't subclass
+       else
+               return FALSE;
+#else

     WNDCLASS cls;
     if ( !::GetClassInfo(wxGetInstance(), wxGetWindowClass(hWnd), &cls) )
     {
     WNDCLASS cls;
     if ( !::GetClassInfo(wxGetInstance(), wxGetWindowClass(hWnd), &cls) )
     {


@@ -958,6 +1008,7 @@ bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc)
     }
 
     return wndProc == (WXFARPROC)cls.lpfnWndProc;
     }
 
     return wndProc == (WXFARPROC)cls.lpfnWndProc;

+#endif

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


@@ -1046,8 +1097,10 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
     {
         *exstyle = 0;
 
     {
         *exstyle = 0;
 

+#ifndef __WXWINCE__

         if ( flags & wxTRANSPARENT_WINDOW )
             *exstyle |= WS_EX_TRANSPARENT;
         if ( flags & wxTRANSPARENT_WINDOW )
             *exstyle |= WS_EX_TRANSPARENT;

+#endif

 
         switch ( border )
         {
 
         switch ( border )
         {


@@ -1079,7 +1132,7 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
         }
 
         // wxUniv doesn't use Windows dialog navigation functions at all
         }
 
         // wxUniv doesn't use Windows dialog navigation functions at all

-#ifndef __WXUNIVERSAL__
+#if !defined(__WXUNIVERSAL__) && !defined(__WXWINCE__)

         // to make the dialog navigation work with the nested panels we must
         // use this style (top level windows such as dialogs don't need it)
         if ( (flags & wxTAB_TRAVERSAL) && !IsTopLevel() )
         // to make the dialog navigation work with the nested panels we must
         // use this style (top level windows such as dialogs don't need it)
         if ( (flags & wxTAB_TRAVERSAL) && !IsTopLevel() )


@@ -1265,7 +1318,7 @@ void wxWindowMSW::Update()
         wxLogLastError(_T("UpdateWindow"));
     }
 
         wxLogLastError(_T("UpdateWindow"));
     }
 

-#if !defined(__WXMICROWIN__)
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

     // just calling UpdateWindow() is not enough, what we did in our WM_PAINT
     // handler needs to be really drawn right now
     (void)::GdiFlush();
     // just calling UpdateWindow() is not enough, what we did in our WM_PAINT
     // handler needs to be really drawn right now
     (void)::GdiFlush();


@@ -1295,9 +1348,11 @@ void wxWindowMSW::SetDropTarget(wxDropTarget *pDropTarget)
 // DragAcceptFiles in parallel with SetDropTarget.
 void wxWindowMSW::DragAcceptFiles(bool accept)
 {
 // DragAcceptFiles in parallel with SetDropTarget.
 void wxWindowMSW::DragAcceptFiles(bool accept)
 {

+#if !defined(__WXWINCE__)

     HWND hWnd = GetHwnd();
     if ( hWnd )
         ::DragAcceptFiles(hWnd, (BOOL)accept);
     HWND hWnd = GetHwnd();
     if ( hWnd )
         ::DragAcceptFiles(hWnd, (BOOL)accept);

+#endif

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


@@ -1701,7 +1756,11 @@ bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y)
     point.y = y;
     ::ClientToScreen(hWnd, &point);
     wxCurrentPopupMenu = menu;
     point.y = y;
     ::ClientToScreen(hWnd, &point);
     wxCurrentPopupMenu = menu;

-    ::TrackPopupMenu(hMenu, TPM_RIGHTBUTTON, point.x, point.y, 0, hWnd, NULL);
+    UINT flags = 0;
+#if !defined(__WXWINCE__)
+    flags = TPM_RIGHTBUTTON;
+#endif
+    ::TrackPopupMenu(hMenu, flags, point.x, point.y, 0, hWnd, NULL);

 
     // we need to do it righ now as otherwise the events are never going to be
     // sent to wxCurrentPopupMenu from HandleCommand()
 
     // we need to do it righ now as otherwise the events are never going to be
     // sent to wxCurrentPopupMenu from HandleCommand()


@@ -1942,15 +2001,19 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
             // style has the focus, it can happen. One such possibility is if
             // all windows are either toplevel, wxDialog, wxPanel or static
             // controls and no window can actually accept keyboard input.
             // style has the focus, it can happen. One such possibility is if
             // all windows are either toplevel, wxDialog, wxPanel or static
             // controls and no window can actually accept keyboard input.

+#if !defined(__WXWINCE__)

             if ( ::GetWindowLong(hwndFocus, GWL_EXSTYLE) & WS_EX_CONTROLPARENT )
             {
                 // passimistic by default
                 canSafelyCallIsDlgMsg = FALSE;
             if ( ::GetWindowLong(hwndFocus, GWL_EXSTYLE) & WS_EX_CONTROLPARENT )
             {
                 // passimistic by default
                 canSafelyCallIsDlgMsg = FALSE;

-                for ( wxWindowList::Node *node = GetChildren().GetFirst();
+                for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

                       node;
                       node = node->GetNext() )
                 {
                       node;
                       node = node->GetNext() )
                 {

-                    if ( node->GetData()->AcceptsFocus() )
+                    wxWindow * const win = node->GetData();
+                    if ( win->AcceptsFocus() &&
+                            !(::GetWindowLong(GetHwndOf(win), GWL_EXSTYLE) &
+                                WS_EX_CONTROLPARENT) )

                     {
                         // it shouldn't hang...
                         canSafelyCallIsDlgMsg = TRUE;
                     {
                         // it shouldn't hang...
                         canSafelyCallIsDlgMsg = TRUE;


@@ -1959,6 +2022,7 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
                     }
                 }
             }
                     }
                 }
             }

+#endif // !__WXWINCE__

 
             if ( canSafelyCallIsDlgMsg )
             {
 
             if ( canSafelyCallIsDlgMsg )
             {


@@ -2169,23 +2233,25 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
             processed = HandleMove(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
             break;
 
             processed = HandleMove(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
             break;
 

+#if !defined(__WXWINCE__)

         case WM_MOVING:
         case WM_MOVING:

-                       {
-                               LPRECT pRect = (LPRECT)lParam;
-                               wxRect rc;
-                               rc.SetLeft(pRect->left);
-                               rc.SetTop(pRect->top);
-                               rc.SetRight(pRect->right);
-                               rc.SetBottom(pRect->bottom);
-                               processed = HandleMoving(rc);
-                               if (processed) {
-                                       pRect->left = rc.GetLeft();
-                                       pRect->top = rc.GetTop();
-                                       pRect->right = rc.GetRight();
-                                       pRect->bottom = rc.GetBottom();
-                               }
-                       }
+            {
+                LPRECT pRect = (LPRECT)lParam;
+                wxRect rc;
+                rc.SetLeft(pRect->left);
+                rc.SetTop(pRect->top);
+                rc.SetRight(pRect->right);
+                rc.SetBottom(pRect->bottom);
+                processed = HandleMoving(rc);
+                if (processed) {
+                    pRect->left = rc.GetLeft();
+                    pRect->top = rc.GetTop();
+                    pRect->right = rc.GetRight();
+                    pRect->bottom = rc.GetBottom();
+                }
+            }

             break;
             break;

+#endif

 
         case WM_SIZE:
             switch ( wParam )
 
         case WM_SIZE:
             switch ( wParam )


@@ -2215,6 +2281,7 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
             }
             break;
 
             }
             break;
 

+#if !defined(__WXWINCE__)

         case WM_SIZING:
             {
                 LPRECT pRect = (LPRECT)lParam;
         case WM_SIZING:
             {
                 LPRECT pRect = (LPRECT)lParam;


@@ -2232,8 +2299,9 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
                 }
             }
             break;
                 }
             }
             break;

+#endif

 
 

-#ifndef __WXMICROWIN__
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

         case WM_ACTIVATEAPP:
             wxTheApp->SetActive(wParam != 0, FindFocus());
             break;
         case WM_ACTIVATEAPP:
             wxTheApp->SetActive(wParam != 0, FindFocus());
             break;


@@ -2389,11 +2457,9 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
             }
             break;
 
             }
             break;
 

-#ifdef __WIN95__

         case WM_NOTIFY:
             processed = HandleNotify((int)wParam, lParam, &rc.result);
             break;
         case WM_NOTIFY:
             processed = HandleNotify((int)wParam, lParam, &rc.result);
             break;

-#endif  // Win95

 
             // for these messages we must return TRUE if process the message
 #ifdef WM_DRAWITEM
 
             // for these messages we must return TRUE if process the message
 #ifdef WM_DRAWITEM


@@ -2549,6 +2615,12 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
             }
             break;
 
             }
             break;
 

+#if wxUSE_HOTKEY
+        case WM_HOTKEY:
+            processed = HandleHotKey((WORD)wParam, lParam);
+            break;
+#endif // wxUSE_HOTKEY
+

         case WM_HSCROLL:
         case WM_VSCROLL:
             {
         case WM_HSCROLL:
         case WM_VSCROLL:
             {


@@ -2594,9 +2666,11 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
             processed = HandleSysColorChange();
             break;
 
             processed = HandleSysColorChange();
             break;
 

+#if !defined(__WXWINCE__)

         case WM_DISPLAYCHANGE:
             processed = HandleDisplayChange();
             break;
         case WM_DISPLAYCHANGE:
             processed = HandleDisplayChange();
             break;

+#endif

 
         case WM_PALETTECHANGED:
             processed = HandlePaletteChanged((WXHWND) (HWND) wParam);
 
         case WM_PALETTECHANGED:
             processed = HandlePaletteChanged((WXHWND) (HWND) wParam);


@@ -2619,9 +2693,11 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
             }
             break;
 
             }
             break;
 

+#if !defined(__WXWINCE__)

         case WM_DROPFILES:
             processed = HandleDropFiles(wParam);
             break;
         case WM_DROPFILES:
             processed = HandleDropFiles(wParam);
             break;

+#endif

 
         case WM_INITDIALOG:
             processed = HandleInitDialog((WXHWND)(HWND)wParam);
 
         case WM_INITDIALOG:
             processed = HandleInitDialog((WXHWND)(HWND)wParam);


@@ -2633,6 +2709,7 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
             }
             break;
 
             }
             break;
 

+#if !defined(__WXWINCE__)

         case WM_QUERYENDSESSION:
             processed = HandleQueryEndSession(lParam, &rc.allow);
             break;
         case WM_QUERYENDSESSION:
             processed = HandleQueryEndSession(lParam, &rc.allow);
             break;


@@ -2644,6 +2721,7 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
         case WM_GETMINMAXINFO:
             processed = HandleGetMinMaxInfo((MINMAXINFO*)lParam);
             break;
         case WM_GETMINMAXINFO:
             processed = HandleGetMinMaxInfo((MINMAXINFO*)lParam);
             break;

+#endif

 
         case WM_SETCURSOR:
             processed = HandleSetCursor((WXHWND)(HWND)wParam,
 
         case WM_SETCURSOR:
             processed = HandleSetCursor((WXHWND)(HWND)wParam,


@@ -2676,18 +2754,26 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
 #if defined(WM_HELP)
         case WM_HELP:
             {
 #if defined(WM_HELP)
         case WM_HELP:
             {

+                // HELPINFO doesn't seem to be supported on WinCE.
+#ifndef __WXWINCE__

                 HELPINFO* info = (HELPINFO*) lParam;
                 // Don't yet process menu help events, just windows
                 if (info->iContextType == HELPINFO_WINDOW)
                 {
                 HELPINFO* info = (HELPINFO*) lParam;
                 // Don't yet process menu help events, just windows
                 if (info->iContextType == HELPINFO_WINDOW)
                 {

+#endif

                     wxWindowMSW* subjectOfHelp = this;
                     bool eventProcessed = FALSE;
                     while (subjectOfHelp && !eventProcessed)
                     {
                         wxHelpEvent helpEvent(wxEVT_HELP,
                                               subjectOfHelp->GetId(),
                     wxWindowMSW* subjectOfHelp = this;
                     bool eventProcessed = FALSE;
                     while (subjectOfHelp && !eventProcessed)
                     {
                         wxHelpEvent helpEvent(wxEVT_HELP,
                                               subjectOfHelp->GetId(),

-                                              wxPoint(info->MousePos.x,
-                                              info->MousePos.y) );
+#ifdef __WXWINCE__
+                                              wxPoint(0, 0)
+#else
+                                              wxPoint(info->MousePos.x, info->MousePos.y)
+#endif
+                                              );
+

                         helpEvent.SetEventObject(this);
                         eventProcessed =
                             GetEventHandler()->ProcessEvent(helpEvent);
                         helpEvent.SetEventObject(this);
                         eventProcessed =
                             GetEventHandler()->ProcessEvent(helpEvent);


@@ -2698,6 +2784,7 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
                     }
 
                     processed = eventProcessed;
                     }
 
                     processed = eventProcessed;

+#ifndef __WXWINCE__

                 }
                 else if (info->iContextType == HELPINFO_MENUITEM)
                 {
                 }
                 else if (info->iContextType == HELPINFO_MENUITEM)
                 {


@@ -2707,9 +2794,12 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
 
                 }
                 //else: processed is already FALSE
 
                 }
                 //else: processed is already FALSE

+#endif

             }
             break;
             }
             break;

+#endif

 
 

+#if !defined(__WXWINCE__)

         case WM_CONTEXTMENU:
             {
                 // we don't convert from screen to client coordinates as
         case WM_CONTEXTMENU:
             {
                 // we don't convert from screen to client coordinates as


@@ -2720,6 +2810,7 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
                 processed = GetEventHandler()->ProcessEvent(evtCtx);
             }
             break;
                 processed = GetEventHandler()->ProcessEvent(evtCtx);
             }
             break;

+#endif

 
         case WM_MENUCHAR:
             // we're only interested in our own menus, not MF_SYSMENU
 
         case WM_MENUCHAR:
             // we're only interested in our own menus, not MF_SYSMENU


@@ -2734,7 +2825,6 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
                 }
             }
             break;
                 }
             }
             break;

-#endif

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


@@ -2891,18 +2981,37 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass,
     // do create the window
     wxWindowCreationHook hook(this);
 
     // do create the window
     wxWindowCreationHook hook(this);
 

-    m_hWnd = (WXHWND)::CreateWindowEx
-                       (
-                            extendedStyle,
-                            className,
-                            title ? title : wxEmptyString,
-                            style,
-                            x, y, w, h,
-                            (HWND)MSWGetParent(),
-                            (HMENU)controlId,
-                            wxGetInstance(),
-                            NULL                        // no extra data
-                       );
+#ifdef __WXWINCE__
+    if (extendedStyle == 0)
+    {
+        m_hWnd = (WXHWND)::CreateWindow
+            (
+            className,
+            title ? title : wxEmptyString,
+            style,
+            x, y, w, h,
+            (HWND)MSWGetParent(),
+            (HMENU)controlId,
+            wxGetInstance(),
+            NULL                        // no extra data
+            );
+    }
+    else
+#endif
+    {
+        m_hWnd = (WXHWND)::CreateWindowEx
+            (
+            extendedStyle,
+            className,
+            title ? title : wxEmptyString,
+            style,
+            x, y, w, h,
+            (HWND)MSWGetParent(),
+            (HMENU)controlId,
+            wxGetInstance(),
+            NULL                        // no extra data
+            );
+    }

 
     if ( !m_hWnd )
     {
 
     if ( !m_hWnd )
     {


@@ -2949,7 +3058,7 @@ bool wxWindowMSW::HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     //     correct button tooltips
 #if 0
     // try all our children
     //     correct button tooltips
 #if 0
     // try all our children

-    wxWindowList::Node *node = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while ( node )
     {
         wxWindow *child = node->GetData();
     while ( node )
     {
         wxWindow *child = node->GetData();


@@ -2980,12 +3089,13 @@ bool wxWindowMSW::HandleTooltipNotify(WXUINT code,
     // this message is supposed to be sent to Unicode programs only) -- hence
     // we need to handle it as well, otherwise no tooltips will be shown in
     // this case
     // this message is supposed to be sent to Unicode programs only) -- hence
     // we need to handle it as well, otherwise no tooltips will be shown in
     // this case

-
+#ifndef __WXWINCE__

     if ( !(code == (WXUINT) TTN_NEEDTEXTA || code == (WXUINT) TTN_NEEDTEXTW) || ttip.empty() )
     {
         // not a tooltip message or no tooltip to show anyhow
         return FALSE;
     }
     if ( !(code == (WXUINT) TTN_NEEDTEXTA || code == (WXUINT) TTN_NEEDTEXTW) || ttip.empty() )
     {
         // not a tooltip message or no tooltip to show anyhow
         return FALSE;
     }

+#endif

 
     LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
 
 
     LPTOOLTIPTEXT ttText = (LPTOOLTIPTEXT)lParam;
 


@@ -3040,6 +3150,7 @@ bool wxWindowMSW::MSWOnNotify(int WXUNUSED(idCtrl),
 
 bool wxWindowMSW::HandleQueryEndSession(long logOff, bool *mayEnd)
 {
 
 bool wxWindowMSW::HandleQueryEndSession(long logOff, bool *mayEnd)
 {

+#ifndef __WXWINCE__

     wxCloseEvent event(wxEVT_QUERY_END_SESSION, -1);
     event.SetEventObject(wxTheApp);
     event.SetCanVeto(TRUE);
     wxCloseEvent event(wxEVT_QUERY_END_SESSION, -1);
     event.SetEventObject(wxTheApp);
     event.SetCanVeto(TRUE);


@@ -3055,10 +3166,14 @@ bool wxWindowMSW::HandleQueryEndSession(long logOff, bool *mayEnd)
     }
 
     return rc;
     }
 
     return rc;

+#else
+    return FALSE;
+#endif

 }
 
 bool wxWindowMSW::HandleEndSession(bool endSession, long logOff)
 {
 }
 
 bool wxWindowMSW::HandleEndSession(bool endSession, long logOff)
 {

+#ifndef __WXWINCE__

     // do nothing if the session isn't ending
     if ( !endSession )
         return FALSE;
     // do nothing if the session isn't ending
     if ( !endSession )
         return FALSE;


@@ -3073,6 +3188,9 @@ bool wxWindowMSW::HandleEndSession(bool endSession, long logOff)
     event.SetLoggingOff( (logOff == (long)ENDSESSION_LOGOFF) );
 
     return wxTheApp->ProcessEvent(event);
     event.SetLoggingOff( (logOff == (long)ENDSESSION_LOGOFF) );
 
     return wxTheApp->ProcessEvent(event);

+#else
+    return FALSE;
+#endif

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


@@ -3088,6 +3206,7 @@ bool wxWindowMSW::HandleCreate(WXLPCREATESTRUCT cs, bool *mayCreate)
     // all of them iterate over all the controls starting from the focus and
     // stop iterating when they get back to the focus but unless all parents
     // have WS_EX_CONTROLPARENT bit set, they would never get back to focus
     // all of them iterate over all the controls starting from the focus and
     // stop iterating when they get back to the focus but unless all parents
     // have WS_EX_CONTROLPARENT bit set, they would never get back to focus

+#ifndef __WXWINCE__

     if ( ((CREATESTRUCT *)cs)->dwExStyle & WS_EX_CONTROLPARENT )
     {
         // there is no need to do anything for the top level windows
     if ( ((CREATESTRUCT *)cs)->dwExStyle & WS_EX_CONTROLPARENT )
     {
         // there is no need to do anything for the top level windows


@@ -3105,6 +3224,7 @@ bool wxWindowMSW::HandleCreate(WXLPCREATESTRUCT cs, bool *mayCreate)
             parent = parent->GetParent();
         }
     }
             parent = parent->GetParent();
         }
     }

+#endif

 
     // TODO: should generate this event from WM_NCCREATE
     wxWindowCreateEvent event((wxWindow *)this);
 
     // TODO: should generate this event from WM_NCCREATE
     wxWindowCreateEvent event((wxWindow *)this);


@@ -3241,7 +3361,7 @@ bool wxWindowMSW::HandleInitDialog(WXHWND WXUNUSED(hWndFocus))
 
 bool wxWindowMSW::HandleDropFiles(WXWPARAM wParam)
 {
 
 bool wxWindowMSW::HandleDropFiles(WXWPARAM wParam)
 {

-#if defined (__WXMICROWIN__)
+#if defined (__WXMICROWIN__) || defined(__WXWINCE__)

     return FALSE;
 #else // __WXMICROWIN__
     HDROP hFilesInfo = (HDROP) wParam;
     return FALSE;
 #else // __WXMICROWIN__
     HDROP hFilesInfo = (HDROP) wParam;


@@ -3263,9 +3383,7 @@ bool wxWindowMSW::HandleDropFiles(WXWPARAM wParam)
 
         // and now get the file name
         ::DragQueryFile(hFilesInfo, wIndex,
 
         // and now get the file name
         ::DragQueryFile(hFilesInfo, wIndex,

-                        files[wIndex].GetWriteBuf(len), len);
-
-        files[wIndex].UngetWriteBuf();
+                        wxStringBuffer(files[wIndex], len), len);

     }
     DragFinish (hFilesInfo);
 
     }
     DragFinish (hFilesInfo);
 


@@ -3480,7 +3598,11 @@ bool wxWindowMSW::HandleCtlColor(WXHBRUSH *brush,
 #ifndef __WXMICROWIN__
     WXHBRUSH hBrush = 0;
 
 #ifndef __WXMICROWIN__
     WXHBRUSH hBrush = 0;
 

+#ifdef __WXWINCE__
+    if (FALSE)
+#else

     if ( nCtlColor == CTLCOLOR_DLG )
     if ( nCtlColor == CTLCOLOR_DLG )

+#endif

     {
         hBrush = OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
     }
     {
         hBrush = OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
     }


@@ -3606,7 +3728,7 @@ void wxWindowMSW::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
         // FIXME-MT
         gs_hasStdCmap = FALSE;
     }
         // FIXME-MT
         gs_hasStdCmap = FALSE;
     }

-    wxWindowList::Node *node = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while ( node )
     {
         // Only propagate to non-top-level windows because Windows already
     while ( node )
     {
         // Only propagate to non-top-level windows because Windows already


@@ -3811,11 +3933,16 @@ void wxWindowMSW::OnEraseBackground(wxEraseEvent& event)
 
     HDC hdc = (HDC)event.GetDC()->GetHDC();
 
 
     HDC hdc = (HDC)event.GetDC()->GetHDC();
 

+#ifndef __WXWINCE__

     int mode = ::SetMapMode(hdc, MM_TEXT);
     int mode = ::SetMapMode(hdc, MM_TEXT);

+#endif

 
     ::FillRect(hdc, &rect, hBrush);
     ::DeleteObject(hBrush);
 
     ::FillRect(hdc, &rect, hBrush);
     ::DeleteObject(hBrush);

+
+#ifndef __WXWINCE__

     ::SetMapMode(hdc, mode);
     ::SetMapMode(hdc, mode);

+#endif

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


@@ -3882,6 +4009,9 @@ bool wxWindowMSW::HandleSizing(wxRect& rect)
 
 bool wxWindowMSW::HandleGetMinMaxInfo(void *mmInfo)
 {
 
 bool wxWindowMSW::HandleGetMinMaxInfo(void *mmInfo)
 {

+#ifdef __WXWINCE__
+    return FALSE;
+#else

     MINMAXINFO *info = (MINMAXINFO *)mmInfo;
 
     bool rc = FALSE;
     MINMAXINFO *info = (MINMAXINFO *)mmInfo;
 
     bool rc = FALSE;


@@ -3916,6 +4046,7 @@ bool wxWindowMSW::HandleGetMinMaxInfo(void *mmInfo)
     }
 
     return rc;
     }
 
     return rc;

+#endif

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


@@ -3988,6 +4119,7 @@ bool wxWindowMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
 
 bool wxWindowMSW::HandleSysCommand(WXWPARAM wParam, WXLPARAM WXUNUSED(lParam))
 {
 
 bool wxWindowMSW::HandleSysCommand(WXWPARAM wParam, WXLPARAM WXUNUSED(lParam))
 {

+#ifndef __WXWINCE__

     // 4 bits are reserved
     switch ( wParam & 0xFFFFFFF0 )
     {
     // 4 bits are reserved
     switch ( wParam & 0xFFFFFFF0 )
     {


@@ -3997,6 +4129,7 @@ bool wxWindowMSW::HandleSysCommand(WXWPARAM wParam, WXLPARAM WXUNUSED(lParam))
         case SC_MINIMIZE:
             return HandleMinimize();
     }
         case SC_MINIMIZE:
             return HandleMinimize();
     }

+#endif

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -4055,6 +4188,13 @@ static wxWindowMSW *FindWindowForMouseEvent(wxWindowMSW *win, int *x, int *y) //
     HWND hwnd = GetHwndOf(win),
          hwndUnderMouse;
 
     HWND hwnd = GetHwndOf(win),
          hwndUnderMouse;
 

+#ifdef __WXWINCE__
+    hwndUnderMouse = ::ChildWindowFromPoint
+                       (
+                        hwnd,
+                        pt
+                       );
+#else

     hwndUnderMouse = ::ChildWindowFromPointEx
                        (
                         hwnd,
     hwndUnderMouse = ::ChildWindowFromPointEx
                        (
                         hwnd,


@@ -4063,6 +4203,7 @@ static wxWindowMSW *FindWindowForMouseEvent(wxWindowMSW *win, int *x, int *y) //
                         CWP_SKIPDISABLED    |
                         CWP_SKIPTRANSPARENT
                        );
                         CWP_SKIPDISABLED    |
                         CWP_SKIPTRANSPARENT
                        );

+#endif

 
     if ( !hwndUnderMouse || hwndUnderMouse == hwnd )
     {
 
     if ( !hwndUnderMouse || hwndUnderMouse == hwnd )
     {


@@ -4338,6 +4479,9 @@ bool wxWindowMSW::HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam)
 
 int wxWindowMSW::HandleMenuChar(int chAccel, WXLPARAM lParam)
 {
 
 int wxWindowMSW::HandleMenuChar(int chAccel, WXLPARAM lParam)
 {

+    // FIXME: implement GetMenuItemCount for WinCE, possibly
+    // in terms of GetMenuItemInfo
+#ifndef __WXWINCE__

     const HMENU hmenu = (HMENU)lParam;
 
     MENUITEMINFO mii;
     const HMENU hmenu = (HMENU)lParam;
 
     MENUITEMINFO mii;


@@ -4391,7 +4535,7 @@ int wxWindowMSW::HandleMenuChar(int chAccel, WXLPARAM lParam)
             wxLogLastError(_T("GetMenuItemInfo"));
         }
     }
             wxLogLastError(_T("GetMenuItemInfo"));
         }
     }

-
+#endif

     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 


@@ -4843,7 +4987,7 @@ extern wxWindow *wxGetWindowFromHWND(WXHWND hWnd)
     return win;
 }
 
     return win;
 }
 

-#ifndef __WXMICROWIN__
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

 
 // Windows keyboard hook. Allows interception of e.g. F1, ESCAPE
 // in active frames and dialogs, regardless of where the focus is.
 
 // Windows keyboard hook. Allows interception of e.g. F1, ESCAPE
 // in active frames and dialogs, regardless of where the focus is.


@@ -5093,6 +5237,9 @@ const char *wxGetMessageName(int message)
         case 0x030F: return "WM_QUERYNEWPALETTE";
         case 0x0310: return "WM_PALETTEISCHANGING";
         case 0x0311: return "WM_PALETTECHANGED";
         case 0x030F: return "WM_QUERYNEWPALETTE";
         case 0x0310: return "WM_PALETTEISCHANGING";
         case 0x0311: return "WM_PALETTECHANGED";

+#if wxUSE_HOTKEY
+        case 0x0312: return "WM_HOTKEY";
+#endif

 
         // common controls messages - although they're not strictly speaking
         // standard, it's nice to decode them nevertheless
 
         // common controls messages - although they're not strictly speaking
         // standard, it's nice to decode them nevertheless


@@ -5411,3 +5558,57 @@ wxPoint wxGetMousePosition()
     return wxPoint(pt.x, pt.y);
 }
 
     return wxPoint(pt.x, pt.y);
 }
 

+#if wxUSE_HOTKEY
+
+bool wxWindowMSW::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
+{
+    UINT win_modifiers=0;
+    if ( modifiers & wxMOD_ALT )
+        win_modifiers |= MOD_ALT;
+    if ( modifiers & wxMOD_SHIFT )
+        win_modifiers |= MOD_SHIFT;
+    if ( modifiers & wxMOD_CONTROL )
+        win_modifiers |= MOD_CONTROL;
+    if ( modifiers & wxMOD_WIN )
+        win_modifiers |= MOD_WIN;
+
+    if ( !::RegisterHotKey(GetHwnd(), hotkeyId, win_modifiers, keycode) )
+    {
+        wxLogLastError(_T("RegisterHotKey"));
+
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+bool wxWindowMSW::UnregisterHotKey(int hotkeyId)
+{
+    if ( !::UnregisterHotKey(GetHwnd(), hotkeyId) )
+    {
+        wxLogLastError(_T("UnregisterHotKey"));
+
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam)
+{
+    int hotkeyId = wParam;
+    int virtualKey = HIWORD(lParam);
+    int win_modifiers = LOWORD(lParam);
+
+    wxKeyEvent event(CreateKeyEvent(wxEVT_HOTKEY, virtualKey, wParam, lParam));
+    event.SetId(hotkeyId);
+    event.m_shiftDown = (win_modifiers & MOD_SHIFT) != 0;
+    event.m_controlDown = (win_modifiers & MOD_CONTROL) != 0;
+    event.m_altDown = (win_modifiers & MOD_ALT) != 0;
+    event.m_metaDown = (win_modifiers & MOD_WIN) != 0;
+
+    return GetEventHandler()->ProcessEvent(event);
+}
+
+#endif // wxUSE_HOTKEY
+