summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Guyomarc'h <jean.guyomarch@openwide.fr>2015-10-13 11:01:15 +0200
committerNicolas Aguirre <aguirre.nicolas@gmail.com>2015-11-10 08:32:49 +0100
commit5c699924f4986895052ed44b33b9039cc2739250 (patch)
tree04c98a50bb4b9dd001b67bf7ea794a2bb5622add
parenta51dc81d1fcbdb5b48f41dda08aecd0ddbd34c4a (diff)
ecore_cocoa: use EAPI in implementation
-rw-r--r--src/lib/ecore_cocoa/ecore_cocoa_window.m40
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
258Ecore_Cocoa_Window * 258EAPI Ecore_Cocoa_Window *
259ecore_cocoa_window_new(int x, 259ecore_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
297void 297EAPI void
298ecore_cocoa_window_free(Ecore_Cocoa_Window *window) 298ecore_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
307void 307EAPI void
308ecore_cocoa_window_size_min_set(Ecore_Cocoa_Window *window, 308ecore_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
318void 318EAPI void
319ecore_cocoa_window_size_max_set(Ecore_Cocoa_Window *window, 319ecore_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
329void 329EAPI void
330ecore_cocoa_window_size_step_set(Ecore_Cocoa_Window *window, 330ecore_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
340void 340EAPI void
341ecore_cocoa_window_move(Ecore_Cocoa_Window *window, 341ecore_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
357void 357EAPI void
358ecore_cocoa_window_resize(Ecore_Cocoa_Window *window, 358ecore_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
374void 374EAPI void
375ecore_cocoa_window_move_resize(Ecore_Cocoa_Window *window, 375ecore_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
395void 395EAPI void
396ecore_cocoa_window_title_set(Ecore_Cocoa_Window *window, const char *title) 396ecore_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
404void 404EAPI void
405ecore_cocoa_window_show(Ecore_Cocoa_Window *window) 405ecore_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
416void 416EAPI void
417ecore_cocoa_window_hide(Ecore_Cocoa_Window *window) 417ecore_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
425void ecore_cocoa_window_raise(Ecore_Cocoa_Window *window) 425EAPI void
426ecore_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
433void ecore_cocoa_window_lower(Ecore_Cocoa_Window *window) 434EAPI void
435ecore_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
441void ecore_cocoa_window_activate(Ecore_Cocoa_Window *window) 443EAPI void
444ecore_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
449void ecore_cocoa_window_iconified_set(Ecore_Cocoa_Window *window, 452EAPI void
450 int on) 453ecore_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
465void 469EAPI void
466ecore_cocoa_window_borderless_set(Ecore_Cocoa_Window *window, 470ecore_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
477void 481EAPI void
478ecore_cocoa_window_view_set(Ecore_Cocoa_Window *window, 482ecore_cocoa_window_view_set(Ecore_Cocoa_Window *window,
479 void *view) 483 void *view)
480{ 484{