diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/ecore/src/lib/ecore_evas/ecore_evas_win32.c | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to '')
-rw-r--r-- | libraries/ecore/src/lib/ecore_evas/ecore_evas_win32.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libraries/ecore/src/lib/ecore_evas/ecore_evas_win32.c b/libraries/ecore/src/lib/ecore_evas/ecore_evas_win32.c index cfec528..32132b3 100644 --- a/libraries/ecore/src/lib/ecore_evas/ecore_evas_win32.c +++ b/libraries/ecore/src/lib/ecore_evas/ecore_evas_win32.c | |||
@@ -420,7 +420,7 @@ _ecore_evas_win32_free(Ecore_Evas *ee) | |||
420 | 420 | ||
421 | static void | 421 | static void |
422 | _ecore_evas_win32_callback_delete_request_set(Ecore_Evas *ee, | 422 | _ecore_evas_win32_callback_delete_request_set(Ecore_Evas *ee, |
423 | void (*func) (Ecore_Evas *ee)) | 423 | Ecore_Evas_Event_Cb func) |
424 | { | 424 | { |
425 | ee->func.fn_delete_request = func; | 425 | ee->func.fn_delete_request = func; |
426 | } | 426 | } |
@@ -717,7 +717,7 @@ _ecore_evas_win32_activate(Ecore_Evas *ee) | |||
717 | { | 717 | { |
718 | INF("ecore evas activate"); | 718 | INF("ecore evas activate"); |
719 | 719 | ||
720 | ecore_win32_window_focus_set((struct _Ecore_Win32_Window *)ee->prop.window); | 720 | ecore_win32_window_focus((struct _Ecore_Win32_Window *)ee->prop.window); |
721 | } | 721 | } |
722 | 722 | ||
723 | static void | 723 | static void |
@@ -819,7 +819,7 @@ _ecore_evas_win32_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int ho | |||
819 | static void | 819 | static void |
820 | _ecore_evas_win32_focus_set(Ecore_Evas *ee, int on __UNUSED__) | 820 | _ecore_evas_win32_focus_set(Ecore_Evas *ee, int on __UNUSED__) |
821 | { | 821 | { |
822 | ecore_win32_window_focus_set((struct _Ecore_Win32_Window *)ee->prop.window); | 822 | ecore_win32_window_focus((struct _Ecore_Win32_Window *)ee->prop.window); |
823 | } | 823 | } |
824 | 824 | ||
825 | static void | 825 | static void |
@@ -879,18 +879,12 @@ _ecore_evas_win32_fullscreen_set(Ecore_Evas *ee, int on) | |||
879 | 879 | ||
880 | if (on != 0) | 880 | if (on != 0) |
881 | { | 881 | { |
882 | ecore_win32_window_shape_set((struct _Ecore_Win32_Window *)ee->prop.window, | ||
883 | 0, 0, NULL); | ||
884 | ecore_win32_window_fullscreen_set((struct _Ecore_Win32_Window *)ee->prop.window, | 882 | ecore_win32_window_fullscreen_set((struct _Ecore_Win32_Window *)ee->prop.window, |
885 | on); | 883 | on); |
886 | } | 884 | } |
887 | else | 885 | else |
888 | { | 886 | { |
889 | ecore_win32_window_fullscreen_set(window, on); | 887 | ecore_win32_window_fullscreen_set(window, on); |
890 | ecore_win32_window_shape_set(window, | ||
891 | window->shape.width, | ||
892 | window->shape.height, | ||
893 | window->shape.mask); | ||
894 | } | 888 | } |
895 | 889 | ||
896 | /* Nothing to be done for the GDI backend at the evas level */ | 890 | /* Nothing to be done for the GDI backend at the evas level */ |
@@ -982,6 +976,13 @@ static Ecore_Evas_Engine_Func _ecore_win32_engine_func = | |||
982 | NULL, /* _ecore_evas_x_alpha_set */ | 976 | NULL, /* _ecore_evas_x_alpha_set */ |
983 | NULL, //transparent | 977 | NULL, //transparent |
984 | 978 | ||
979 | NULL, | ||
980 | NULL, | ||
981 | NULL, | ||
982 | NULL, | ||
983 | NULL, | ||
984 | NULL, | ||
985 | |||
985 | NULL, // render | 986 | NULL, // render |
986 | NULL //screen_geometry_get | 987 | NULL //screen_geometry_get |
987 | }; | 988 | }; |