diff options
author | Jean Guyomarc'h <jean.guyomarch@openwide.fr> | 2015-10-13 11:01:15 +0200 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2015-12-01 12:15:31 -0800 |
commit | 916bf675e1e8c559bfda8c904ff7cc1b423c99bf (patch) | |
tree | 133d968bea6d646deed2a048daa1ac4030995f7e /src/lib/ecore_cocoa | |
parent | d48faf39bf1fe5db7b27d47ef1d4f486d212660f (diff) |
ecore_cocoa: use EAPI in implementation
Diffstat (limited to 'src/lib/ecore_cocoa')
-rw-r--r-- | src/lib/ecore_cocoa/ecore_cocoa_window.m | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/src/lib/ecore_cocoa/ecore_cocoa_window.m b/src/lib/ecore_cocoa/ecore_cocoa_window.m index 78c86a29b3..a1853b80bc 100644 --- a/src/lib/ecore_cocoa/ecore_cocoa_window.m +++ b/src/lib/ecore_cocoa/ecore_cocoa_window.m | |||
@@ -255,7 +255,7 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST]; | |||
255 | 255 | ||
256 | @end | 256 | @end |
257 | 257 | ||
258 | Ecore_Cocoa_Window * | 258 | EAPI Ecore_Cocoa_Window * |
259 | ecore_cocoa_window_new(int x, | 259 | ecore_cocoa_window_new(int x, |
260 | int y, | 260 | int y, |
261 | int width, | 261 | int width, |
@@ -294,7 +294,7 @@ ecore_cocoa_window_new(int x, | |||
294 | return w; | 294 | return w; |
295 | } | 295 | } |
296 | 296 | ||
297 | void | 297 | EAPI void |
298 | ecore_cocoa_window_free(Ecore_Cocoa_Window *window) | 298 | ecore_cocoa_window_free(Ecore_Cocoa_Window *window) |
299 | { | 299 | { |
300 | if (!window) | 300 | if (!window) |
@@ -304,7 +304,7 @@ ecore_cocoa_window_free(Ecore_Cocoa_Window *window) | |||
304 | free(window); | 304 | free(window); |
305 | } | 305 | } |
306 | 306 | ||
307 | void | 307 | EAPI void |
308 | ecore_cocoa_window_size_min_set(Ecore_Cocoa_Window *window, | 308 | ecore_cocoa_window_size_min_set(Ecore_Cocoa_Window *window, |
309 | unsigned int w, | 309 | unsigned int w, |
310 | unsigned int h) | 310 | unsigned int h) |
@@ -315,7 +315,7 @@ ecore_cocoa_window_size_min_set(Ecore_Cocoa_Window *window, | |||
315 | window->window.contentMinSize = size; | 315 | window->window.contentMinSize = size; |
316 | } | 316 | } |
317 | 317 | ||
318 | void | 318 | EAPI void |
319 | ecore_cocoa_window_size_max_set(Ecore_Cocoa_Window *window, | 319 | ecore_cocoa_window_size_max_set(Ecore_Cocoa_Window *window, |
320 | unsigned int w, | 320 | unsigned int w, |
321 | unsigned int h) | 321 | unsigned int h) |
@@ -326,7 +326,7 @@ ecore_cocoa_window_size_max_set(Ecore_Cocoa_Window *window, | |||
326 | window->window.contentMaxSize = size; | 326 | window->window.contentMaxSize = size; |
327 | } | 327 | } |
328 | 328 | ||
329 | void | 329 | EAPI void |
330 | ecore_cocoa_window_size_step_set(Ecore_Cocoa_Window *window, | 330 | ecore_cocoa_window_size_step_set(Ecore_Cocoa_Window *window, |
331 | unsigned int w, | 331 | unsigned int w, |
332 | unsigned int h) | 332 | unsigned int h) |
@@ -337,7 +337,7 @@ ecore_cocoa_window_size_step_set(Ecore_Cocoa_Window *window, | |||
337 | window->window.contentResizeIncrements = size; | 337 | window->window.contentResizeIncrements = size; |
338 | } | 338 | } |
339 | 339 | ||
340 | void | 340 | EAPI void |
341 | ecore_cocoa_window_move(Ecore_Cocoa_Window *window, | 341 | ecore_cocoa_window_move(Ecore_Cocoa_Window *window, |
342 | int x, | 342 | int x, |
343 | int y) | 343 | int y) |
@@ -354,7 +354,7 @@ ecore_cocoa_window_move(Ecore_Cocoa_Window *window, | |||
354 | [window->window setFrame:win_frame display:YES]; | 354 | [window->window setFrame:win_frame display:YES]; |
355 | } | 355 | } |
356 | 356 | ||
357 | void | 357 | EAPI void |
358 | ecore_cocoa_window_resize(Ecore_Cocoa_Window *window, | 358 | ecore_cocoa_window_resize(Ecore_Cocoa_Window *window, |
359 | int width, | 359 | int width, |
360 | int height) | 360 | int height) |
@@ -371,7 +371,7 @@ ecore_cocoa_window_resize(Ecore_Cocoa_Window *window, | |||
371 | [window->window setFrame:win_frame display:YES]; | 371 | [window->window setFrame:win_frame display:YES]; |
372 | } | 372 | } |
373 | 373 | ||
374 | void | 374 | EAPI void |
375 | ecore_cocoa_window_move_resize(Ecore_Cocoa_Window *window, | 375 | ecore_cocoa_window_move_resize(Ecore_Cocoa_Window *window, |
376 | int x, | 376 | int x, |
377 | int y, | 377 | int y, |
@@ -392,7 +392,7 @@ ecore_cocoa_window_move_resize(Ecore_Cocoa_Window *window, | |||
392 | [window->window setFrame:win_frame display:YES]; | 392 | [window->window setFrame:win_frame display:YES]; |
393 | } | 393 | } |
394 | 394 | ||
395 | void | 395 | EAPI void |
396 | ecore_cocoa_window_title_set(Ecore_Cocoa_Window *window, const char *title) | 396 | ecore_cocoa_window_title_set(Ecore_Cocoa_Window *window, const char *title) |
397 | { | 397 | { |
398 | if (!window || !title) | 398 | if (!window || !title) |
@@ -401,7 +401,7 @@ ecore_cocoa_window_title_set(Ecore_Cocoa_Window *window, const char *title) | |||
401 | [window->window setTitle:[NSString stringWithUTF8String:title]]; | 401 | [window->window setTitle:[NSString stringWithUTF8String:title]]; |
402 | } | 402 | } |
403 | 403 | ||
404 | void | 404 | EAPI void |
405 | ecore_cocoa_window_show(Ecore_Cocoa_Window *window) | 405 | ecore_cocoa_window_show(Ecore_Cocoa_Window *window) |
406 | { | 406 | { |
407 | if (!window || [window->window isVisible]) | 407 | if (!window || [window->window isVisible]) |
@@ -413,7 +413,7 @@ ecore_cocoa_window_show(Ecore_Cocoa_Window *window) | |||
413 | [window->window makeKeyAndOrderFront:NSApp]; | 413 | [window->window makeKeyAndOrderFront:NSApp]; |
414 | } | 414 | } |
415 | 415 | ||
416 | void | 416 | EAPI void |
417 | ecore_cocoa_window_hide(Ecore_Cocoa_Window *window) | 417 | ecore_cocoa_window_hide(Ecore_Cocoa_Window *window) |
418 | { | 418 | { |
419 | if (!window || ![window->window isVisible]) | 419 | if (!window || ![window->window isVisible]) |
@@ -422,7 +422,8 @@ ecore_cocoa_window_hide(Ecore_Cocoa_Window *window) | |||
422 | [window->window orderOut:NSApp]; | 422 | [window->window orderOut:NSApp]; |
423 | } | 423 | } |
424 | 424 | ||
425 | void ecore_cocoa_window_raise(Ecore_Cocoa_Window *window) | 425 | EAPI void |
426 | ecore_cocoa_window_raise(Ecore_Cocoa_Window *window) | ||
426 | { | 427 | { |
427 | if (!window) | 428 | if (!window) |
428 | return; | 429 | return; |
@@ -430,7 +431,8 @@ void ecore_cocoa_window_raise(Ecore_Cocoa_Window *window) | |||
430 | [window->window orderFront:nil]; | 431 | [window->window orderFront:nil]; |
431 | } | 432 | } |
432 | 433 | ||
433 | void ecore_cocoa_window_lower(Ecore_Cocoa_Window *window) | 434 | EAPI void |
435 | ecore_cocoa_window_lower(Ecore_Cocoa_Window *window) | ||
434 | { | 436 | { |
435 | if (!window) | 437 | if (!window) |
436 | return; | 438 | return; |
@@ -438,7 +440,8 @@ void ecore_cocoa_window_lower(Ecore_Cocoa_Window *window) | |||
438 | [window->window orderBack:nil]; | 440 | [window->window orderBack:nil]; |
439 | } | 441 | } |
440 | 442 | ||
441 | void ecore_cocoa_window_activate(Ecore_Cocoa_Window *window) | 443 | EAPI void |
444 | ecore_cocoa_window_activate(Ecore_Cocoa_Window *window) | ||
442 | { | 445 | { |
443 | if (!window) | 446 | if (!window) |
444 | return; | 447 | return; |
@@ -446,8 +449,9 @@ void ecore_cocoa_window_activate(Ecore_Cocoa_Window *window) | |||
446 | [window->window makeKeyAndOrderFront:nil]; | 449 | [window->window makeKeyAndOrderFront:nil]; |
447 | } | 450 | } |
448 | 451 | ||
449 | void ecore_cocoa_window_iconified_set(Ecore_Cocoa_Window *window, | 452 | EAPI void |
450 | int on) | 453 | ecore_cocoa_window_iconified_set(Ecore_Cocoa_Window *window, |
454 | int on) | ||
451 | { | 455 | { |
452 | if (!window) | 456 | if (!window) |
453 | return; | 457 | return; |
@@ -462,7 +466,7 @@ void ecore_cocoa_window_iconified_set(Ecore_Cocoa_Window *window, | |||
462 | } | 466 | } |
463 | } | 467 | } |
464 | 468 | ||
465 | void | 469 | EAPI void |
466 | ecore_cocoa_window_borderless_set(Ecore_Cocoa_Window *window, | 470 | ecore_cocoa_window_borderless_set(Ecore_Cocoa_Window *window, |
467 | int on) | 471 | int on) |
468 | { | 472 | { |
@@ -474,7 +478,7 @@ ecore_cocoa_window_borderless_set(Ecore_Cocoa_Window *window, | |||
474 | forEdge:NSMinXEdge | NSMinYEdge | NSMaxXEdge | NSMaxYEdge]; | 478 | forEdge:NSMinXEdge | NSMinYEdge | NSMaxXEdge | NSMaxYEdge]; |
475 | } | 479 | } |
476 | 480 | ||
477 | void | 481 | EAPI void |
478 | ecore_cocoa_window_view_set(Ecore_Cocoa_Window *window, | 482 | ecore_cocoa_window_view_set(Ecore_Cocoa_Window *window, |
479 | void *view) | 483 | void *view) |
480 | { | 484 | { |