commit fd606bc303bdf1fafefc4a6b79d050faa26d0800
author Jeff Brown <jeffbrown@google.com> Tue Jul 13 16:14:54 2010 -0700
committer Jeff Brown <jeffbrown@google.com> Tue Jul 13 16:47:02 2010 -0700
tree 72397fd006d566a4116adff3c69d2877f603140b
parent 5ef6b2f2568944e9dedf31c83716b8dd94dd506a

Migrate to new keycode constants in keycodes.h.

Change-Id: I775efb0f73b418db5bf65c218949b164f8e65647

simulator/app/PhoneWindow.h

diff --git a/simulator/app/PhoneWindow.h b/simulator/app/PhoneWindow.h
index 5eb1800..a346e9c 100644
--- a/simulator/app/PhoneWindow.h
+++ b/simulator/app/PhoneWindow.h
@@ -89,7 +89,7 @@
      */
     class KeyInfo {
     public:
-        KeyInfo(void) : mKeyCode(kKeyCodeUnknown) {}
+        KeyInfo(void) : mKeyCode(AKEYCODE_UNKNOWN) {}
         KeyInfo(const KeyInfo& src) {
             mKeyCode = src.mKeyCode;
         }
@@ -102,14 +102,14 @@
             return *this;
         }
 
-        KeyCode GetKeyCode(void) const { return mKeyCode; }
-        void SetKeyCode(KeyCode keyCode) { mKeyCode = keyCode; }
+        int32_t GetKeyCode(void) const { return mKeyCode; }
+        void SetKeyCode(int32_t keyCode) { mKeyCode = keyCode; }
 
         //PhoneButton* GetPhoneButton(void) const { return mpButton; }
         //void SetPhoneButton(PhoneButton* pButton) { mpButton = pButton; }
 
     private:
-        KeyCode    mKeyCode;
+        int32_t mKeyCode;
         //PhoneButton*        mpButton;
     };
 
@@ -135,13 +135,13 @@
     int ConvertKeyCode(int wxKeyCode) const;
 
     /* press a key on the device */
-    void AddPressedKey(KeyCode keyCode);
+    void AddPressedKey(int32_t keyCode);
     /* release a key on the device */
-    void RemovePressedKey(KeyCode keyCode);
+    void RemovePressedKey(int32_t keyCode);
     /* "raise" all keys */
     void ClearPressedKeys(void);
     /* determine whether a key is down */
-    bool IsKeyPressed(KeyCode keyCode);
+    bool IsKeyPressed(int32_t keyCode);
 
     /* manage the device runtime */
     DeviceManager   mDeviceManager;
@@ -149,7 +149,7 @@
     /* button mouse-over highlight handling */
     int             mpMOHViewIndex;     // mouse is in this view
     PhoneButton*    mpMOHButton;        //   over this button
-    KeyCode         mMouseKeySent;     // to handle "key up" for mouse button
+    int32_t         mMouseKeySent;     // to handle "key up" for mouse button
 
     /* handle multiple simultaneous key presses */
     android::List<KeyInfo>  mPressedKeys;