From: Ryan Norton Date: Mon, 27 Sep 2004 07:45:15 +0000 (+0000) Subject: pass by reference, not value X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6be23c2a23c96edf62acfe8ab1ff43efa8870253?ds=inline pass by reference, not value git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex index e00e9a84a5..9fb3b8de43 100644 --- a/docs/latex/wx/function.tex +++ b/docs/latex/wx/function.tex @@ -2601,7 +2601,7 @@ this language feature but still take advantage of it when it is available. \membersection{::wxGetKeyState}\label{wxgetkeystate} -\func{bool}{wxGetKeyState}{\param{wxKeyCode }{key}} +\func{bool}{wxGetKeyState}{\param{const wxKeyCode\& }{key}} Returns \true if the key parameter is currently pressed on the keyboard, or with modifier keys, (caps lock, etc) if the key is active (the led light is diff --git a/include/wx/utils.h b/include/wx/utils.h index 1cc4f72a8e..14ed37d23f 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -101,7 +101,7 @@ WXDLLIMPEXP_BASE wxString wxGetDataDir(); // Get the state of a key (true if pressed, false if not) // This is generally most useful getting the state of // the modifier or toggle keys. -WXDLLEXPORT bool wxGetKeyState(wxKeyCode key); +WXDLLEXPORT bool wxGetKeyState(const wxKeyCode& key); // Don't synthesize KeyUp events holding down a key and producing diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index 082a1c35ed..13f815ae18 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -1177,7 +1177,7 @@ int wxMacKeyCodeToModifier(wxKeyCode key) } } -bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below +bool wxGetKeyState(const wxKeyCode& key) //virtual key code if < 10.2.x, else see below { #ifdef __DARWIN__ // Startup HID keyboard for getting key codes on DARWIN diff --git a/src/mac/classic/app.cpp b/src/mac/classic/app.cpp index 1623ec6def..b69f1a295c 100644 --- a/src/mac/classic/app.cpp +++ b/src/mac/classic/app.cpp @@ -1851,17 +1851,10 @@ int wxKeyCodeToMacModifier(wxKeyCode key) } } -bool wxGetKeyState(wxKeyCode key) //virtual key code if < 10.2.x, else see below +bool wxGetKeyState(const wxKeyCode& key) //virtual key code if < 10.2.x, else see below { #if __WXMAC_CARBON__ -//#ifdef __DARWIN__ -// wxHIDKeyboard keyboard; -// return keyboard.IsActive(key); -//#else -// TODO: Have it use HID Manager on OSX... -//if OS X > 10.2 (i.e. 10.2.x) -//a known apple bug prevents the system from determining led -//states with GetKeys... can only determine caps lock led +//TODO: Low get map... return !!(GetCurrentKeyModifiers() & wxKeyCodeToMacModifier(key)); #else KeyMap keymap; diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 97390aeb6c..bb0520b14b 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -5138,7 +5138,7 @@ int wxCharCodeWXToMSW(int id, bool *isVirtual) return keySym; } -bool wxGetKeyState(wxKeyCode key) +bool wxGetKeyState(const wxKeyCode& key) { bool bVirtual; int vkey = wxCharCodeWXToMSW(key, &bVirtual); diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp index 8d400126c6..9df6307cc3 100644 --- a/src/unix/utilsx11.cpp +++ b/src/unix/utilsx11.cpp @@ -762,7 +762,7 @@ KeySym wxCharCodeWXToX(int id) #include -bool wxGetKeyState(wxKeyCode key) +bool wxGetKeyState(const wxKeyCode& key) { #if defined(__WXX11__) Display *pDisplay = (Display*) wxApp::GetDisplay();