浏览代码

Missing assert + comments

ocornut 11 年之前
父节点
当前提交
150ad95bd6
共有 2 个文件被更改,包括 5 次插入2 次删除
  1. 1 0
      imgui.cpp
  2. 4 2
      imgui.h

+ 1 - 0
imgui.cpp

@@ -694,6 +694,7 @@ public:
 
 static ImGuiWindow*	GetCurrentWindow()
 {
+	IM_ASSERT(GImGui.CurrentWindow != NULL);	// ImGui::NewFrame() hasn't been called yet?
 	GImGui.CurrentWindow->Accessed = true;
 	return GImGui.CurrentWindow;
 }

+ 4 - 2
imgui.h

@@ -391,10 +391,13 @@ struct ImGuiIO
 	bool		KeysDown[512];				// Keyboard keys that are pressed (in whatever order user naturally has access to keyboard data)
 	char		InputCharacters[16];		// List of characters input (translated by user from keypress+keyboard state). Fill using AddInputCharacter() helper.
 
-	// Output - Retrieve after calling NewFrame(), you can use them to discard inputs for the rest of your application
+	// Output - Retrieve after calling NewFrame(), you can use them to discard inputs or hide them from the rest of your application
 	bool		WantCaptureMouse;			// ImGui is using your mouse input (= window is being hovered or widget is active).
 	bool		WantCaptureKeyboard;		// imGui is using your keyboard input (= widget is active).
 
+	// Function
+	void		AddInputCharacter(char c);	// Helper to add a new character into InputCharacters[]
+
 	// [Internal] ImGui will maintain those fields for you
 	ImVec2		MousePosPrev;
 	ImVec2		MouseDelta;
@@ -406,7 +409,6 @@ struct ImGuiIO
 	float		KeysDownTime[512];
 
 	ImGuiIO();
-	void		AddInputCharacter(char c);	// Helper to add a new character into InputCharacters[]
 };
 
 //-----------------------------------------------------------------------------