diff options
Diffstat (limited to 'Editor/GUI')
| -rw-r--r-- | Editor/GUI/ContainerWindow.cpp | 10 | ||||
| -rw-r--r-- | Editor/GUI/GUIWindow.cpp | 12 | ||||
| -rw-r--r-- | Editor/GUI/MenuManager.cpp | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/Editor/GUI/ContainerWindow.cpp b/Editor/GUI/ContainerWindow.cpp index 01bb1e9..d737838 100644 --- a/Editor/GUI/ContainerWindow.cpp +++ b/Editor/GUI/ContainerWindow.cpp @@ -24,7 +24,7 @@ LRESULT CALLBACK ContainerWindow::ContainerWndProc(HWND hWnd, UINT message, WPAR return DefWindowProcW(hWnd, message, wParam, lParam); } - //log_info("WndProc", "ContainerWindow::ContainerWndProc(), ContainerWindow name is " + self->GetName()); + //log_info_tag("WndProc", "ContainerWindow::ContainerWndProc(), ContainerWindow name is " + self->GetName()); switch (message) { @@ -412,16 +412,16 @@ void ContainerWindow::SetIcon(LPCSTR iconName) HICON hWindowIcon = (HICON )LoadImage(winutils::GetInstanceHandle(), iconName, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_LOADFROMFILE); if (hWindowIcon == NULL) - log_error("icon error: " + to_string(GetLastError())); + log_error("icon error: %lu", GetLastError()); if (SendMessage(m_Window, WM_SETICON, ICON_BIG, (LPARAM)hWindowIcon) != WM_SETICON) - log_error("icon error: " + to_string(GetLastError())); + log_error("icon error: %lu", GetLastError()); if (SendMessage(m_Window, WM_SETICON, ICON_SMALL, (LPARAM)hWindowIcon) != WM_SETICON) - log_error("icon error: " + to_string(GetLastError())); + log_error("icon error: %lu", GetLastError()); } void ContainerWindow::Close() { - log_info("Close window " + m_Name); + log_info("Close window %s", m_Name); SendMessage(m_Window, WM_CLOSE, 0, 0); } diff --git a/Editor/GUI/GUIWindow.cpp b/Editor/GUI/GUIWindow.cpp index eb44647..011dfa8 100644 --- a/Editor/GUI/GUIWindow.cpp +++ b/Editor/GUI/GUIWindow.cpp @@ -34,7 +34,7 @@ LRESULT CALLBACK GUIWindow::GUIViewWndProc(HWND hWnd, UINT message, WPARAM wPara return DefWindowProcW(hWnd, message, wParam, lParam); } - //log_info("WndProc", "GUIWindow::GUIViewWndProc(), GUIWindow name is " + wnd->GetName()); + //log_info_tag("WndProc", "GUIWindow::GUIViewWndProc(), GUIWindow name is %s", self->GetName()); switch (message) { @@ -44,7 +44,7 @@ LRESULT CALLBACK GUIWindow::GUIViewWndProc(HWND hWnd, UINT message, WPARAM wPara case WM_PAINT: { - log_info("WndProc", "WM_PAINT"); + log_info_tag("WndProc", "WM_PAINT"); self->SetAsRenderContext(); self->OnPaint(); @@ -57,7 +57,7 @@ LRESULT CALLBACK GUIWindow::GUIViewWndProc(HWND hWnd, UINT message, WPARAM wPara case WM_MOUSEWHEEL: // 在这个子窗口滚动 { - log_info("WndProc","WM_MOUSEWHEEL"); + log_info_tag("WndProc","WM_MOUSEWHEEL"); // quick check if mouse is in our window RECT rc; @@ -193,7 +193,7 @@ void GUIWindow::ProcessEventMessages(UINT message, WPARAM wParam, LPARAM lParam) void GUIWindow::Init(std::string name) { - log_info("Init GUIWindow " /*+ (long)this*/); + log_info("Init GUIWindow"); m_Name = name; @@ -237,7 +237,7 @@ void GUIWindow::Init(std::string name) if (!bRC) log_error("Failed to setup rendering context"); - log_info("Created GUIWindow " /*+ (long)this*/); + log_info("Created GUIWindow "); } bool GUIWindow::SetRenderContext() @@ -338,7 +338,7 @@ void GUIWindow::SetAsRenderContext() void GUIWindow::Focus() { - log_info("Focus GUIWindow " + (long)this); + log_info("Focus GUIWindow "); if (m_Handle) { if (::GetForegroundWindow() != m_ContainerWindow->GetWindowHandle()) diff --git a/Editor/GUI/MenuManager.cpp b/Editor/GUI/MenuManager.cpp index c0fc989..1ba35fd 100644 --- a/Editor/GUI/MenuManager.cpp +++ b/Editor/GUI/MenuManager.cpp @@ -45,17 +45,17 @@ void MenuManager::Init() void MenuManager::AddMenuItem(std::string name, int order) { - log_info("Menu", " Add menu item \"" + name + "\""); + log_info_tag("Menu", " Add menu item \"%s\"", name); } void MenuManager::HandleMenuItemEvent(HMENU menu, unsigned int menuId, unsigned int flags) { - log_info("Menu", "menuId=" + to_string(menuId) + ", flags=" + to_string(flags)); + log_info_tag("Menu", "menuId=%d, flags=%d",menuId, flags); if (flags & MF_CHECKED) // clicked { - log_info("Menu", "checked"); + log_info_tag("Menu", "checked"); } }
\ No newline at end of file |