#include <string.h>
-#if !defined(__GNUWIN32__)|| defined(wxUSE_NORLANDER_HEADERS)
+#ifndef __GNUWIN32_OLD__
#include <shellapi.h>
#include <mmsystem.h>
#endif
#include <windowsx.h>
#endif
-#if ( defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__ ) || defined(wxUSE_NORLANDER_HEADERS)
- #include <commctrl.h>
-#endif
-
-#ifndef __TWIN32__
- #ifdef __GNUWIN32__
- #ifndef wxUSE_NORLANDER_HEADERS
- #include "wx/msw/gnuwin32/extra.h"
- #endif
+#if !defined(__GNUWIN32_OLD__) && !defined(__TWIN32__)
+ #ifdef __WIN95__
+ #include <commctrl.h>
+ #endif
+#else // broken compiler
+ #ifndef __TWIN32__
+ #include "wx/msw/gnuwin32/extra.h"
#endif
#endif
if ( m_hWnd )
{
- if (::IsWindow(GetHwnd()))
+ // VZ: test temp removed to understand what really happens here
+ //if (::IsWindow(GetHwnd()))
{
if ( !::DestroyWindow(GetHwnd()) )
wxLogLastError("DestroyWindow");
::GetWindowRect(hWnd, &rect);
if ( ::PtInRect(&rect, point) && !wxIsBusy() )
- ::SetCursor((HCURSOR)m_cursor.GetHCURSOR());
+ ::SetCursor(GetHcursorOf(m_cursor));
return TRUE;
}
// by the time the OnIdle function is called, so 'state' may be
// meaningless.
int state = 0;
- if ( ::GetKeyState(VK_SHIFT) != 0 )
+ if ( wxIsShiftDown() )
state |= MK_SHIFT;
- if ( ::GetKeyState(VK_CONTROL) != 0 )
+ if ( wxIsCtrlDown() )
state |= MK_CONTROL;
wxMouseEvent event(wxEVT_LEAVE_WINDOW);
if ( bProcess )
{
- bool bCtrlDown = (::GetKeyState(VK_CONTROL) & 0x100) != 0;
- bool bShiftDown = (::GetKeyState(VK_SHIFT) & 0x100) != 0;
+ bool bCtrlDown = wxIsCtrlDown();
+ bool bShiftDown = wxIsShiftDown();
// WM_GETDLGCODE: ask the control if it wants the key for itself,
// don't process it if it's the case (except for Ctrl-Tab/Enter
// don't process system keys here
if ( !(HIWORD(msg->lParam) & KF_ALTDOWN) )
{
- if ( (msg->wParam == VK_TAB) &&
- (::GetKeyState(VK_CONTROL) & 0x100) != 0 )
+ if ( (msg->wParam == VK_TAB) && wxIsCtrlDown() )
{
// find the first notebook parent and change its page
wxWindow *win = this;
if ( nbook )
{
- bool forward = !(::GetKeyState(VK_SHIFT) & 0x100);
+ bool forward = !wxIsShiftDown();
nbook->AdvanceSelection(forward);
}
short nHitTest,
int WXUNUSED(mouseMsg))
{
- // don't set cursor for other windows, only for this one: this prevents
- // children of this window from getting the same cursor as the parent has
- // (don't forget that this message is propagated by default up the window
- // parent-child hierarchy)
- if ( GetHWND() == hWnd )
- {
- // don't set cursor when the mouse is not in the client part
- if ( nHitTest == HTCLIENT || nHitTest == HTERROR )
- {
- HCURSOR hcursor = 0;
- if ( wxIsBusy() )
- {
- // from msw\utils.cpp
- extern HCURSOR gs_wxBusyCursor;
-
- hcursor = gs_wxBusyCursor;
- }
- else
- {
- wxCursor *cursor = NULL;
+ // the logic is as follows:
+ // 1. if we have the cursor set it unless wxIsBusy()
+ // 2. if we're a top level window, set some cursor anyhow
+ // 3. if wxIsBusy(), set the busy cursor, otherwise the global one
- if ( m_cursor.Ok() )
- {
- cursor = &m_cursor;
- }
- else
- {
- // from msw\data.cpp
- extern wxCursor *g_globalCursor;
-
- if ( g_globalCursor && g_globalCursor->Ok() )
- cursor = g_globalCursor;
- }
-
- if ( cursor )
- hcursor = (HCURSOR)cursor->GetHCURSOR();
- }
+ HCURSOR hcursor = 0;
+ bool isBusy = wxIsBusy();
+ if ( m_cursor.Ok() )
+ {
+ hcursor = GetHcursorOf(m_cursor);
+ }
- if ( hcursor )
+ if ( !GetParent() )
+ {
+ if ( isBusy )
+ {
+ hcursor = wxGetCurrentBusyCursor();
+ }
+ else if ( !hcursor )
+ {
+ const wxCursor *cursor = wxGetGlobalCursor();
+ if ( cursor && cursor->Ok() )
{
- ::SetCursor(hcursor);
-
- return TRUE;
+ hcursor = GetHcursorOf(*cursor);
}
}
}
- return FALSE;
+ if ( hcursor )
+ {
+ ::SetCursor(hcursor);
+
+ // cursor set, stop here
+ return TRUE;
+ }
+ else
+ {
+ // pass up the window chain
+ return FALSE;
+ }
}
// ---------------------------------------------------------------------------
return popupMenu->MSWCommand(cmd, id);
}
- wxWindow *win;
+ wxWindow *win = (wxWindow*) NULL;
if ( cmd == 0 || cmd == 1 ) // menu or accel - use id
{
// must cast to a signed type before comparing with other ids!
win = FindItem((signed short)id);
}
- else
+
+ if (!win && control)
{
// find it from HWND - this works even with the broken programs using
// the same ids for different controls
}
if ( win )
+ {
return win->MSWCommand(cmd, id);
- else
+ }
+
+ // the messages sent from the in-place edit control used by the treectrl
+ // for label editing have id == 0, but they should _not_ be treated as menu
+ // messages (they are EN_XXX ones, in fact) so don't translate anything
+ // coming from a control to wxEVT_COMMAND_MENU_SELECTED
+ if ( !control )
{
- // If no child window, it may be an accelerator, e.g. for
- // a popup menu command.
+ // If no child window, it may be an accelerator, e.g. for a popup menu
+ // command
wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED);
event.SetEventObject(this);
event.SetId(id);
event.SetInt(id);
- return ProcessEvent(event);
+
+ return GetEventHandler()->ProcessEvent(event);
}
return FALSE;
// keyboard handling
// ---------------------------------------------------------------------------
+// create the key event of the given type for the given key - used by
+// HandleChar and HandleKeyDown/Up
+wxKeyEvent wxWindow::CreateKeyEvent(wxEventType evType,
+ int id,
+ WXLPARAM lParam) const
+{
+ wxKeyEvent event(evType);
+ event.SetId(GetId());
+ event.m_shiftDown = wxIsShiftDown();
+ event.m_controlDown = wxIsCtrlDown();
+ event.m_altDown = (HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN;
+
+ event.m_eventObject = (wxWindow *)this; // const_cast
+ event.m_keyCode = id;
+ event.SetTimestamp(s_currentMsg.time);
+
+ // translate the position to client coords
+ POINT pt;
+ GetCursorPos(&pt);
+ RECT rect;
+ GetWindowRect(GetHwnd(),&rect);
+ pt.x -= rect.left;
+ pt.y -= rect.top;
+
+ event.m_x = pt.x;
+ event.m_y = pt.y;
+
+ return event;
+}
+
// isASCII is TRUE only when we're called from WM_CHAR handler and not from
// WM_KEYDOWN one
bool wxWindow::HandleChar(WXWORD wParam, WXLPARAM lParam, bool isASCII)
{
+ bool ctrlDown = FALSE;
+
int id;
- bool tempControlDown = FALSE;
if ( isASCII )
{
// If 1 -> 26, translate to CTRL plus a letter.
{
switch (id)
{
- case 13:
- {
+ case 13:
id = WXK_RETURN;
break;
- }
- case 8:
- {
+
+ case 8:
id = WXK_BACK;
break;
- }
- case 9:
- {
+
+ case 9:
id = WXK_TAB;
break;
- }
- default:
- {
- tempControlDown = TRUE;
+
+ default:
+ ctrlDown = TRUE;
id = id + 96;
- }
}
}
}
- else if ( (id = wxCharCodeMSWToWX(wParam)) == 0 ) {
+ else if ( (id = wxCharCodeMSWToWX(wParam)) == 0 )
+ {
// it's ASCII and will be processed here only when called from
- // WM_CHAR (i.e. when isASCII = TRUE)
+ // WM_CHAR (i.e. when isASCII = TRUE), don't process it now
id = -1;
}
if ( id != -1 )
{
- wxKeyEvent event(wxEVT_CHAR);
- event.m_shiftDown = (::GetKeyState(VK_SHIFT)&0x100?TRUE:FALSE);
- event.m_controlDown = (::GetKeyState(VK_CONTROL)&0x100?TRUE:FALSE);
- if ( (HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN )
- event.m_altDown = TRUE;
-
- event.m_eventObject = this;
- event.m_keyCode = id;
- event.SetTimestamp(s_currentMsg.time);
-
- POINT pt;
- GetCursorPos(&pt);
- RECT rect;
- GetWindowRect(GetHwnd(),&rect);
- pt.x -= rect.left;
- pt.y -= rect.top;
-
- event.m_x = pt.x; event.m_y = pt.y;
+ wxKeyEvent event(CreateKeyEvent(wxEVT_CHAR, id, lParam));
+ if ( ctrlDown )
+ {
+ event.m_controlDown = TRUE;
+ }
if ( GetEventHandler()->ProcessEvent(event) )
return TRUE;
- else
- return FALSE;
}
- else
- return FALSE;
+
+ return FALSE;
}
bool wxWindow::HandleKeyDown(WXWORD wParam, WXLPARAM lParam)
{
- int id;
+ int id = wxCharCodeMSWToWX(wParam);
- if ( (id = wxCharCodeMSWToWX(wParam)) == 0 ) {
+ if ( !id )
+ {
+ // normal ASCII char
id = wParam;
}
- if ( id != -1 )
+ if ( id != -1 ) // VZ: does this ever happen (FIXME)?
{
- wxKeyEvent event(wxEVT_KEY_DOWN);
- event.m_shiftDown = (::GetKeyState(VK_SHIFT)&0x100?TRUE:FALSE);
- event.m_controlDown = (::GetKeyState(VK_CONTROL)&0x100?TRUE:FALSE);
- if ( (HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN )
- event.m_altDown = TRUE;
-
- event.m_eventObject = this;
- event.m_keyCode = id;
- event.SetTimestamp(s_currentMsg.time);
-
- POINT pt;
- GetCursorPos(&pt);
- RECT rect;
- GetWindowRect(GetHwnd(),&rect);
- pt.x -= rect.left;
- pt.y -= rect.top;
-
- event.m_x = pt.x; event.m_y = pt.y;
-
+ wxKeyEvent event(CreateKeyEvent(wxEVT_KEY_DOWN, id, lParam));
if ( GetEventHandler()->ProcessEvent(event) )
{
return TRUE;
}
- else return FALSE;
- }
- else
- {
- return FALSE;
}
+
+ return FALSE;
}
bool wxWindow::HandleKeyUp(WXWORD wParam, WXLPARAM lParam)
{
- int id;
+ int id = wxCharCodeMSWToWX(wParam);
- if ( (id = wxCharCodeMSWToWX(wParam)) == 0 ) {
+ if ( !id )
+ {
+ // normal ASCII char
id = wParam;
}
- if ( id != -1 )
+ if ( id != -1 ) // VZ: does this ever happen (FIXME)?
{
- wxKeyEvent event(wxEVT_KEY_UP);
- event.m_shiftDown = (::GetKeyState(VK_SHIFT)&0x100?TRUE:FALSE);
- event.m_controlDown = (::GetKeyState(VK_CONTROL)&0x100?TRUE:FALSE);
- if ( (HIWORD(lParam) & KF_ALTDOWN) == KF_ALTDOWN )
- event.m_altDown = TRUE;
-
- event.m_eventObject = this;
- event.m_keyCode = id;
- event.SetTimestamp(s_currentMsg.time);
-
- POINT pt;
- GetCursorPos(&pt);
- RECT rect;
- GetWindowRect(GetHwnd(),&rect);
- pt.x -= rect.left;
- pt.y -= rect.top;
-
- event.m_x = pt.x; event.m_y = pt.y;
-
+ wxKeyEvent event(CreateKeyEvent(wxEVT_KEY_UP, id, lParam));
if ( GetEventHandler()->ProcessEvent(event) )
return TRUE;
- else
- return FALSE;
}
- else
- return FALSE;
+
+ return FALSE;
}
// ---------------------------------------------------------------------------
UnhookWindowsHookEx(wxTheKeyboardHook);
// avoids mingw warning about statement with no effect (FreeProcInstance
// doesn't do anything under Win32)
-#ifndef __GNUWIN32__
+#ifndef __GNUC__
FreeProcInstance(wxTheKeyboardHookProc);
#endif
}
event.m_eventObject = NULL;
event.m_keyCode = id;
- event.m_shiftDown = ::GetKeyState(VK_SHIFT) & 0x100 != 0;
- event.m_controlDown = ::GetKeyState(VK_CONTROL) & 0x100 != 0;
+ event.m_shiftDown = wxIsShiftDown();
+ event.m_controlDown = wxIsCtrlDown();
event.SetTimestamp(s_currentMsg.time);
wxWindow *win = wxGetActiveWindow();
WPARAM& fwKeys = *flags;
fwKeys = MK_RBUTTON;
- if ( (::GetKeyState(VK_CONTROL) & 0x100) != 0 )
+ if ( wxIsCtrlDown() )
fwKeys |= MK_CONTROL;
- if ( (::GetKeyState(VK_SHIFT) & 0x100) != 0 )
+ if ( wxIsShiftDown() )
fwKeys |= MK_SHIFT;
// simulate right mouse button click
projects / wxWidgets.git / blobdiff