diff --git a/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy b/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy index f36a11c..e51c475 100644 --- a/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy +++ b/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy @@ -47,10 +47,13 @@ class GenerateLibs extends DefaultTask { spec.from(project.rootProject.file('include/imgui/misc/freetype')) { CopySpec it -> it.include('*.h', '*.cpp') } } - spec.from(project.rootProject.file('imgui-binding/src/main/native')) spec.into(jniDir) } + project.copy {CopySpec spec -> + spec.from(project.rootProject.file('imgui-binding/src/main/native')).into(jniDir) + } + // Generate platform dependant ant configs and header files def buildConfig = new BuildConfig('imgui-java', tmpFolder, libsFolder, jniDir) def buildTargets = [] as BuildTarget[] diff --git a/imgui-binding/src/main/java/imgui/ImGui.java b/imgui-binding/src/main/java/imgui/ImGui.java index 416954a..2c31373 100644 --- a/imgui-binding/src/main/java/imgui/ImGui.java +++ b/imgui-binding/src/main/java/imgui/ImGui.java @@ -3583,10 +3583,6 @@ public class ImGui { ImGui::TreePop(); */ - public static native void treeAdvanceToLabelPos(); /* - ImGui::TreeAdvanceToLabelPos(); - */ - /** * Horizontal distance preceding label when using TreeNode*() or Bullet() == (g.FontSize + style.FramePadding.x*2) for a regular unframed TreeNode */ @@ -4127,16 +4123,6 @@ public class ImGui { return ImGui::BeginPopupContextWindow(strId, imGuiPopupFlags); */ - /** - * Helper to open and begin popup when clicked on current window. - * - * @deprecated use {@link ImGui#beginPopupContextWindow(String, int)} - * @since 1.77 - */ - public static native boolean beginPopupContextWindow(String strId, int mouseButton, boolean alsoOverItems); /* - return ImGui::BeginPopupContextWindow(strId, mouseButton, alsoOverItems); - */ - /** * Open+begin popup when clicked in void (where there are no windows). */ diff --git a/imgui-binding/src/main/native/override_imconfig.h b/imgui-binding/src/main/native/imconfig.h similarity index 99% rename from imgui-binding/src/main/native/override_imconfig.h rename to imgui-binding/src/main/native/imconfig.h index 50a601d..ffa0832 100644 --- a/imgui-binding/src/main/native/override_imconfig.h +++ b/imgui-binding/src/main/native/imconfig.h @@ -25,7 +25,7 @@ //#define IMGUI_API __declspec( dllimport ) //---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to avoid using soon-to-be obsolete function/names. -#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS +//#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS //---- Disable all of Dear ImGui or don't implement standard windows. // It is very strongly recommended to NOT disable the demo windows during development. Please read comments in imgui_demo.cpp. @@ -50,7 +50,7 @@ //#define IMGUI_USE_BGRA_PACKED_COLOR //---- Use 32-bit for ImWchar (default is 16-bit) to support unicode planes 1-16. (e.g. point beyond 0xFFFF like emoticons, dingbats, symbols, shapes, ancient languages, etc...) -#define IMGUI_USE_WCHAR32 +//#define IMGUI_USE_WCHAR32 //---- Avoid multiple STB libraries implementations, or redefine path/filenames to prioritize another version // By default the embedded implementations are declared static and not available outside of imgui cpp files.