Skip to content

Update to nightly: static -> const #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Update to nightly: static -> const #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions src/sdl2/audio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@ pub mod ll {

// assume LSB
pub type SDL_AudioFormat = uint16_t;
pub static AUDIO_U8 : SDL_AudioFormat = 0x0008;
pub static AUDIO_S8 : SDL_AudioFormat = 0x8008;
pub static AUDIO_U16LSB : SDL_AudioFormat = 0x0010;
pub static AUDIO_S16LSB : SDL_AudioFormat = 0x8010;
pub static AUDIO_U16MSB : SDL_AudioFormat = 0x1010;
pub static AUDIO_S16MSB : SDL_AudioFormat = 0x9010;
pub static AUDIO_U16 : SDL_AudioFormat = AUDIO_U16LSB;
pub static AUDIO_S16 : SDL_AudioFormat = AUDIO_S16LSB;
pub static AUDIO_S32LSB : SDL_AudioFormat = 0x8020;
pub static AUDIO_S32MSB : SDL_AudioFormat = 0x9020;
pub static AUDIO_S32 : SDL_AudioFormat = AUDIO_S32LSB;
pub static AUDIO_F32LSB : SDL_AudioFormat = 0x8120;
pub static AUDIO_F32MSB : SDL_AudioFormat = 0x9120;
pub static AUDIO_F32 : SDL_AudioFormat = AUDIO_F32LSB;
pub static AUDIO_U16SYS : SDL_AudioFormat = AUDIO_U16LSB;
pub static AUDIO_S16SYS : SDL_AudioFormat = AUDIO_S16LSB;
pub static AUDIO_S32SYS : SDL_AudioFormat = AUDIO_S32LSB;
pub static AUDIO_F32SYS : SDL_AudioFormat = AUDIO_F32LSB;
pub const AUDIO_U8 : SDL_AudioFormat = 0x0008;
pub const AUDIO_S8 : SDL_AudioFormat = 0x8008;
pub const AUDIO_U16LSB : SDL_AudioFormat = 0x0010;
pub const AUDIO_S16LSB : SDL_AudioFormat = 0x8010;
pub const AUDIO_U16MSB : SDL_AudioFormat = 0x1010;
pub const AUDIO_S16MSB : SDL_AudioFormat = 0x9010;
pub const AUDIO_U16 : SDL_AudioFormat = AUDIO_U16LSB;
pub const AUDIO_S16 : SDL_AudioFormat = AUDIO_S16LSB;
pub const AUDIO_S32LSB : SDL_AudioFormat = 0x8020;
pub const AUDIO_S32MSB : SDL_AudioFormat = 0x9020;
pub const AUDIO_S32 : SDL_AudioFormat = AUDIO_S32LSB;
pub const AUDIO_F32LSB : SDL_AudioFormat = 0x8120;
pub const AUDIO_F32MSB : SDL_AudioFormat = 0x9120;
pub const AUDIO_F32 : SDL_AudioFormat = AUDIO_F32LSB;
pub const AUDIO_U16SYS : SDL_AudioFormat = AUDIO_U16LSB;
pub const AUDIO_S16SYS : SDL_AudioFormat = AUDIO_S16LSB;
pub const AUDIO_S32SYS : SDL_AudioFormat = AUDIO_S32LSB;
pub const AUDIO_F32SYS : SDL_AudioFormat = AUDIO_F32LSB;

