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/PhoneButton.h

diff --git a/simulator/app/PhoneButton.h b/simulator/app/PhoneButton.h
index 4bbaf56..86c32dd 100644
--- a/simulator/app/PhoneButton.h
+++ b/simulator/app/PhoneButton.h
@@ -21,11 +21,11 @@
 class PhoneButton {
 public:
     PhoneButton(void)
-        : mHasImage(false), mKeyCode(kKeyCodeUnknown)
+        : mHasImage(false), mKeyCode(AKEYCODE_UNKNOWN)
         {}
     virtual ~PhoneButton(void) {}
     PhoneButton(const PhoneButton& src)
-        : mHasImage(false), mKeyCode(kKeyCodeUnknown)
+        : mHasImage(false), mKeyCode(AKEYCODE_UNKNOWN)
     {
         CopyMembers(src);
     }
@@ -60,7 +60,7 @@
     }
 
     bool CheckCollision(int x, int y) const;
-    KeyCode GetKeyCode(void) const { return mKeyCode; }
+    int32_t GetKeyCode(void) const { return mKeyCode; }
 
     // load or unload the image bitmap, if any
     bool LoadResources(void);
@@ -68,13 +68,13 @@
 
 private:
     void CreateHighlightedBitmap(void);
-    KeyCode LookupKeyCode(const char* label) const;
+    int32_t LookupKeyCode(const char* label) const;
 
     LoadableImage       mSelectedImage;
     wxBitmap            mHighlightedBitmap;
     bool                mHasImage;          // both exist or neither exist
 
-    KeyCode    mKeyCode;
+    int32_t mKeyCode;
 };
 
 #endif // _SIM_PHONE_BUTTON_H