Merge branch 'allow-to-disable-test-window' of https://github.com/mmozeiko/imgui into mmozeiko-allow-to-disable-test-window

This commit is contained in:
ocornut
2015-03-20 22:50:07 +00:00
3 changed files with 7 additions and 1 deletions

View File

@ -8807,6 +8807,7 @@ static void ImeSetInputScreenPosFn_DefaultImpl(int x, int y)
#endif
#ifndef IMGUI_DISABLE_TEST_WINDOWS
//-----------------------------------------------------------------------------
// HELP
//-----------------------------------------------------------------------------
@ -10339,6 +10340,7 @@ static void ShowExampleAppLongText(bool* opened)
}
// End of Sample code
#endif
//-----------------------------------------------------------------------------
// FONT DATA