Cleanup: Resolve HKEY conflict

Both the MS headers and blender headers define the HKEY
which gives all kind of inclusion order issues.

This diff renames all *KEY constants to EVT_*KEY to resolve
this conflict.

Reviewed By: brecht , dfelinto

Differential Revision: http://developer.blender.org/D7164

1 files changed, 10 insertions, 9 deletions

diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index 1f5855aed9e..6e56dd96cb0 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -1584,13 +1584,13 @@ static void ui_handle_panel_header(
   /* XXX weak code, currently it assumes layout style for location of widgets */
 
   /* check open/collapsed button */
-  if (event == RETKEY) {
+  if (event == EVT_RETKEY) {
     button = 1;
   }
-  else if (event == AKEY) {
+  else if (event == EVT_AKEY) {
     button = 1;
   }
-  else if (ELEM(event, 0, RETKEY, LEFTMOUSE) && shift) {
+  else if (ELEM(event, 0, EVT_RETKEY, LEFTMOUSE) && shift) {
     if (block->panel->type->parent == NULL) {
       block->panel->flag ^= PNL_PIN;
       button = 2;
@@ -2305,7 +2305,7 @@ int ui_handler_panel_region(bContext *C,
           retval = WM_UI_HANDLER_BREAK;
         }
       }
-      else if ((event->type == TABKEY && event->ctrl) ||
+      else if ((event->type == EVT_TABKEY && event->ctrl) ||
                ELEM(event->type, WHEELUPMOUSE, WHEELDOWNMOUSE)) {
         /* cycle tabs */
         retval = ui_handle_panel_category_cycling(event, region, active_but);
@@ -2340,7 +2340,8 @@ int ui_handler_panel_region(bContext *C,
     /* XXX hardcoded key warning */
     if (ELEM(mouse_state, PANEL_MOUSE_INSIDE_CONTENT, PANEL_MOUSE_INSIDE_HEADER) &&
         event->val == KM_PRESS) {
-      if (event->type == AKEY && ((event->ctrl + event->oskey + event->shift + event->alt) == 0)) {
+      if (event->type == EVT_AKEY &&
+          ((event->ctrl + event->oskey + event->shift + event->alt) == 0)) {
 
         if (pa->flag & PNL_CLOSEDY) {
           if ((block->rect.ymax <= my) && (block->rect.ymax + PNL_HEADER >= my)) {
@@ -2366,9 +2367,9 @@ int ui_handler_panel_region(bContext *C,
       if (event->val == KM_PRESS) {
 
         /* open close on header */
-        if (ELEM(event->type, RETKEY, PADENTER)) {
+        if (ELEM(event->type, EVT_RETKEY, EVT_PADENTER)) {
           if (mouse_state == PANEL_MOUSE_INSIDE_HEADER) {
-            ui_handle_panel_header(C, block, mx, my, RETKEY, event->ctrl, event->shift);
+            ui_handle_panel_header(C, block, mx, my, EVT_RETKEY, event->ctrl, event->shift);
             retval = WM_UI_HANDLER_BREAK;
             break;
           }
@@ -2395,7 +2396,7 @@ int ui_handler_panel_region(bContext *C,
             break;
           }
         }
-        else if (event->type == ESCKEY) {
+        else if (event->type == EVT_ESCKEY) {
           /*XXX 2.50*/
 #if 0
           if (block->handler) {
@@ -2405,7 +2406,7 @@ int ui_handler_panel_region(bContext *C,
           }
 #endif
         }
-        else if (event->type == PADPLUSKEY || event->type == PADMINUS) {
+        else if (event->type == EVT_PADPLUSKEY || event->type == EVT_PADMINUS) {
 #if 0 /* XXX make float panel exception? */
           int zoom = 0;