Browse Source

Tweaked IMGUI_DISABLE_TEST_WINDOWS so it doesn't show in ImGui.h

ocornut 10 years ago
parent
commit
6699ccfd1f
3 changed files with 10 additions and 4 deletions
  1. 1 1
      imconfig.h
  2. 8 1
      imgui.cpp
  3. 1 2
      imgui.h

+ 1 - 1
imconfig.h

@@ -22,7 +22,7 @@
 //#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS
 //#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCS
 
-//---- Don't implement help and test window functionality (ShowUserGuide, ShowStyleEditor and ShowTestWindow methods won't be available)
+//---- Don't implement help and test window functionality (ShowUserGuide()/ShowStyleEditor()/ShowTestWindow() methods will be empty)
 //#define IMGUI_DISABLE_TEST_WINDOWS
 
 //---- Include imgui_user.inl at the end of imgui.cpp so you can include code that extends ImGui using its private data/functions.

+ 8 - 1
imgui.cpp

@@ -8807,7 +8807,14 @@ static void ImeSetInputScreenPosFn_DefaultImpl(int x, int y)
 
 #endif
 
-#ifndef IMGUI_DISABLE_TEST_WINDOWS
+#ifdef IMGUI_DISABLE_TEST_WINDOWS
+
+void ImGui::ShowUserGuide() {}
+void ImGui::ShowStyleEditor() {}
+void ImGui::ShowTestWindow() {}
+
+#else
+
 //-----------------------------------------------------------------------------
 // HELP
 //-----------------------------------------------------------------------------

+ 1 - 2
imgui.h

@@ -155,11 +155,10 @@ namespace ImGui
     IMGUI_API void          NewFrame();
     IMGUI_API void          Render();
     IMGUI_API void          Shutdown();
-#ifndef IMGUI_DISABLE_TEST_WINDOWS
     IMGUI_API void          ShowUserGuide();
     IMGUI_API void          ShowStyleEditor(ImGuiStyle* ref = NULL);
     IMGUI_API void          ShowTestWindow(bool* open = NULL);
-#endif
+
     // Window
     // See implementation in .cpp for details
     IMGUI_API bool          Begin(const char* name = "Debug", bool* p_opened = NULL, const ImVec2& initial_size = ImVec2(0,0), float bg_alpha = -1.0f, ImGuiWindowFlags flags = 0); // return false when window is collapsed, so you can early out in your code. passing 'bool* p_opened' displays a Close button on the upper-right corner of the window, the pointed value will be set to false when the button is pressed.