geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug 4813 - Give enums their own name 

* SDL_PIXELTYPE_
* SDL_BITMAPORDER_
* SDL_PACKEDORDER_
* SDL_ARRAYORDER_
* SDL_PACKEDLAYOUT_
* SDLK_
* SDL_LOG_CATEGORY_
Sylvain Becker 2019-10-10 17:40:00 +02:00
parent 97901b9f97
commit a0934a23fd
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/SDL_keycode.h
View File

@ -47,7 +47,7 @@ typedef Sint32 SDL_Keycode;
#define SDLK_SCANCODE_MASK (1<<30) #define SDLK_SCANCODE_MASK (1<<30)
#define SDL_SCANCODE_TO_KEYCODE(X) (X | SDLK_SCANCODE_MASK) #define SDL_SCANCODE_TO_KEYCODE(X) (X | SDLK_SCANCODE_MASK)
enum typedef enum
{ {
SDLK_UNKNOWN = 0, SDLK_UNKNOWN = 0,
@ -317,7 +317,7 @@ enum
SDLK_AUDIOREWIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOREWIND), SDLK_AUDIOREWIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOREWIND),
SDLK_AUDIOFASTFORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOFASTFORWARD) SDLK_AUDIOFASTFORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOFASTFORWARD)
}; } SDL_KeyCodeEnum;
/** /**
* \brief Enumeration of valid key mods (possibly OR'd together). * \brief Enumeration of valid key mods (possibly OR'd together).

4
include/SDL_log.h
View File

@ -61,7 +61,7 @@ extern "C" {
* at the VERBOSE level and all other categories are enabled at the * at the VERBOSE level and all other categories are enabled at the
* CRITICAL level. * CRITICAL level.
*/ */
enum typedef enum
{ {
SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_CATEGORY_APPLICATION,
SDL_LOG_CATEGORY_ERROR, SDL_LOG_CATEGORY_ERROR,
@ -94,7 +94,7 @@ enum
}; };
*/ */
SDL_LOG_CATEGORY_CUSTOM SDL_LOG_CATEGORY_CUSTOM
}; } SDL_LogCategoryEnum;
/** /**
* \brief The predefined log priorities * \brief The predefined log priorities

20
include/SDL_pixels.h
View File

@ -48,7 +48,7 @@ extern "C" {
/* @} */ /* @} */
/** Pixel type. */ /** Pixel type. */
enum typedef enum
{ {
SDL_PIXELTYPE_UNKNOWN, SDL_PIXELTYPE_UNKNOWN,
SDL_PIXELTYPE_INDEX1, SDL_PIXELTYPE_INDEX1,
@ -62,18 +62,18 @@ enum
SDL_PIXELTYPE_ARRAYU32, SDL_PIXELTYPE_ARRAYU32,
SDL_PIXELTYPE_ARRAYF16, SDL_PIXELTYPE_ARRAYF16,
SDL_PIXELTYPE_ARRAYF32 SDL_PIXELTYPE_ARRAYF32
}; } SDL_PixelTypeEnum;
/** Bitmap pixel order, high bit -> low bit. */ /** Bitmap pixel order, high bit -> low bit. */
enum typedef enum
{ {
SDL_BITMAPORDER_NONE, SDL_BITMAPORDER_NONE,
SDL_BITMAPORDER_4321, SDL_BITMAPORDER_4321,
SDL_BITMAPORDER_1234 SDL_BITMAPORDER_1234
}; } SDL_BitmapOrderEnum;
/** Packed component order, high bit -> low bit. */ /** Packed component order, high bit -> low bit. */
enum typedef enum
{ {
SDL_PACKEDORDER_NONE, SDL_PACKEDORDER_NONE,
SDL_PACKEDORDER_XRGB, SDL_PACKEDORDER_XRGB,
@ -84,12 +84,12 @@ enum
SDL_PACKEDORDER_BGRX, SDL_PACKEDORDER_BGRX,
SDL_PACKEDORDER_ABGR, SDL_PACKEDORDER_ABGR,
SDL_PACKEDORDER_BGRA SDL_PACKEDORDER_BGRA
}; } SDL_PackedOrderEnum;
/** Array component order, low byte -> high byte. */ /** Array component order, low byte -> high byte. */
/* !!! FIXME: in 2.1, make these not overlap differently with /* !!! FIXME: in 2.1, make these not overlap differently with
!!! FIXME: SDL_PACKEDORDER_*, so we can simplify SDL_ISPIXELFORMAT_ALPHA */ !!! FIXME: SDL_PACKEDORDER_*, so we can simplify SDL_ISPIXELFORMAT_ALPHA */
enum typedef enum
{ {
SDL_ARRAYORDER_NONE, SDL_ARRAYORDER_NONE,
SDL_ARRAYORDER_RGB, SDL_ARRAYORDER_RGB,
@ -98,10 +98,10 @@ enum
SDL_ARRAYORDER_BGR, SDL_ARRAYORDER_BGR,
SDL_ARRAYORDER_BGRA, SDL_ARRAYORDER_BGRA,
SDL_ARRAYORDER_ABGR SDL_ARRAYORDER_ABGR
}; } SDL_ArrayOrderEnum;
/** Packed component layout. */ /** Packed component layout. */
enum typedef enum
{ {
SDL_PACKEDLAYOUT_NONE, SDL_PACKEDLAYOUT_NONE,
SDL_PACKEDLAYOUT_332, SDL_PACKEDLAYOUT_332,
@ -112,7 +112,7 @@ enum
SDL_PACKEDLAYOUT_8888, SDL_PACKEDLAYOUT_8888,
SDL_PACKEDLAYOUT_2101010, SDL_PACKEDLAYOUT_2101010,
SDL_PACKEDLAYOUT_1010102 SDL_PACKEDLAYOUT_1010102
}; } SDL_PackedLayoutEnum;
#define SDL_DEFINE_PIXELFOURCC(A, B, C, D) SDL_FOURCC(A, B, C, D) #define SDL_DEFINE_PIXELFOURCC(A, B, C, D) SDL_FOURCC(A, B, C, D)