X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66b9ec3dab76aedfb19582dc82d793b65054e2ac..5eba4394790ca9b4da50d7a9ea369d3f623f0af1:/src/msw/window.cpp?ds=sidebyside diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 6ca8054528..f09ad40549 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -53,6 +53,8 @@ #include "wx/ownerdrw.h" #endif +#include "wx/module.h" + #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" #endif @@ -303,14 +305,14 @@ wxBEGIN_FLAGS( wxWindowStyle ) wxFLAGS_MEMBER(wxDOUBLE_BORDER) wxFLAGS_MEMBER(wxRAISED_BORDER) wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxNO_BORDER) + wxFLAGS_MEMBER(wxBORDER) // standard window styles wxFLAGS_MEMBER(wxTAB_TRAVERSAL) wxFLAGS_MEMBER(wxCLIP_CHILDREN) wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxNO_FULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) wxFLAGS_MEMBER(wxVSCROLL) wxFLAGS_MEMBER(wxHSCROLL) @@ -378,6 +380,22 @@ END_EVENT_TABLE() // implementation // =========================================================================== +wxWindowMSW::wxWindowMSW() +{ + Init(); +} + +wxWindowMSW::wxWindowMSW(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) +{ + Init(); + Create(parent, id, pos, size, style, name); +} + // --------------------------------------------------------------------------- // wxWindow utility functions // --------------------------------------------------------------------------- @@ -462,9 +480,6 @@ bool wxWindowMSW::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id)) void wxWindowMSW::Init() { - // generic - InitBase(); - // MSW specific m_isBeingDeleted = FALSE; m_oldWndProc = NULL; @@ -2401,6 +2416,62 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam wParam); break; + // Seems to be broken currently +#if 0 // ndef __WXWINCE__ + case WM_MOUSELEAVE: + { + wxASSERT_MSG( !m_mouseInWindow, wxT("the mouse should be in a window to generate this event!") ); + + // only process this message if the mouse is not in the window, + // This can also check for children in composite windows. + // however, this may mean the the wxEVT_LEAVE_WINDOW is never sent + // if the mouse does not enter the window from it's child before + // leaving the scope of the window. ( perhaps this can be picked + // up in the OnIdle code as before, for this special case ) + if ( /*IsComposite() && */ !IsMouseInWindow() ) + { + m_mouseInWindow = FALSE; + + // Unfortunately no mouse state is passed with a WM_MOUSE_LEAVE + int state = 0; + if ( wxIsShiftDown() ) + state |= MK_SHIFT; + if ( wxIsCtrlDown() ) + state |= MK_CONTROL; + if ( GetKeyState( VK_LBUTTON ) ) + state |= MK_LBUTTON; + if ( GetKeyState( VK_MBUTTON ) ) + state |= MK_MBUTTON; + if ( GetKeyState( VK_RBUTTON ) ) + state |= MK_RBUTTON; + + POINT pt; + if ( !::GetCursorPos(&pt) ) + { + wxLogLastError(_T("GetCursorPos")); + } + + // we need to have client coordinates here for symmetry with + // wxEVT_ENTER_WINDOW + RECT rect = wxGetWindowRect(GetHwnd()); + pt.x -= rect.left; + pt.y -= rect.top; + + wxMouseEvent event2(wxEVT_LEAVE_WINDOW); + InitMouseEvent(event2, pt.x, pt.y, state); + + (void)GetEventHandler()->ProcessEvent(event2); + } + // always pass processed back as false, this allows the window + // manager to process the message too. This is needed to ensure + // windows XP themes work properly as the mouse moves over widgets + // like buttons. + processed = false; + } + break; +#endif + // __WXWINCE__ + #if wxUSE_MOUSEWHEEL case WM_MOUSEWHEEL: processed = HandleMouseWheel(wParam, lParam); @@ -2854,6 +2925,7 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam wxPoint pt(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU, GetId(), pt); + evtCtx.SetEventObject(this); processed = GetEventHandler()->ProcessEvent(evtCtx); } break; @@ -2993,6 +3065,8 @@ bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos, nonDefault = TRUE; } + AdjustForParentClientOrigin(x, y); + return nonDefault; } @@ -3020,7 +3094,7 @@ bool wxWindowMSW::MSWCreate(const wxChar *wclass, // which is the same but without CS_[HV]REDRAW class styles so using it // ensures that the window is not fully repainted on each resize wxString className(wclass); - if ( GetWindowStyleFlag() & wxNO_FULL_REPAINT_ON_RESIZE ) + if ( !HasFlag(wxFULL_REPAINT_ON_RESIZE) ) { className += wxT("NR"); } @@ -4340,6 +4414,18 @@ bool wxWindowMSW::HandleMouseMove(int x, int y, WXUINT flags) // Generate an ENTER event m_mouseInWindow = TRUE; +#ifndef __WXWINCE__ + TRACKMOUSEEVENT trackinfo; + + trackinfo.cbSize = sizeof(trackinfo); + trackinfo.dwFlags = TME_LEAVE; + trackinfo.hwndTrack = GetHwnd(); + //Use the commctrl.h _TrackMouseEvent, which will call the + // appropriate TrackMouseEvent or emulate it ( win95 ) + // else we need _WIN32_WINNT >= 0x0400 + _TrackMouseEvent(&trackinfo); +#endif + wxMouseEvent event(wxEVT_ENTER_WINDOW); InitMouseEvent(event, x, y, flags); @@ -4913,7 +4999,7 @@ int wxCharCodeMSWToWX(int keySym) int wxCharCodeWXToMSW(int id, bool *isVirtual) { *isVirtual = TRUE; - int keySym = 0; + int keySym; switch (id) { case WXK_CANCEL: keySym = VK_CANCEL; break; @@ -4987,6 +5073,18 @@ int wxCharCodeWXToMSW(int id, bool *isVirtual) return keySym; } +bool wxGetKeyState(wxKeyCode key) +{ + bool bVirtual; + int vkey = wxCharCodeWXToMSW(key, &bVirtual); + + //there aren't WXK_ macros for non-virtual key codes + if (bVirtual == false) + return false; + + return GetKeyState(vkey) < 0; +} + wxWindow *wxGetActiveWindow() { HWND hWnd = GetActiveWindow(); @@ -5683,3 +5781,54 @@ bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam) #endif // wxUSE_HOTKEY +// Not verified for WinCE +#ifndef __WXWINCE__ +/* + * wxEventFixModule (needs a better name) allows message handling to continute while a menu + * is being shown - ie, to continue processing messages from a worker thread. + * + * Code originally by Jason W. from wx-dev, reworked into a wxModule by Chris Mellon + */ + +class wxEventFixModule : public wxModule { +public: + //base class virtuals + virtual bool OnInit() { + wxEventFixModule::s_hMsgHookProc = SetWindowsHookEx( + WH_GETMESSAGE, + &wxEventFixModule::MsgHookProc, + NULL, + GetCurrentThreadId()); + wxLogDebug(_T("Loaded event fix module")); + return true; + }; + virtual void OnExit() { + UnhookWindowsHookEx(wxEventFixModule::s_hMsgHookProc); + + }; + static LRESULT CALLBACK MsgHookProc(int nCode, WPARAM wParam, LPARAM lParam) { + MSG *msg = (MSG*)lParam; + switch (msg->message) + { + case WM_NULL: + static bool bInHookProc = false; + if (!bInHookProc) + { + bInHookProc = true; + wxTheApp->ProcessPendingEvents(); + bInHookProc = false; + } + break; + } + return CallNextHookEx(wxEventFixModule::s_hMsgHookProc, nCode, wParam, lParam); + }; +private: + static HHOOK s_hMsgHookProc; +DECLARE_DYNAMIC_CLASS(wxEventFixModule) +}; +HHOOK wxEventFixModule::s_hMsgHookProc = 0; + +IMPLEMENT_DYNAMIC_CLASS(wxEventFixModule, wxModule) +#endif + // __WXWINCE__ +