diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown index 4993980..8a72b16 100644 --- a/CHANGELOG.markdown +++ b/CHANGELOG.markdown @@ -2,6 +2,14 @@ ## [Unreleased] +### Removed + +- Non-namespaced flags +- Various imgui-sys things that were deprecated in imgui/cimgui 1.51 +- `Window::bg_alpha` +- `color_edit3` +- `color_edit4` + ## [0.0.17] - 2017-11-07 ### Added diff --git a/imgui-sys/src/lib.rs b/imgui-sys/src/lib.rs index eb6fe1c..4b29d27 100644 --- a/imgui-sys/src/lib.rs +++ b/imgui-sys/src/lib.rs @@ -85,12 +85,6 @@ pub enum ImGuiCol { ModalWindowDarkening, } impl ImGuiCol { - #[deprecated(since = "0.0.17", note = "please use ImGuiCol::Separator instead")] - pub const Column: ImGuiCol = ImGuiCol::Separator; - #[deprecated(since = "0.0.17", note = "please use ImGuiCol::SeparatorHovered instead")] - pub const ColumnHovered: ImGuiCol = ImGuiCol::SeparatorHovered; - #[deprecated(since = "0.0.17", note = "please use ImGuiCol::SeparatorActive instead")] - pub const ColumnActive: ImGuiCol = ImGuiCol::SeparatorActive; pub fn values() -> &'static [ImGuiCol] { use ImGuiCol::*; static values: &'static [ImGuiCol] = &[ @@ -260,64 +254,6 @@ bitflags!( } ); -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::NoTitleBar instead")] -pub const ImGuiWindowFlags_NoTitleBar: ImGuiWindowFlags = ImGuiWindowFlags::NoTitleBar; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::NoResize instead")] -pub const ImGuiWindowFlags_NoResize: ImGuiWindowFlags = ImGuiWindowFlags::NoResize; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::NoMove instead")] -pub const ImGuiWindowFlags_NoMove: ImGuiWindowFlags = ImGuiWindowFlags::NoMove; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::NoScrollbar instead")] -pub const ImGuiWindowFlags_NoScrollbar: ImGuiWindowFlags = ImGuiWindowFlags::NoScrollbar; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::NoScrollWithMouse instead")] -pub const ImGuiWindowFlags_NoScrollWithMouse: ImGuiWindowFlags = - ImGuiWindowFlags::NoScrollWithMouse; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::NoCollapse instead")] -pub const ImGuiWindowFlags_NoCollapse: ImGuiWindowFlags = ImGuiWindowFlags::NoCollapse; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::AlwaysAutoResize instead")] -pub const ImGuiWindowFlags_AlwaysAutoResize: ImGuiWindowFlags = ImGuiWindowFlags::AlwaysAutoResize; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::ShowBorders instead")] -pub const ImGuiWindowFlags_ShowBorders: ImGuiWindowFlags = ImGuiWindowFlags::ShowBorders; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::NoSavedSettings instead")] -pub const ImGuiWindowFlags_NoSavedSettings: ImGuiWindowFlags = ImGuiWindowFlags::NoSavedSettings; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::NoInputs instead")] -pub const ImGuiWindowFlags_NoInputs: ImGuiWindowFlags = ImGuiWindowFlags::NoInputs; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::MenuBar instead")] -pub const ImGuiWindowFlags_MenuBar: ImGuiWindowFlags = ImGuiWindowFlags::MenuBar; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::HorizontalScrollbar instead")] -pub const ImGuiWindowFlags_HorizontalScrollbar: ImGuiWindowFlags = - ImGuiWindowFlags::HorizontalScrollbar; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::NoFocusOnAppearing instead")] -pub const ImGuiWindowFlags_NoFocusOnAppearing: ImGuiWindowFlags = - ImGuiWindowFlags::NoFocusOnAppearing; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::NoBringToFrontOnFocus instead")] -pub const ImGuiWindowFlags_NoBringToFrontOnFocus: ImGuiWindowFlags = - ImGuiWindowFlags::NoBringToFrontOnFocus; -#[deprecated(since = "0.0.17", - note = "please use ImGuiWindowFlags::AlwaysVerticalScrollbar instead")] -pub const ImGuiWindowFlags_AlwaysVerticalScrollbar: ImGuiWindowFlags = - ImGuiWindowFlags::AlwaysVerticalScrollbar; -#[deprecated(since = "0.0.17", - note = "please use ImGuiWindowFlags::AlwaysHorizontalScrollbar instead")] -pub const ImGuiWindowFlags_AlwaysHorizontalScrollbar: ImGuiWindowFlags = - ImGuiWindowFlags::AlwaysHorizontalScrollbar; -#[deprecated(since = "0.0.17", - note = "please use ImGuiWindowFlags::AlwaysUseWindowPadding instead")] -pub const ImGuiWindowFlags_AlwaysUseWindowPadding: ImGuiWindowFlags = - ImGuiWindowFlags::AlwaysUseWindowPadding; - -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::ChildWindow instead")] -pub const ImGuiWindowFlags_ChildWindow: ImGuiWindowFlags = ImGuiWindowFlags::ChildWindow; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::ComboBox instead")] -pub const ImGuiWindowFlags_ComboBox: ImGuiWindowFlags = ImGuiWindowFlags::ComboBox; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::Tooltip instead")] -pub const ImGuiWindowFlags_Tooltip: ImGuiWindowFlags = ImGuiWindowFlags::Tooltip; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::Popup instead")] -pub const ImGuiWindowFlags_Popup: ImGuiWindowFlags = ImGuiWindowFlags::Popup; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::Modal instead")] -pub const ImGuiWindowFlags_Modal: ImGuiWindowFlags = ImGuiWindowFlags::Modal; -#[deprecated(since = "0.0.17", note = "please use ImGuiWindowFlags::ChildMenu instead")] -pub const ImGuiWindowFlags_ChildMenu: ImGuiWindowFlags = ImGuiWindowFlags::ChildMenu; - bitflags!( /// Condition flags #[repr(C)] @@ -329,17 +265,6 @@ bitflags!( } ); -#[deprecated(since = "0.0.17", note = "please use ImGuiCond instead")] -pub type ImGuiSetCond = ImGuiCond; -#[deprecated(since = "0.0.17", note = "please use ImGuiCond::Always instead")] -pub const ImGuiSetCond_Always: ImGuiCond = ImGuiCond::Always; -#[deprecated(since = "0.0.17", note = "please use ImGuiCond::Once instead")] -pub const ImGuiSetCond_Once: ImGuiCond = ImGuiCond::Once; -#[deprecated(since = "0.0.17", note = "please use ImGuiCond::FirstUseEver instead")] -pub const ImGuiSetCond_FirstUseEver: ImGuiCond = ImGuiCond::FirstUseEver; -#[deprecated(since = "0.0.17", note = "please use ImGuiCond::Appearing instead")] -pub const ImGuiSetCond_Appearing: ImGuiCond = ImGuiCond::Appearing; - bitflags!( /// Flags for column functions #[repr(C)] @@ -380,54 +305,6 @@ bitflags!( } ); -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::CharsDecimal instead")] -pub const ImGuiInputTextFlags_CharsDecimal: ImGuiInputTextFlags = ImGuiInputTextFlags::CharsDecimal; -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::CharsHexadecimal instead")] -pub const ImGuiInputTextFlags_CharsHexadecimal: ImGuiInputTextFlags = - ImGuiInputTextFlags::CharsHexadecimal; -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::CharsUppercase instead")] -pub const ImGuiInputTextFlags_CharsUppercase: ImGuiInputTextFlags = - ImGuiInputTextFlags::CharsUppercase; -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::CharsNoBlank instead")] -pub const ImGuiInputTextFlags_CharsNoBlank: ImGuiInputTextFlags = ImGuiInputTextFlags::CharsNoBlank; -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::AutoSelectAll instead")] -pub const ImGuiInputTextFlags_AutoSelectAll: ImGuiInputTextFlags = - ImGuiInputTextFlags::AutoSelectAll; -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::EnterReturnsTrue instead")] -pub const ImGuiInputTextFlags_EnterReturnsTrue: ImGuiInputTextFlags = - ImGuiInputTextFlags::EnterReturnsTrue; -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::CallbackCompletion instead")] -pub const ImGuiInputTextFlags_CallbackCompletion: ImGuiInputTextFlags = - ImGuiInputTextFlags::CallbackCompletion; -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::CallbackHistory instead")] -pub const ImGuiInputTextFlags_CallbackHistory: ImGuiInputTextFlags = - ImGuiInputTextFlags::CallbackHistory; -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::CallbackAlways instead")] -pub const ImGuiInputTextFlags_CallbackAlways: ImGuiInputTextFlags = - ImGuiInputTextFlags::CallbackAlways; -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::CallbackCharFilter instead")] -pub const ImGuiInputTextFlags_CallbackCharFilter: ImGuiInputTextFlags = - ImGuiInputTextFlags::CallbackCharFilter; -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::AllowTabInput instead")] -pub const ImGuiInputTextFlags_AllowTabInput: ImGuiInputTextFlags = - ImGuiInputTextFlags::AllowTabInput; -#[deprecated(since = "0.0.17", - note = "please use ImGuiInputTextFlags::CtrlEnterForNewLine instead")] -pub const ImGuiInputTextFlags_CtrlEnterForNewLine: ImGuiInputTextFlags = - ImGuiInputTextFlags::CtrlEnterForNewLine; -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::NoHorizontalScroll instead")] -pub const ImGuiInputTextFlags_NoHorizontalScroll: ImGuiInputTextFlags = - ImGuiInputTextFlags::NoHorizontalScroll; -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::AlwaysInsertMode instead")] -pub const ImGuiInputTextFlags_AlwaysInsertMode: ImGuiInputTextFlags = - ImGuiInputTextFlags::AlwaysInsertMode; -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::ReadOnly instead")] -pub const ImGuiInputTextFlags_ReadOnly: ImGuiInputTextFlags = ImGuiInputTextFlags::ReadOnly; -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::Password instead")] -pub const ImGuiInputTextFlags_Password: ImGuiInputTextFlags = ImGuiInputTextFlags::Password; -#[deprecated(since = "0.0.17", note = "please use ImGuiInputTextFlags::Multiline instead")] -pub const ImGuiInputTextFlags_Multiline: ImGuiInputTextFlags = ImGuiInputTextFlags::Multiline; - bitflags!( /// Flags for selectables #[repr(C)] @@ -438,16 +315,6 @@ bitflags!( } ); -#[deprecated(since = "0.0.17", note = "please use ImGuiSelectableFlags::DontClosePopups instead")] -pub const ImGuiSelectableFlags_DontClosePopups: ImGuiSelectableFlags = - ImGuiSelectableFlags::DontClosePopups; -#[deprecated(since = "0.0.17", note = "please use ImGuiSelectableFlags::SpanAllColumns instead")] -pub const ImGuiSelectableFlags_SpanAllColumns: ImGuiSelectableFlags = - ImGuiSelectableFlags::SpanAllColumns; -#[deprecated(since = "0.0.17", note = "please use ImGuiSelectableFlags::AllowDoubleClick instead")] -pub const ImGuiSelectableFlags_AllowDoubleClick: ImGuiSelectableFlags = - ImGuiSelectableFlags::AllowDoubleClick; - bitflags!( /// Flags for trees and collapsing headers #[repr(C)] @@ -467,34 +334,6 @@ bitflags!( } ); -#[deprecated(since = "0.0.17", note = "please use ImGuiTreeNodeFlags::Selected instead")] -pub const ImGuiTreeNodeFlags_Selected: ImGuiTreeNodeFlags = ImGuiTreeNodeFlags::Selected; -#[deprecated(since = "0.0.17", note = "please use ImGuiTreeNodeFlags::Framed instead")] -pub const ImGuiTreeNodeFlags_Framed: ImGuiTreeNodeFlags = ImGuiTreeNodeFlags::Framed; -#[deprecated(since = "0.0.17", note = "please use ImGuiTreeNodeFlags::AllowOverlapMode instead")] -pub const ImGuiTreeNodeFlags_AllowOverlapMode: ImGuiTreeNodeFlags = - ImGuiTreeNodeFlags::AllowOverlapMode; -#[deprecated(since = "0.0.17", note = "please use ImGuiTreeNodeFlags::NoTreePushOnOpen instead")] -pub const ImGuiTreeNodeFlags_NoTreePushOnOpen: ImGuiTreeNodeFlags = - ImGuiTreeNodeFlags::NoTreePushOnOpen; -#[deprecated(since = "0.0.17", note = "please use ImGuiTreeNodeFlags::NoAutoOpenOnLog instead")] -pub const ImGuiTreeNodeFlags_NoAutoOpenOnLog: ImGuiTreeNodeFlags = - ImGuiTreeNodeFlags::NoAutoOpenOnLog; -#[deprecated(since = "0.0.17", note = "please use ImGuiTreeNodeFlags::DefaultOpen instead")] -pub const ImGuiTreeNodeFlags_DefaultOpen: ImGuiTreeNodeFlags = ImGuiTreeNodeFlags::DefaultOpen; -#[deprecated(since = "0.0.17", note = "please use ImGuiTreeNodeFlags::OpenOnDoubleClick instead")] -pub const ImGuiTreeNodeFlags_OpenOnDoubleClick: ImGuiTreeNodeFlags = - ImGuiTreeNodeFlags::OpenOnDoubleClick; -#[deprecated(since = "0.0.17", note = "please use ImGuiTreeNodeFlags::OpenOnArrow instead")] -pub const ImGuiTreeNodeFlags_OpenOnArrow: ImGuiTreeNodeFlags = ImGuiTreeNodeFlags::OpenOnArrow; -#[deprecated(since = "0.0.17", note = "please use ImGuiTreeNodeFlags::Leaf instead")] -pub const ImGuiTreeNodeFlags_Leaf: ImGuiTreeNodeFlags = ImGuiTreeNodeFlags::Leaf; -#[deprecated(since = "0.0.17", note = "please use ImGuiTreeNodeFlags::Bullet instead")] -pub const ImGuiTreeNodeFlags_Bullet: ImGuiTreeNodeFlags = ImGuiTreeNodeFlags::Bullet; -#[deprecated(since = "0.0.17", note = "please use ImGuiTreeNodeFlags::CollapsingHeader instead")] -pub const ImGuiTreeNodeFlags_CollapsingHeader: ImGuiTreeNodeFlags = - ImGuiTreeNodeFlags::CollapsingHeader; - pub type ImGuiTextEditCallback = Option< extern "C" fn(data: *mut ImGuiTextEditCallbackData) -> c_int, >; @@ -1126,35 +965,6 @@ extern "C" { pub fn igGetIDPtr(ptr_id: *const c_void) -> ImGuiID; } -#[allow(non_snake_case)] -#[deprecated(since = "0.0.17", note = "please use igPushIDStr instead")] -pub unsafe fn igPushIdStr(str_id: *const c_char) { igPushIDStr(str_id) } -#[allow(non_snake_case)] -#[deprecated(since = "0.0.17", note = "please use igPushIDStrRange instead")] -pub unsafe fn igPushIdStrRange(str_begin: *const c_char, str_end: *const c_char) { - igPushIDStrRange(str_begin, str_end) -} -#[allow(non_snake_case)] -#[deprecated(since = "0.0.17", note = "please use igPushIDPtr instead")] -pub unsafe fn igPushIdPtr(ptr_id: *const c_void) { igPushIDPtr(ptr_id) } -#[allow(non_snake_case)] -#[deprecated(since = "0.0.17", note = "please use igPushIDInt instead")] -pub unsafe fn igPushIdInt(int_id: c_int) { igPushIDInt(int_id) } -#[allow(non_snake_case)] -#[deprecated(since = "0.0.17", note = "please use igPopID instead")] -pub unsafe fn igPopId() { igPopID() } -#[allow(non_snake_case)] -#[deprecated(since = "0.0.17", note = "please use igGetIDStr instead")] -pub unsafe fn igGetIdStr(str_id: *const c_char) -> ImGuiID { igGetIDStr(str_id) } -#[allow(non_snake_case)] -#[deprecated(since = "0.0.17", note = "please use igGetIDStrRange instead")] -pub unsafe fn igGetIdstrRange(str_begin: *const c_char, str_end: *const c_char) -> ImGuiID { - igGetIDStrRange(str_begin, str_end) -} -#[allow(non_snake_case)] -#[deprecated(since = "0.0.17", note = "please use igGetIDPtr instead")] -pub unsafe fn igGetIdPtr(ptr_id: *const c_void) -> ImGuiID { igGetIDPtr(ptr_id) } - // Widgets extern "C" { pub fn igText(fmt: *const c_char, ...); @@ -1701,19 +1511,6 @@ extern "C" { pub fn igPopClipRect(); } -#[allow(non_snake_case)] -#[deprecated(since = "0.0.17", note = "please use igIsItemRectHovered instead")] -pub unsafe fn igIsItemHoveredRect() -> bool { igIsItemRectHovered() } -#[allow(non_snake_case)] -#[deprecated(since = "0.0.17", note = "please use igIsWindowRectHovered instead")] -pub unsafe fn igIsMouseHoveringWindow() -> bool { igIsWindowRectHovered() } -#[allow(non_snake_case)] -#[deprecated(since = "0.0.17", note = "please use igIsAnyWindowHovered instead")] -pub unsafe fn igIsMouseHoveringAnyWindow() -> bool { igIsAnyWindowHovered() } -#[allow(non_snake_case)] -#[deprecated(since = "0.0.17", note = "please use igGetStyleColorName instead")] -pub unsafe fn igGetStyleColName(idx: ImGuiCol) -> *const c_char { igGetStyleColorName(idx) } - // Utilities extern "C" { pub fn igIsItemHovered() -> bool; diff --git a/src/lib.rs b/src/lib.rs index c5d5902..c0de1cd 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,32 +8,6 @@ use std::slice; use std::str; use sys::ImGuiStyleVar; -#[allow(deprecated)] -pub use sys::{ImGuiInputTextFlags_AllowTabInput, ImGuiInputTextFlags_AlwaysInsertMode, - ImGuiInputTextFlags_AutoSelectAll, ImGuiInputTextFlags_CallbackAlways, - ImGuiInputTextFlags_CallbackCharFilter, ImGuiInputTextFlags_CallbackCompletion, - ImGuiInputTextFlags_CallbackHistory, ImGuiInputTextFlags_CharsDecimal, - ImGuiInputTextFlags_CharsHexadecimal, ImGuiInputTextFlags_CharsNoBlank, - ImGuiInputTextFlags_CharsUppercase, ImGuiInputTextFlags_CtrlEnterForNewLine, - ImGuiInputTextFlags_EnterReturnsTrue, ImGuiInputTextFlags_NoHorizontalScroll, - ImGuiInputTextFlags_Password, ImGuiInputTextFlags_ReadOnly, - ImGuiSelectableFlags_DontClosePopups, ImGuiSelectableFlags_SpanAllColumns, - ImGuiSetCond_Always, ImGuiSetCond_Appearing, ImGuiSetCond_FirstUseEver, - ImGuiSetCond_Once, ImGuiTreeNodeFlags_AllowOverlapMode, ImGuiTreeNodeFlags_Bullet, - ImGuiTreeNodeFlags_CollapsingHeader, ImGuiTreeNodeFlags_DefaultOpen, - ImGuiTreeNodeFlags_Framed, ImGuiTreeNodeFlags_Leaf, - ImGuiTreeNodeFlags_NoAutoOpenOnLog, ImGuiTreeNodeFlags_NoTreePushOnOpen, - ImGuiTreeNodeFlags_OpenOnArrow, ImGuiTreeNodeFlags_OpenOnDoubleClick, - ImGuiTreeNodeFlags_Selected, ImGuiWindowFlags_AlwaysAutoResize, - ImGuiWindowFlags_AlwaysHorizontalScrollbar, ImGuiWindowFlags_AlwaysUseWindowPadding, - ImGuiWindowFlags_AlwaysVerticalScrollbar, ImGuiWindowFlags_HorizontalScrollbar, - ImGuiWindowFlags_MenuBar, ImGuiWindowFlags_NoBringToFrontOnFocus, - ImGuiWindowFlags_NoCollapse, ImGuiWindowFlags_NoFocusOnAppearing, - ImGuiWindowFlags_NoInputs, ImGuiWindowFlags_NoMove, ImGuiWindowFlags_NoResize, - ImGuiWindowFlags_NoSavedSettings, ImGuiWindowFlags_NoScrollWithMouse, - ImGuiWindowFlags_NoScrollbar, ImGuiWindowFlags_NoTitleBar, - ImGuiWindowFlags_ShowBorders}; - pub use sys::{ImDrawIdx, ImDrawVert, ImGuiColorEditFlags, ImGuiInputTextFlags, ImGuiKey, ImGuiSelectableFlags, ImGuiCond, ImGuiCol, ImGuiStyle, ImGuiTreeNodeFlags, ImGuiWindowFlags, ImVec2, ImVec4}; @@ -652,15 +626,6 @@ impl<'ui> Ui<'ui> { ) -> ColorEdit<'ui, 'p> { ColorEdit::new(self, label, value.into()) } - #[deprecated(since = "0.0.17", note = "please use color_edit instead")] - pub fn color_edit3<'p>(&self, label: &'p ImStr, value: &'p mut [f32; 3]) -> ColorEdit<'ui, 'p> { - - self.color_edit(label, value) - } - #[deprecated(since = "0.0.17", note = "please use color_edit instead")] - pub fn color_edit4<'p>(&self, label: &'p ImStr, value: &'p mut [f32; 4]) -> ColorEdit<'ui, 'p> { - self.color_edit(label, value) - } /// Constructs a new color picker builder. pub fn color_picker<'p, V: Into>>( &self,