Merge branch 'dev'

1 files changed, 15 insertions, 3 deletions

diff --git a/python/interaction.py b/python/interaction.py
index 6d640d17..60607692 100644
--- a/python/interaction.py
+++ b/python/interaction.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2016 Vector 35 LLC
+# Copyright (c) 2015-2017 Vector 35 LLC
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -23,7 +23,7 @@ import traceback
 
 # Binary Ninja components
 import _binaryninjacore as core
-from enums import FormInputFieldType, MessageBoxIcon, MessageBoxButtonResult
+from enums import FormInputFieldType, MessageBoxIcon, MessageBoxButtonSet, MessageBoxButtonResult
 import binaryview
 import log
 
@@ -517,5 +517,17 @@ def get_form_input(fields, title):
 	return True
 
 
-def show_message_box(title, text, buttons = MessageBoxButtonResult.OKButton, icon = MessageBoxIcon.InformationIcon):
+def show_message_box(title, text, buttons = MessageBoxButtonSet.OKButtonSet, icon = MessageBoxIcon.InformationIcon):
+	"""
+	``show_message_box`` Displays a configurable message box in the UI, or prompts on the console as appropriate
+	retrieves a list of all Symbol objects of the provided symbol type in the optionally
+	provided range.
+
+	:param str title: Text title for the message box.
+	:param str text: Text for the main body of the message box.
+	:param MessageBoxButtonSet buttons: One of :py:class:`MessageBoxButtonSet`
+	:param MessageBoxIcon icon: One of :py:class:`MessageBoxIcon`
+	:return: Which button was selected
+	:rtype: MessageBoxButtonResult
+	"""
 	return core.BNShowMessageBox(title, text, buttons, icon)