pub type SDL_AudioCallback =
::std::option::Option<extern "C" fn
Expand Down Expand Up @@ -76,9 +76,9 @@ pub mod ll {
}
pub type SDL_AudioDeviceID = uint32_t;
pub type SDL_AudioStatus = c_uint;
pub static SDL_AUDIO_STOPPED: c_uint = 0;
pub static SDL_AUDIO_PLAYING: c_uint = 1;
pub static SDL_AUDIO_PAUSED: c_uint = 2;
pub const SDL_AUDIO_STOPPED: c_uint = 0;
pub const SDL_AUDIO_PLAYING: c_uint = 1;
pub const SDL_AUDIO_PAUSED: c_uint = 2;
extern "C" {
pub fn SDL_GetNumAudioDrivers() -> c_int;
pub fn SDL_GetAudioDriver(index: c_int) -> *const c_char;
Expand Down Expand Up @@ -125,24 +125,24 @@ pub mod ll {

pub type AudioFormat = ll::SDL_AudioFormat;

pub static AUDIOU8 : AudioFormat = ll::AUDIO_U8;
pub static AUDIOS8 : AudioFormat = ll::AUDIO_S8;
pub static AUDIOU16LSB : AudioFormat = ll::AUDIO_U16LSB;
pub static AUDIOS16LSB : AudioFormat = ll::AUDIO_S16LSB;
pub static AUDIOU16MSB : AudioFormat = ll::AUDIO_U16MSB;
pub static AUDIOS16MSB : AudioFormat = ll::AUDIO_S16MSB;
pub static AUDIOU16 : AudioFormat = ll::AUDIO_U16;
pub static AUDIOS16 : AudioFormat = ll::AUDIO_S16;
pub static AUDIOS32LSB : AudioFormat = ll::AUDIO_S32LSB;
pub static AUDIOS32MSB : AudioFormat = ll::AUDIO_S32MSB;
pub static AUDIOS32 : AudioFormat = ll::AUDIO_S32;
pub static AUDIOF32LSB : AudioFormat = ll::AUDIO_F32LSB;
pub static AUDIOF32MSB : AudioFormat = ll::AUDIO_F32MSB;
pub static AUDIOF32 : AudioFormat = ll::AUDIO_F32;
pub static AUDIOU16SYS : AudioFormat = ll::AUDIO_U16SYS;
pub static AUDIOS16SYS : AudioFormat = ll::AUDIO_S16SYS;
pub static AUDIOS32SYS : AudioFormat = ll::AUDIO_S32SYS;
pub static AUDIOF32SYS : AudioFormat = ll::AUDIO_F32SYS;
pub const AUDIOU8 : AudioFormat = ll::AUDIO_U8;
pub const AUDIOS8 : AudioFormat = ll::AUDIO_S8;
pub const AUDIOU16LSB : AudioFormat = ll::AUDIO_U16LSB;
pub const AUDIOS16LSB : AudioFormat = ll::AUDIO_S16LSB;
pub const AUDIOU16MSB : AudioFormat = ll::AUDIO_U16MSB;
pub const AUDIOS16MSB : AudioFormat = ll::AUDIO_S16MSB;
pub const AUDIOU16 : AudioFormat = ll::AUDIO_U16;
pub const AUDIOS16 : AudioFormat = ll::AUDIO_S16;
pub const AUDIOS32LSB : AudioFormat = ll::AUDIO_S32LSB;
pub const AUDIOS32MSB : AudioFormat = ll::AUDIO_S32MSB;
pub const AUDIOS32 : AudioFormat = ll::AUDIO_S32;
pub const AUDIOF32LSB : AudioFormat = ll::AUDIO_F32LSB;
pub const AUDIOF32MSB : AudioFormat = ll::AUDIO_F32MSB;
pub const AUDIOF32 : AudioFormat = ll::AUDIO_F32;
pub const AUDIOU16SYS : AudioFormat = ll::AUDIO_U16SYS;
pub const AUDIOS16SYS : AudioFormat = ll::AUDIO_S16SYS;
pub const AUDIOS32SYS : AudioFormat = ll::AUDIO_S32SYS;
pub const AUDIOF32SYS : AudioFormat = ll::AUDIO_F32SYS;

#[repr(C)]
#[deriving(Clone, PartialEq, Hash, Show, FromPrimitive)]
Expand Down
58 changes: 29 additions & 29 deletions src/sdl2/controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ pub mod ll {
pub type SDL_GameController = c_void;

pub type SDL_GameControllerBindType = c_uint;
pub static SDL_CONTROLLER_BINDTYPE_NONE: SDL_GameControllerBindType = 0;
pub static SDL_CONTROLLER_BINDTYPE_BUTTON: SDL_GameControllerBindType = 1;
pub static SDL_CONTROLLER_BINDTYPE_AXIS: SDL_GameControllerBindType = 2;
pub static SDL_CONTROLLER_BINDTYPE_HAT: SDL_GameControllerBindType = 3;
pub const SDL_CONTROLLER_BINDTYPE_NONE: SDL_GameControllerBindType = 0;
pub const SDL_CONTROLLER_BINDTYPE_BUTTON: SDL_GameControllerBindType = 1;
pub const SDL_CONTROLLER_BINDTYPE_AXIS: SDL_GameControllerBindType = 2;
pub const SDL_CONTROLLER_BINDTYPE_HAT: SDL_GameControllerBindType = 3;

#[allow(dead_code, non_snake_case)]
#[repr(C)]
Expand Down Expand Up @@ -47,33 +47,33 @@ pub mod ll {
}

pub type SDL_GameControllerAxis = c_int;
pub static SDL_CONTROLLER_AXIS_INVALID: SDL_GameControllerAxis = -1;
pub static SDL_CONTROLLER_AXIS_LEFTX: SDL_GameControllerAxis = 0;
pub static SDL_CONTROLLER_AXIS_LEFTY: SDL_GameControllerAxis = 1;
pub static SDL_CONTROLLER_AXIS_RIGHTX: SDL_GameControllerAxis = 2;
pub static SDL_CONTROLLER_AXIS_RIGHTY: SDL_GameControllerAxis = 3;
pub static SDL_CONTROLLER_AXIS_TRIGGERLEFT: SDL_GameControllerAxis = 4;
pub static SDL_CONTROLLER_AXIS_TRIGGERRIGHT: SDL_GameControllerAxis = 5;
pub static SDL_CONTROLLER_AXIS_MAX: SDL_GameControllerAxis = 6;
pub const SDL_CONTROLLER_AXIS_INVALID: SDL_GameControllerAxis = -1;
pub const SDL_CONTROLLER_AXIS_LEFTX: SDL_GameControllerAxis = 0;
pub const SDL_CONTROLLER_AXIS_LEFTY: SDL_GameControllerAxis = 1;
pub const SDL_CONTROLLER_AXIS_RIGHTX: SDL_GameControllerAxis = 2;
pub const SDL_CONTROLLER_AXIS_RIGHTY: SDL_GameControllerAxis = 3;
pub const SDL_CONTROLLER_AXIS_TRIGGERLEFT: SDL_GameControllerAxis = 4;
pub const SDL_CONTROLLER_AXIS_TRIGGERRIGHT: SDL_GameControllerAxis = 5;
pub const SDL_CONTROLLER_AXIS_MAX: SDL_GameControllerAxis = 6;

pub type SDL_GameControllerButton = c_int;
pub static SDL_CONTROLLER_BUTTON_INVALID: SDL_GameControllerButton = -1;
pub static SDL_CONTROLLER_BUTTON_A: SDL_GameControllerButton = 0;
pub static SDL_CONTROLLER_BUTTON_B: SDL_GameControllerButton = 1;
pub static SDL_CONTROLLER_BUTTON_X: SDL_GameControllerButton = 2;
pub static SDL_CONTROLLER_BUTTON_Y: SDL_GameControllerButton = 3;
pub static SDL_CONTROLLER_BUTTON_BACK: SDL_GameControllerButton = 4;
pub static SDL_CONTROLLER_BUTTON_GUIDE: SDL_GameControllerButton = 5;
pub static SDL_CONTROLLER_BUTTON_START: SDL_GameControllerButton = 6;
pub static SDL_CONTROLLER_BUTTON_LEFTSTICK: SDL_GameControllerButton = 7;
pub static SDL_CONTROLLER_BUTTON_RIGHTSTICK: SDL_GameControllerButton = 8;
pub static SDL_CONTROLLER_BUTTON_LEFTSHOULDER: SDL_GameControllerButton = 9;
pub static SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: SDL_GameControllerButton = 10;
pub static SDL_CONTROLLER_BUTTON_DPAD_UP: SDL_GameControllerButton = 11;
pub static SDL_CONTROLLER_BUTTON_DPAD_DOWN: SDL_GameControllerButton = 12;
pub static SDL_CONTROLLER_BUTTON_DPAD_LEFT: SDL_GameControllerButton = 13;
pub static SDL_CONTROLLER_BUTTON_DPAD_RIGHT: SDL_GameControllerButton = 14;
pub static SDL_CONTROLLER_BUTTON_MAX: SDL_GameControllerButton = 15;
pub const SDL_CONTROLLER_BUTTON_INVALID: SDL_GameControllerButton = -1;
pub const SDL_CONTROLLER_BUTTON_A: SDL_GameControllerButton = 0;
pub const SDL_CONTROLLER_BUTTON_B: SDL_GameControllerButton = 1;
pub const SDL_CONTROLLER_BUTTON_X: SDL_GameControllerButton = 2;
pub const SDL_CONTROLLER_BUTTON_Y: SDL_GameControllerButton = 3;
pub const SDL_CONTROLLER_BUTTON_BACK: SDL_GameControllerButton = 4;
pub const SDL_CONTROLLER_BUTTON_GUIDE: SDL_GameControllerButton = 5;
pub const SDL_CONTROLLER_BUTTON_START: SDL_GameControllerButton = 6;
pub const SDL_CONTROLLER_BUTTON_LEFTSTICK: SDL_GameControllerButton = 7;
pub const SDL_CONTROLLER_BUTTON_RIGHTSTICK: SDL_GameControllerButton = 8;
pub const SDL_CONTROLLER_BUTTON_LEFTSHOULDER: SDL_GameControllerButton = 9;
pub const SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: SDL_GameControllerButton = 10;
pub const SDL_CONTROLLER_BUTTON_DPAD_UP: SDL_GameControllerButton = 11;
pub const SDL_CONTROLLER_BUTTON_DPAD_DOWN: SDL_GameControllerButton = 12;
pub const SDL_CONTROLLER_BUTTON_DPAD_LEFT: SDL_GameControllerButton = 13;
pub const SDL_CONTROLLER_BUTTON_DPAD_RIGHT: SDL_GameControllerButton = 14;
pub const SDL_CONTROLLER_BUTTON_MAX: SDL_GameControllerButton = 15;

extern "C" {
pub fn SDL_GameControllerAddMapping(mappingString: *const c_char) -> c_int;
Expand Down
94 changes: 47 additions & 47 deletions src/sdl2/event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,54 +37,54 @@ pub mod ll {

// SDL_events.h
pub type SDL_EventState = uint8_t;
pub static SDL_DISABLE: SDL_EventState = 0;
pub static SDL_ENABLE: SDL_EventState = 1;
pub static SDL_QUERY: SDL_EventState = -1;
pub const SDL_DISABLE: SDL_EventState = 0;
pub const SDL_ENABLE: SDL_EventState = 1;
pub const SDL_QUERY: SDL_EventState = -1;

pub type SDL_SysWMmsg = c_void;

pub type SDL_EventType = c_uint;
pub static SDL_FIRSTEVENT: SDL_EventType = 0;
pub static SDL_QUIT: SDL_EventType = 256;
pub static SDL_APP_TERMINATING: SDL_EventType = 257;
pub static SDL_APP_LOWMEMORY: SDL_EventType = 258;
pub static SDL_APP_WILLENTERBACKGROUND: SDL_EventType = 259;
pub static SDL_APP_DIDENTERBACKGROUND: SDL_EventType = 260;
pub static SDL_APP_WILLENTERFOREGROUND: SDL_EventType = 261;
pub static SDL_APP_DIDENTERFOREGROUND: SDL_EventType = 262;
pub static SDL_WINDOWEVENT: SDL_EventType = 512;
pub static SDL_SYSWMEVENT: SDL_EventType = 513;
pub static SDL_KEYDOWN: SDL_EventType = 768;
pub static SDL_KEYUP: SDL_EventType = 769;
pub static SDL_TEXTEDITING: SDL_EventType = 770;
pub static SDL_TEXTINPUT: SDL_EventType = 771;
pub static SDL_MOUSEMOTION: SDL_EventType = 1024;
pub static SDL_MOUSEBUTTONDOWN: SDL_EventType = 1025;
pub static SDL_MOUSEBUTTONUP: SDL_EventType = 1026;
pub static SDL_MOUSEWHEEL: SDL_EventType = 1027;
pub static SDL_JOYAXISMOTION: SDL_EventType = 1536;
pub static SDL_JOYBALLMOTION: SDL_EventType = 1537;
pub static SDL_JOYHATMOTION: SDL_EventType = 1538;
pub static SDL_JOYBUTTONDOWN: SDL_EventType = 1539;
pub static SDL_JOYBUTTONUP: SDL_EventType = 1540;
pub static SDL_JOYDEVICEADDED: SDL_EventType = 1541;
pub static SDL_JOYDEVICEREMOVED: SDL_EventType = 1542;
pub static SDL_CONTROLLERAXISMOTION: SDL_EventType = 1616;
pub static SDL_CONTROLLERBUTTONDOWN: SDL_EventType = 1617;
pub static SDL_CONTROLLERBUTTONUP: SDL_EventType = 1618;
pub static SDL_CONTROLLERDEVICEADDED: SDL_EventType = 1619;
pub static SDL_CONTROLLERDEVICEREMOVED: SDL_EventType = 1620;
pub static SDL_CONTROLLERDEVICEREMAPPED: SDL_EventType = 1621;
pub static SDL_FINGERDOWN: SDL_EventType = 1792;
pub static SDL_FINGERUP: SDL_EventType = 1793;
pub static SDL_FINGERMOTION: SDL_EventType = 1794;
pub static SDL_DOLLARGESTURE: SDL_EventType = 2048;
pub static SDL_DOLLARRECORD: SDL_EventType = 2049;
pub static SDL_MULTIGESTURE: SDL_EventType = 2050;
pub static SDL_CLIPBOARDUPDATE: SDL_EventType = 2304;
pub static SDL_DROPFILE: SDL_EventType = 4096;
pub static SDL_USEREVENT: SDL_EventType = 32768;
pub static SDL_LASTEVENT: SDL_EventType = 65535;
pub const SDL_FIRSTEVENT: SDL_EventType = 0;
pub const SDL_QUIT: SDL_EventType = 256;
pub const SDL_APP_TERMINATING: SDL_EventType = 257;
pub const SDL_APP_LOWMEMORY: SDL_EventType = 258;
pub const SDL_APP_WILLENTERBACKGROUND: SDL_EventType = 259;
pub const SDL_APP_DIDENTERBACKGROUND: SDL_EventType = 260;
pub const SDL_APP_WILLENTERFOREGROUND: SDL_EventType = 261;
pub const SDL_APP_DIDENTERFOREGROUND: SDL_EventType = 262;
pub const SDL_WINDOWEVENT: SDL_EventType = 512;
pub const SDL_SYSWMEVENT: SDL_EventType = 513;
pub const SDL_KEYDOWN: SDL_EventType = 768;
pub const SDL_KEYUP: SDL_EventType = 769;
pub const SDL_TEXTEDITING: SDL_EventType = 770;
pub const SDL_TEXTINPUT: SDL_EventType = 771;
pub const SDL_MOUSEMOTION: SDL_EventType = 1024;
pub const SDL_MOUSEBUTTONDOWN: SDL_EventType = 1025;
pub const SDL_MOUSEBUTTONUP: SDL_EventType = 1026;
pub const SDL_MOUSEWHEEL: SDL_EventType = 1027;
pub const SDL_JOYAXISMOTION: SDL_EventType = 1536;
pub const SDL_JOYBALLMOTION: SDL_EventType = 1537;
pub const SDL_JOYHATMOTION: SDL_EventType = 1538;
pub const SDL_JOYBUTTONDOWN: SDL_EventType = 1539;
pub const SDL_JOYBUTTONUP: SDL_EventType = 1540;
pub const SDL_JOYDEVICEADDED: SDL_EventType = 1541;
pub const SDL_JOYDEVICEREMOVED: SDL_EventType = 1542;
pub const SDL_CONTROLLERAXISMOTION: SDL_EventType = 1616;
pub const SDL_CONTROLLERBUTTONDOWN: SDL_EventType = 1617;
pub const SDL_CONTROLLERBUTTONUP: SDL_EventType = 1618;
pub const SDL_CONTROLLERDEVICEADDED: SDL_EventType = 1619;
pub const SDL_CONTROLLERDEVICEREMOVED: SDL_EventType = 1620;
pub const SDL_CONTROLLERDEVICEREMAPPED: SDL_EventType = 1621;
pub const SDL_FINGERDOWN: SDL_EventType = 1792;
pub const SDL_FINGERUP: SDL_EventType = 1793;
pub const SDL_FINGERMOTION: SDL_EventType = 1794;
pub const SDL_DOLLARGESTURE: SDL_EventType = 2048;
pub const SDL_DOLLARRECORD: SDL_EventType = 2049;
pub const SDL_MULTIGESTURE: SDL_EventType = 2050;
pub const SDL_CLIPBOARDUPDATE: SDL_EventType = 2304;
pub const SDL_DROPFILE: SDL_EventType = 4096;
pub const SDL_USEREVENT: SDL_EventType = 32768;
pub const SDL_LASTEVENT: SDL_EventType = 65535;

pub struct SDL_CommonEvent {
pub _type: uint32_t,
Expand Down Expand Up @@ -412,9 +412,9 @@ pub mod ll {
}

pub type SDL_eventaction = c_uint;
pub static SDL_ADDEVENT: SDL_eventaction = 0;
pub static SDL_PEEKEVENT: SDL_eventaction = 1;
pub static SDL_GETEVENT: SDL_eventaction = 2;
pub const SDL_ADDEVENT: SDL_eventaction = 0;
pub const SDL_PEEKEVENT: SDL_eventaction = 1;
pub const SDL_GETEVENT: SDL_eventaction = 2;
pub type SDL_EventFilter =
extern "C" fn(userdata: *const c_void, event: *const SDL_Event) -> c_int;

Expand Down
18 changes: 9 additions & 9 deletions src/sdl2/joystick.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ pub mod ll {

bitflags! {
flags HatState: u8 {
static CENTEREDHATSTATE = 0,
static UPHATSTATE = 0x01,
static RIGHTHATSTATE = 0x02,
static DOWNHATSTATE = 0x04,
static LEFTHATSTATE = 0x08,
static RIGHTUPHATSTATE = 0x02 | 0x01, // RightHatState | UpHatState
static RIGHTDOWNHATSTATE = 0x02 | 0x04, // RightHatState | DownHatState,
static LEFTUPHATSTATE = 0x08 | 0x01, // LeftHatState | UpHatState,
static LEFTDOWNHATSTATE = 0x08 | 0x04 // LeftHatState | DownHatState
const CENTEREDHATSTATE = 0,
const UPHATSTATE = 0x01,
const RIGHTHATSTATE = 0x02,
const DOWNHATSTATE = 0x04,
const LEFTHATSTATE = 0x08,
const RIGHTUPHATSTATE = 0x02 | 0x01, // RightHatState | UpHatState
const RIGHTDOWNHATSTATE = 0x02 | 0x04, // RightHatState | DownHatState,
const LEFTUPHATSTATE = 0x08 | 0x01, // LeftHatState | UpHatState,
const LEFTDOWNHATSTATE = 0x08 | 0x04 // LeftHatState | DownHatState
}
}
26 changes: 13 additions & 13 deletions src/sdl2/keyboard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,19 @@ pub mod ll {

bitflags! {
flags Mod: u32 {
static NOMOD = 0x0000,
static LSHIFTMOD = 0x0001,
static RSHIFTMOD = 0x0002,
static LCTRLMOD = 0x0040,
static RCTRLMOD = 0x0080,
static LALTMOD = 0x0100,
static RALTMOD = 0x0200,
static LGUIMOD = 0x0400,
static RGUIMOD = 0x0800,
static NUMMOD = 0x1000,
static CAPSMOD = 0x2000,
static MODEMOD = 0x4000,
static RESERVEDMOD = 0x8000
const NOMOD = 0x0000,
const LSHIFTMOD = 0x0001,
const RSHIFTMOD = 0x0002,
const LCTRLMOD = 0x0040,
const RCTRLMOD = 0x0080,
const LALTMOD = 0x0100,
const RALTMOD = 0x0200,
const LGUIMOD = 0x0400,
const RGUIMOD = 0x0800,
const NUMMOD = 0x1000,
const CAPSMOD = 0x2000,
const MODEMOD = 0x4000,
const RESERVEDMOD = 0x8000
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/sdl2/messagebox.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ pub mod ll {

bitflags! {
flags MessageBoxFlag: u32 {
static MESSAGEBOX_ERROR = ll::SDL_MESSAGEBOX_ERROR as u32,
static MESSAGEBOX_WARNING = ll::SDL_MESSAGEBOX_WARNING as u32,
static MESSAGEBOX_INFORMATION = ll::SDL_MESSAGEBOX_INFORMATION as u32
const MESSAGEBOX_ERROR = ll::SDL_MESSAGEBOX_ERROR as u32,
const MESSAGEBOX_WARNING = ll::SDL_MESSAGEBOX_WARNING as u32,
const MESSAGEBOX_INFORMATION = ll::SDL_MESSAGEBOX_INFORMATION as u32
}
}

Expand Down
Loading