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 e00e9a84a5772c0ecdef5d205e692e747b07c8e7..9fb3b8de4361269d8a13da75bd987d55206598fe 100644 (file)
--- 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}
 
 
 \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
 
 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 1cc4f72a8e6c07b15e270b2e81487cb13b9a83eb..14ed37d23f00e72bc8f6ccb75579ed8d87034a1a 100644 (file)
--- 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.
 // 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
 
 
 // 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 082a1c35ed12239bbad6873810264c7ca28f4ef6..13f815ae18a027980c5427c9fd4766cae32b7bd7 100644 (file)
--- 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
 {
 #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 1623ec6defea138624ab63910a73f3fda132a067..b69f1a295c1aa75b7c4cafdc092a32633f7fdb76 100644 (file)
--- 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__
 {
 #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; 
    return !!(GetCurrentKeyModifiers() & wxKeyCodeToMacModifier(key)); 
 #else
        KeyMap keymap; 

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 97390aeb6c9a26c0d0d2a96194676520a498db03..bb0520b14ba011c3ce3d729fc6e9ad226475b8e8 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -5138,7 +5138,7 @@ int wxCharCodeWXToMSW(int id, bool *isVirtual)
     return keySym;
 }
 
     return keySym;
 }
 

-bool wxGetKeyState(wxKeyCode key)
+bool wxGetKeyState(const wxKeyCode& key)

 {
     bool bVirtual;
     int vkey = wxCharCodeWXToMSW(key, &bVirtual);
 {
     bool bVirtual;
     int vkey = wxCharCodeWXToMSW(key, &bVirtual);

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 8d400126c660603c0a30818813df572f6cd44387..9df6307cc3fc530faf9d7b559f28dcc8a594cf59 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -762,7 +762,7 @@ KeySym wxCharCodeWXToX(int id)
 
 #include <wx/app.h>
 
 
 #include <wx/app.h>
 

-bool wxGetKeyState(wxKeyCode key)
+bool wxGetKeyState(const wxKeyCode& key)

 {
 #if defined(__WXX11__)
     Display *pDisplay = (Display*) wxApp::GetDisplay();
 {
 #if defined(__WXX11__)
     Display *pDisplay = (Display*) wxApp::GetDisplay();