sync with upstreamHEADmaster

1 files changed, 10 insertions, 8 deletions

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
index b8b4cbf..4eb64c7 100644
--- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
+++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/gui/definitions.h
@@ -200,6 +200,8 @@ typedef struct AddonToKodiFuncTable_kodi_gui_dialogFileBrowser
   void (*clear_file_list)(void* kodiBase, char*** file_list, unsigned int entries);
 } AddonToKodiFuncTable_kodi_gui_dialogFileBrowser;
 
+// typedef void (*char_callback_t) (CGUIKeyboard *ref, const std::string &typedString);
+
 typedef struct AddonToKodiFuncTable_kodi_gui_dialogKeyboard
 {
   bool (*show_and_get_input_with_head)(void* kodiBase, const char* text_in, char** text_out, const char* heading, bool allow_empty_result, bool hiddenInput, unsigned int auto_close_ms);
@@ -276,8 +278,6 @@ typedef struct AddonToKodiFuncTable_kodi_gui_listItem
   void (*set_label)(void* kodiBase, void* handle, const char* label);
   char* (*get_label2)(void* kodiBase, void* handle);
   void (*set_label2)(void* kodiBase, void* handle, const char* label);
-  char* (*get_icon_image)(void* kodiBase, void* handle);
-  void (*set_icon_image)(void* kodiBase, void* handle, const char* image);
   char* (*get_art)(void* kodiBase, void* handle, const char* type);
   void (*set_art)(void* kodiBase, void* handle, const char* type, const char* image);
   char* (*get_path)(void* kodiBase, void* handle);
@@ -302,12 +302,12 @@ typedef struct AddonToKodiFuncTable_kodi_gui_window
   void* (*create)(void* kodiBase, const char* xml_filename, const char* default_skin, bool as_dialog, bool is_media);
   void (*destroy)(void* kodiBase, void* handle);
   void (*set_callbacks)(void* kodiBase, void* handle, void* clienthandle,
-       bool (*)(void* handle),
-       bool (*)(void* handle, int),
-       bool (*)(void* handle, int),
-       bool (*)(void* handle, int),
-       void (*)(void* handle, int, gui_context_menu_pair*, unsigned int*),
-       bool (*)(void* handle, int, unsigned int));
+        bool (*CBInit)(void*),
+        bool (*CBFocus)(void*, int),
+        bool (*CBClick)(void*, int),
+        bool (*CBOnAction)(void*, int, uint32_t, wchar_t),
+        void (*CBGetContextButtons)(void*, int, gui_context_menu_pair*, unsigned int*),
+        bool (*CBOnContextButton)(void*, int, unsigned int));
   bool (*show)(void* kodiBase, void* handle);
   bool (*close)(void* kodiBase, void* handle);
   bool (*do_modal)(void* kodiBase, void* handle);
@@ -316,6 +316,8 @@ typedef struct AddonToKodiFuncTable_kodi_gui_window
   bool (*set_focus_id)(void* kodiBase, void* handle, int control_id);
   int (*get_focus_id)(void* kodiBase, void* handle);
   void (*set_control_label)(void* kodiBase, void* handle, int control_id, const char* label);
+  void (*set_control_visible)(void* kodiBase, void* handle, int control_id, bool visible);
+  void (*set_control_selected)(void* kodiBase, void* handle, int control_id, bool selected);
 
   /* Window property functions */
   void (*set_property)(void* kodiBase, void* handle, const char* key, const char* value);