From 3f74842f8e8942d1ae29f16ed841779d46cae3ca Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 27 May 2013 21:30:22 +0200 Subject: [PATCH] [DEV] remove deprecated interface of C interface for mm files --- build | 2 +- .../ewol/renderer/os/eSystemMacOSInterface.h | 52 ------------- .../ewol/renderer/os/gui.MacOs.OpenglView.mm | 6 +- sources/ewol/renderer/os/gui.MacOs.cpp | 74 ------------------- 4 files changed, 4 insertions(+), 130 deletions(-) delete mode 100644 sources/ewol/renderer/os/eSystemMacOSInterface.h diff --git a/build b/build index e1759a13..db7f6315 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit e1759a133e1a196e2e4f4051f6b8d0d5d84cd672 +Subproject commit db7f631536560f91b232d88e4a26e4e96f57be72 diff --git a/sources/ewol/renderer/os/eSystemMacOSInterface.h b/sources/ewol/renderer/os/eSystemMacOSInterface.h deleted file mode 100644 index b20110bd..00000000 --- a/sources/ewol/renderer/os/eSystemMacOSInterface.h +++ /dev/null @@ -1,52 +0,0 @@ -/** - * @author Edouard DUPIN - * - * @copyright 2011, Edouard DUPIN, all right reserved - * - * @license BSD v3 (see license file) - */ - -#ifndef __C_INTERFACE_MAC_OS_H__ -#define __C_INTERFACE_MAC_OS_H__ - -#include - - -#ifdef __cplusplus -extern "C" { -#endif - -void eSystem_SetArchiveDir(int mode, const char* str); - -void eSystem_Resize(int w, int h ); -void eSystem_Move(int x, int y ); -void eSystem_Hide(void); -void eSystem_Show(void); - -void eSystem_SetInputMotion(int pointerID, float x, float y); -void eSystem_SetInputState(int pointerID, bool isDown, float x, float y); - -void eSystem_SetMouseMotion(int pointerID, float x, float y); -void eSystem_SetMouseState(int pointerID, bool isDown, float x, float y); -/* -void eSystem_SetKeyboard(ewol::SpecialKey& special, - uniChar_t myChar, - bool isDown, - bool isARepeateKey=false); -void eSystem_SetKeyboardMove(ewol::SpecialKey& special, - ewol::keyEvent::keyboard_te move, - bool isDown, - bool isARepeateKey=false); -void eSystem_ClipBoardArrive(ewol::clipBoard::clipboardListe_te clipboardID); -*/ -bool eSystem_Draw(bool displayEveryTime); -void eSystem_OpenGlContextDestroy(void); -void eSystem_OnKill(void); - - -#ifdef __cplusplus -} -#endif - -#endif - diff --git a/sources/ewol/renderer/os/gui.MacOs.OpenglView.mm b/sources/ewol/renderer/os/gui.MacOs.OpenglView.mm index 869d0082..209b6b3f 100644 --- a/sources/ewol/renderer/os/gui.MacOs.OpenglView.mm +++ b/sources/ewol/renderer/os/gui.MacOs.OpenglView.mm @@ -9,7 +9,7 @@ #import #include -#include +#include static int32_t width=0, height=0; @@ -21,9 +21,9 @@ static int32_t width=0, height=0; || height!= bounds.size.height) { width= bounds.size.width; height= bounds.size.height; - eSystem_Resize(width,height); + eSystem::Resize(width,height); } - eSystem_Draw(true); + eSystem::Draw(true); glFlush(); } diff --git a/sources/ewol/renderer/os/gui.MacOs.cpp b/sources/ewol/renderer/os/gui.MacOs.cpp index e7e5e383..0e2a7e8b 100644 --- a/sources/ewol/renderer/os/gui.MacOs.cpp +++ b/sources/ewol/renderer/os/gui.MacOs.cpp @@ -30,80 +30,6 @@ #include #include -#include - -void eSystem_SetArchiveDir(int mode, const char* str) -{ - eSystem::SetArchiveDir(mode, str); -} - -void eSystem_Resize(int w, int h ) -{ - eSystem::Resize(w, h); -} -void eSystem_Move(int x, int y ) -{ - eSystem::Move(x, y); -} -void eSystem_Hide(void) -{ - eSystem::Hide(); -} -void eSystem_Show(void) -{ - eSystem::Show(); -} - -void eSystem_SetInputMotion(int pointerID, float x, float y) -{ - eSystem::SetInputMotion(pointerID, x, y); -} -void eSystem_SetInputState(int pointerID, bool isDown, float x, float y) -{ - eSystem::SetInputState(pointerID, isDown, x, y); -} - -void eSystem_SetMouseMotion(int pointerID, float x, float y) -{ - eSystem::SetMouseMotion(pointerID, x, y); -} -void eSystem_SetMouseState(int pointerID, bool isDown, float x, float y) -{ - eSystem::SetMouseState(pointerID, isDown, x, y); -} -/* -void eSystem_SetKeyboard(ewol::SpecialKey& special, - uniChar_t myChar, - bool isDown, - bool isARepeateKey=false); -void eSystem_SetKeyboardMove(ewol::SpecialKey& special, - ewol::keyEvent::keyboard_te move, - bool isDown, - bool isARepeateKey=false); -*/ -/* -void eSystem_ClipBoardArrive(ewol::clipBoard::clipboardListe_te clipboardID) -{ - eSystem::ClipBoardArrive(clipboardID); -} -*/ -bool eSystem_Draw(bool displayEveryTime) -{ - return eSystem::Draw(displayEveryTime); -} -void eSystem_OpenGlContextDestroy(void) -{ - eSystem::OpenGlContextDestroy(); -} -void eSystem_OnKill(void) -{ - eSystem::OnKill(); -} - - - - - int64_t guiInterface::GetTime(void) {