diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown index de48398..1407f12 100644 --- a/CHANGELOG.markdown +++ b/CHANGELOG.markdown @@ -2,6 +2,10 @@ ## [Unreleased] +### Removed + +- Various things that were deprecated in imgui-rs 0.0.21 and 0.0.22 + ## [0.0.22] - 2019-02-05 ### Added diff --git a/imgui-sys/src/enums.rs b/imgui-sys/src/enums.rs index 023cea2..65c72d1 100644 --- a/imgui-sys/src/enums.rs +++ b/imgui-sys/src/enums.rs @@ -102,18 +102,7 @@ impl ImGuiCol { ImGuiCol::ModalWindowDimBg, ]; pub const COUNT: usize = 43; - #[deprecated( - since = "0.0.21", - note = "please use ImGuiCol::ModalWindowDimBg instead" - )] - pub const ModalWindowDarkening: ImGuiCol = ImGuiCol::ModalWindowDimBg; - #[deprecated(since = "0.0.21", note = "please use ImGuiCol::VARIANTS instead")] - pub fn values() -> &'static [ImGuiCol] { - &ImGuiCol::VARIANTS - } } -#[deprecated(since = "0.0.21", note = "please use ImGuiCol::COUNT instead")] -pub const ImGuiCol_COUNT: usize = 43; /// A primary data type #[repr(C)] @@ -224,8 +213,6 @@ impl ImGuiKey { ]; pub const COUNT: usize = 21; } -#[deprecated(since = "0.0.21", note = "please use ImGuiKey::COUNT instead")] -pub const ImGuiKey_COUNT: usize = 21; /// A mouse cursor identifier /// @@ -265,11 +252,6 @@ impl ImGuiMouseCursor { ImGuiMouseCursor::Hand, ]; } -#[deprecated( - since = "0.0.21", - note = "please use ImGuiMouseCursor::VARIANTS.len() instead" -)] -pub const ImGuiMouseCursor_COUNT: usize = 8; /// An input identifier for navigation #[repr(C)] @@ -415,8 +397,3 @@ impl ImGuiStyleVar { ImGuiStyleVar::ButtonTextAlign, ]; } -#[deprecated( - since = "0.0.21", - note = "please use ImGuiStyleVar::VARIANTS.len() instead" -)] -pub const ImGuiStyleVar_COUNT: usize = 21; diff --git a/imgui-sys/src/lib.rs b/imgui-sys/src/lib.rs index be9f025..63c5335 100644 --- a/imgui-sys/src/lib.rs +++ b/imgui-sys/src/lib.rs @@ -248,55 +248,6 @@ extern "C" { pub fn igSetWindowFocusStr(name: *const c_char); } -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetWindowPos() -> ImVec2 { - igGetWindowPos_nonUDT2() -} -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetWindowSize() -> ImVec2 { - igGetWindowSize_nonUDT2() -} -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetContentRegionMax() -> ImVec2 { - igGetContentRegionMax_nonUDT2() -} -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetContentRegionAvail() -> ImVec2 { - igGetContentRegionAvail_nonUDT2() -} -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetWindowContentRegionMin() -> ImVec2 { - igGetWindowContentRegionMin_nonUDT2() -} -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetWindowContentRegionMax() -> ImVec2 { - igGetWindowContentRegionMax_nonUDT2() -} - // Windows scrolling extern "C" { pub fn igGetScrollX() -> c_float; @@ -309,12 +260,6 @@ extern "C" { pub fn igSetScrollFromPosY(pos_y: c_float, center_y_ratio: c_float); } -#[deprecated(since = "0.0.22", note = "please use igSetScrollHereY instead")] -#[allow(non_snake_case)] -pub unsafe fn igSetScrollHere(center_y_ratio: c_float) { - igSetScrollHereY(center_y_ratio) -} - // Parameter stacks (shared) extern "C" { pub fn igPushFont(font: *mut ImFont); @@ -334,15 +279,6 @@ extern "C" { pub fn igGetColorU32U32(col: ImU32) -> ImU32; } -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetFontTexUvWhitePixel() -> ImVec2 { - igGetFontTexUvWhitePixel_nonUDT2() -} - // Parameter stack (current window) extern "C" { pub fn igPushItemWidth(item_width: c_float); @@ -383,31 +319,6 @@ extern "C" { pub fn igGetFrameHeightWithSpacing() -> c_float; } -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetCursorPos() -> ImVec2 { - igGetCursorPos_nonUDT2() -} -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetCursorStartPos() -> ImVec2 { - igGetCursorStartPos_nonUDT2() -} -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetCursorScreenPos() -> ImVec2 { - igGetCursorScreenPos_nonUDT2() -} - // ID stack/scopes extern "C" { pub fn igPushIDStr(str_id: *const c_char); @@ -1165,52 +1076,6 @@ extern "C" { ); } -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetItemRectMin() -> ImVec2 { - igGetItemRectMin_nonUDT2() -} -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetItemRectMax() -> ImVec2 { - igGetItemRectMax_nonUDT2() -} -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetItemRectSize() -> ImVec2 { - igGetItemRectSize_nonUDT2() -} -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igCalcTextSize( - text: *const c_char, - text_end: *const c_char, - hide_text_after_double_hash: bool, - wrap_width: c_float, -) -> ImVec2 { - igCalcTextSize_nonUDT2(text, text_end, hide_text_after_double_hash, wrap_width) -} -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igColorConvertU32ToFloat4(color: ImU32) -> ImVec4 { - igColorConvertU32ToFloat4_nonUDT2(color) -} - // Inputs extern "C" { pub fn igGetKeyIndex(imgui_key: ImGuiKey) -> c_int; @@ -1236,31 +1101,6 @@ extern "C" { pub fn igCaptureMouseFromApp(capture: bool); } -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetMousePos() -> ImVec2 { - igGetMousePos_nonUDT2() -} -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetMousePosOnOpeningCurrentPopup() -> ImVec2 { - igGetMousePosOnOpeningCurrentPopup_nonUDT2() -} -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn igGetMouseDragDelta(button: c_int, lock_threshold: c_float) -> ImVec2 { - igGetMouseDragDelta_nonUDT2(button, lock_threshold) -} - // Clipboard utilities extern "C" { pub fn igGetClipboardText() -> *const c_char; diff --git a/imgui-sys/src/structs.rs b/imgui-sys/src/structs.rs index 5ae626a..d430d9c 100644 --- a/imgui-sys/src/structs.rs +++ b/imgui-sys/src/structs.rs @@ -853,23 +853,6 @@ extern "C" { pub fn ImDrawList_UpdateTextureID(this: *mut ImDrawList); } -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn ImDrawList_GetClipRectMin(this: *mut ImDrawList) -> ImVec2 { - ImDrawList_GetClipRectMin_nonUDT2(this) -} -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn ImDrawList_GetClipRectMax(this: *mut ImDrawList) -> ImVec2 { - ImDrawList_GetClipRectMax_nonUDT2(this) -} - // ImDrawData extern "C" { pub fn ImDrawData_Clear(this: *mut ImDrawData); @@ -1066,22 +1049,3 @@ extern "C" { ); pub fn ImFont_AddRemapChar(this: *mut ImFont, dst: ImWchar, src: ImWchar, overwrite_dst: bool); } - -#[deprecated( - since = "0.0.22", - note = "please use the _nonUDT2 suffixed version of this function" -)] -#[allow(non_snake_case)] -pub unsafe fn ImFont_CalcTextSizeA( - this: *mut ImFont, - size: c_float, - max_width: c_float, - wrap_width: c_float, - text_begin: *const c_char, - text_end: *const c_char, - remaining: *mut *const c_char, -) -> ImVec2 { - ImFont_CalcTextSizeA_nonUDT2( - this, size, max_width, wrap_width, text_begin, text_end, remaining, - ) -}