[Bf-blender-cvs] [f1314f3d5b4] master: Cleanup: make WM_HANDLER_* action flags local to wm_event_system

[Campbell Barton]

Commit: f1314f3d5b4bdc11fc4ce52f1585413d051533eb
Author: Campbell Barton
Date:   Sun Feb 5 21:10:01 2023 +1100
Branches: master
https://developer.blender.org/rBf1314f3d5b4bdc11fc4ce52f1585413d051533eb

Cleanup: make WM_HANDLER_* action flags local to wm_event_system

===================================================================

M       source/blender/editors/interface/interface_handlers.cc
M       source/blender/windowmanager/intern/wm_event_system.cc
M       source/blender/windowmanager/wm_event_system.h

===================================================================

diff --git a/source/blender/editors/interface/interface_handlers.cc 
b/source/blender/editors/interface/interface_handlers.cc
index 36737b20f83..706d8c5b374 100644
--- a/source/blender/editors/interface/interface_handlers.cc
+++ b/source/blender/editors/interface/interface_handlers.cc
@@ -9449,10 +9449,10 @@ static int ui_list_handle_click_drag(bContext *C,
                                      const wmEvent *event)
 {
   if (event->type != LEFTMOUSE) {
-    return WM_HANDLER_CONTINUE;
+    return WM_UI_HANDLER_CONTINUE;
   }
 
-  int retval = WM_HANDLER_CONTINUE;
+  int retval = WM_UI_HANDLER_CONTINUE;
 
   const bool is_draggable = ui_list_is_hovering_draggable_but(C, ui_list, 
region, event);
   bool activate = false;
diff --git a/source/blender/windowmanager/intern/wm_event_system.cc 
b/source/blender/windowmanager/intern/wm_event_system.cc
index 1bfcfa3da32..590b0c72b79 100644
--- a/source/blender/windowmanager/intern/wm_event_system.cc
+++ b/source/blender/windowmanager/intern/wm_event_system.cc
@@ -96,6 +96,17 @@
  */
 #define USE_GIZMO_MOUSE_PRIORITY_HACK
 
+/**
+ * Return value of handler-operator call.
+ */
+enum {
+  WM_HANDLER_CONTINUE = 0,
+  WM_HANDLER_BREAK = 1 << 0,
+  WM_HANDLER_HANDLED = 1 << 1,
+  /** `WM_HANDLER_MODAL | WM_HANDLER_BREAK` means unhandled. */
+  WM_HANDLER_MODAL = 1 << 2,
+};
+
 static void wm_notifier_clear(wmNotifier *note);
 static bool wm_notifier_is_clear(const wmNotifier *note);
 
diff --git a/source/blender/windowmanager/wm_event_system.h 
b/source/blender/windowmanager/wm_event_system.h
index f49be20e174..9031b33f80d 100644
--- a/source/blender/windowmanager/wm_event_system.h
+++ b/source/blender/windowmanager/wm_event_system.h
@@ -7,12 +7,6 @@
 
 #pragma once
 
-/* return value of handler-operator call */
-#define WM_HANDLER_CONTINUE 0
-#define WM_HANDLER_BREAK 1
-#define WM_HANDLER_HANDLED 2
-#define WM_HANDLER_MODAL 4 /* MODAL|BREAK means unhandled */
-
 struct ARegion;
 struct GHOST_TabletData;
 struct ScrArea;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs