From 9f05f9ad6836fc85556563a63fa5a8383ffad317 Mon Sep 17 00:00:00 2001
From: caro <caro@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Tue, 20 Mar 2012 04:09:51 +0000
Subject: [PATCH] Ecore: rename ecore_win32_focus_set() to ecore_win32_focus()
 and add ecore_wince_focus()

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@69513 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---
 ChangeLog                                |  6 ++++++
 NEWS                                     |  8 ++++++++
 src/lib/ecore_win32/Ecore_Win32.h        |  2 +-
 src/lib/ecore_win32/ecore_win32_window.c |  2 +-
 src/lib/ecore_wince/Ecore_WinCE.h        |  2 ++
 src/lib/ecore_wince/ecore_wince_window.c | 21 +++++++++++++++++++++
 6 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ee58894..34ee5ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -579,3 +579,9 @@
 
         * Fix ecore_x_randr_modes_info_get to not cut off the trailing '\0'
 		anymore
+
+2012-03-20  Vincent Torri
+
+        * Change ecore_win32_window_focus_set() to ecore_win32_window_focus()
+	to match ecore_x API.
+	* Add ecore_wince_window_focus_set()
diff --git a/NEWS b/NEWS
index 1c97372..f17b401 100644
--- a/NEWS
+++ b/NEWS
@@ -37,6 +37,10 @@ Additions:
      - ecore_imf_context_input_panel_return_key_disabled_get()
      - ecore_imf_context_input_panel_caps_lock_mode_set()
      - ecore_imf_context_input_panel_caps_lock_mode_get()
+    * ecore_win32:
+     - ecore_win32_focus()
+    * ecore_wince:
+     - ecore_wince_focus()
 
 Fixes:
     * ecore_thread:
@@ -62,6 +66,10 @@ Deprecations:
     * ecore_x:
      - ecore_x_randr_crtc_current_get()
 
+Removal:
+    * ecore_win32:
+     - ecore_win32_focus_set()
+
 Ecore 1.1.0
 
 Changes since Ecore 1.0.0:
diff --git a/src/lib/ecore_win32/Ecore_Win32.h b/src/lib/ecore_win32/Ecore_Win32.h
index 50856c2..d46930e 100644
--- a/src/lib/ecore_win32/Ecore_Win32.h
+++ b/src/lib/ecore_win32/Ecore_Win32.h
@@ -460,7 +460,7 @@ EAPI void ecore_win32_window_lower(Ecore_Win32_Window *window);
 EAPI void ecore_win32_window_title_set(Ecore_Win32_Window *window,
                                        const char         *title);
 
-EAPI void ecore_win32_window_focus_set(Ecore_Win32_Window *window);
+EAPI void ecore_win32_window_focus(Ecore_Win32_Window *window);
 
 EAPI void ecore_win32_window_iconified_set(Ecore_Win32_Window *window,
                                            Eina_Bool           on);
diff --git a/src/lib/ecore_win32/ecore_win32_window.c b/src/lib/ecore_win32/ecore_win32_window.c
index 576e5dc..395dbfa 100644
--- a/src/lib/ecore_win32/ecore_win32_window.c
+++ b/src/lib/ecore_win32/ecore_win32_window.c
@@ -877,7 +877,7 @@ ecore_win32_window_title_set(Ecore_Win32_Window *window,
  * @c NULL, this function does nothing.
  */
 EAPI void
-ecore_win32_window_focus_set(Ecore_Win32_Window *window)
+ecore_win32_window_focus(Ecore_Win32_Window *window)
 {
    if (!window) return;
 
diff --git a/src/lib/ecore_wince/Ecore_WinCE.h b/src/lib/ecore_wince/Ecore_WinCE.h
index 681b334..c3e378a 100644
--- a/src/lib/ecore_wince/Ecore_WinCE.h
+++ b/src/lib/ecore_wince/Ecore_WinCE.h
@@ -280,6 +280,8 @@ EAPI void ecore_wince_window_hide(Ecore_WinCE_Window *window);
 EAPI void ecore_wince_window_title_set(Ecore_WinCE_Window *window,
                                        const char         *title);
 
+EAPI void ecore_wince_window_focus(Ecore_WinCE_Window *window);
+
 EAPI void ecore_wince_window_backend_set(Ecore_WinCE_Window *window, int backend);
 
 EAPI void ecore_wince_window_suspend_cb_set(Ecore_WinCE_Window *window, int (*suspend_cb)(int));
diff --git a/src/lib/ecore_wince/ecore_wince_window.c b/src/lib/ecore_wince/ecore_wince_window.c
index 4e8b7b1..0037ed8 100644
--- a/src/lib/ecore_wince/ecore_wince_window.c
+++ b/src/lib/ecore_wince/ecore_wince_window.c
@@ -447,6 +447,27 @@ ecore_wince_window_title_set(Ecore_WinCE_Window *window,
 }
 
 /**
+ * @brief Set the focus to the given window.
+ *
+ * @param window The window to give focus to.
+ *
+ * This function gives the focus to @p window. If @p window is
+ * @c NULL, this function does nothing.
+ */
+EAPI void
+ecore_wince_window_focus(Ecore_WinCE_Window *window)
+{
+   if (!window) return;
+
+   INF("focusing window");
+
+   if (!SetFocus(window->window))
+     {
+        ERR("SetFocus() failed");
+     }
+}
+
+/**
  * @brief Set the graphic backend used for the given window.
  *
  * @param window The window.
-- 
2.7.4