vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved _T to emgui/types.h as we use it elsewhere now

Browse Source
This commit is contained in:
Daniel Collin 2013-01-09 19:20:07 +01:00
parent b1e1f7cf0a
commit 897af3fc4b
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ogl_editor/emgui/include/emgui/Types.h
View File

@ -9,7 +9,6 @@ typedef unsigned int uint;
#if defined(_WIN32) #if defined(_WIN32)
#if defined(__GNUC__) #if defined(__GNUC__)
#include <stdint.h> #include <stdint.h>
#else #else
@ -70,6 +69,8 @@ typedef wchar_t text_t;
#define EMGUI_ALIGNOF(t) __alignof__(t) #define EMGUI_ALIGNOF(t) __alignof__(t)
#define EMGUI_BREAK ((*(volatile uint32_t *)(0)) = 0x666) #define EMGUI_BREAK ((*(volatile uint32_t *)(0)) = 0x666)
#define _T(v) v
typedef char text_t; typedef char text_t;
#include <stdbool.h> #include <stdbool.h>

6
ogl_editor/src/Menu.c
View File

@ -3,12 +3,6 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
#ifndef _WIN32
#define _T(v) v
#endif
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
MenuDescriptor g_fileMenu[] = MenuDescriptor g_fileMenu[] =
{ {
{ _T("Open..."), EDITOR_MENU_OPEN, 'o', EMGUI_KEY_COMMAND, EMGUI_KEY_CTRL }, { _T("Open..."), EDITOR_MENU_OPEN, 'o', EMGUI_KEY_COMMAND, EMGUI_KEY_CTRL },