From ce1686db1a3bc314204afb9590fe1e4d2655c84f Mon Sep 17 00:00:00 2001 From: jiajia_deng <2894220@gmail.com> Date: Sun, 22 Sep 2019 12:21:38 +0800 Subject: [PATCH] Fixed compilation errors Signed-off-by: jiajia_deng <2894220@gmail.com> --- examples/basic/main.cpp | 7 ++++++- examples/cef/cef_form.cpp | 20 +++++++++---------- examples/cef/cef_form.h | 6 +++--- examples/cef/main.cpp | 15 +++++++++----- examples/controls/controls_form.cpp | 6 +++--- examples/controls/controls_form.h | 6 ++++++ examples/controls/main.cpp | 2 +- examples/controls/main.h | 4 ++-- examples/layouts/main.cpp | 7 ++++++- .../multi_browser/browser/browser_box.cpp | 12 +++++------ examples/multi_browser/browser/browser_box.h | 4 ++-- .../browser/multi_browser_form.cpp | 1 + .../browser/multi_browser_form.h | 2 +- .../browser/multi_browser_form_dragdrop.cpp | 4 ++-- .../browser/multi_browser_manager.cpp | 2 +- .../browser/multi_browser_manager.h | 5 +++++ examples/multi_browser/main.cpp | 8 ++++---- examples/richlist/main.cpp | 7 ++++++- examples/richlist/richlist_form.cpp | 2 +- examples/virtualbox/main.cpp | 7 ++++++- ui_components/ui_components.vcxproj | 8 ++++---- 21 files changed, 86 insertions(+), 49 deletions(-) diff --git a/examples/basic/main.cpp b/examples/basic/main.cpp index feab5a63..2eddd81c 100644 --- a/examples/basic/main.cpp +++ b/examples/basic/main.cpp @@ -5,6 +5,11 @@ #include "main.h" #include "basic_form.h" +enum ThreadId +{ + kThreadUI +}; + int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR lpCmdLine, @@ -24,7 +29,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, void MainThread::Init() { - nbase::ThreadManager::RegisterThread(kThreadMain); + nbase::ThreadManager::RegisterThread(kThreadUI); // 获取资源路径，初始化全局参数 std::wstring theme_dir = nbase::win32::GetCurrentModuleDirectory(); diff --git a/examples/cef/cef_form.cpp b/examples/cef/cef_form.cpp index 1a7fd3d6..72cebd2c 100644 --- a/examples/cef/cef_form.cpp +++ b/examples/cef/cef_form.cpp @@ -31,10 +31,10 @@ ui::Control* CefForm::CreateControl(const std::wstring& pstrClass) // ɨ XML Ϊ CefControl Ľڵ㣬򴴽һ ui::CefControl ؼ if (pstrClass == L"CefControl") { - if (nim_cef::CefManager::GetInstance()->IsEnableOffsetRender()) - return new ui::CefControl; + if (nim_comp::CefManager::GetInstance()->IsEnableOffsetRender()) + return new nim_comp::CefControl; else - return new ui::CefNativeControl; + return new nim_comp::CefNativeControl; } return NULL; @@ -46,8 +46,8 @@ void CefForm::InitWindow() m_pRoot->AttachBubbledEvent(ui::kEventClick, nbase::Bind(&CefForm::OnClicked, this, std::placeholders::_1)); // XML вָؼ - cef_control_ = dynamic_cast(FindControl(L"cef_control")); - cef_control_dev_ = dynamic_cast(FindControl(L"cef_control_dev")); + cef_control_ = dynamic_cast(FindControl(L"cef_control")); + cef_control_dev_ = dynamic_cast(FindControl(L"cef_control_dev")); btn_dev_tool_ = dynamic_cast(FindControl(L"btn_dev_tool")); edit_url_ = dynamic_cast(FindControl(L"edit_url")); @@ -64,13 +64,13 @@ void CefForm::InitWindow() // ƤĿ¼µ html ļ cef_control_->LoadURL(nbase::win32::GetCurrentModuleDirectory() + L"resources\\themes\\default\\cef\\cef.html"); - if (!nim_cef::CefManager::GetInstance()->IsEnableOffsetRender()) + if (!nim_comp::CefManager::GetInstance()->IsEnableOffsetRender()) cef_control_dev_->SetVisible(false); } LRESULT CefForm::OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - nim_cef::CefManager::GetInstance()->PostQuitMessage(0L); + nim_comp::CefManager::GetInstance()->PostQuitMessage(0L); return __super::OnClose(uMsg, wParam, lParam, bHandled); } @@ -89,7 +89,7 @@ bool CefForm::OnClicked(ui::EventArgs* msg) cef_control_->AttachDevTools(cef_control_dev_); } - if (nim_cef::CefManager::GetInstance()->IsEnableOffsetRender()) + if (nim_comp::CefManager::GetInstance()->IsEnableOffsetRender()) { cef_control_dev_->SetVisible(cef_control_->IsAttachedDevTools()); } @@ -131,8 +131,8 @@ void CefForm::OnLoadEnd(int httpStatusCode) FindControl(L"btn_forward")->SetEnabled(cef_control_->CanGoForward()); // עһṩǰ˵ - cef_control_->RegisterCppFunc(L"ShowMessageBox", ToWeakCallback([this](const std::string& params, nim_cef::ReportResultFunction callback) { - shared::Toast::ShowToast(nbase::UTF8ToUTF16(params), 3000, GetHWND()); + cef_control_->RegisterCppFunc(L"ShowMessageBox", ToWeakCallback([this](const std::string& params, nim_comp::ReportResultFunction callback) { + nim_comp::Toast::ShowToast(nbase::UTF8ToUTF16(params), 3000, GetHWND()); callback(false, R"({ "message": "Success." })"); })); } diff --git a/examples/cef/cef_form.h b/examples/cef/cef_form.h index 55280367..74043d60 100644 --- a/examples/cef/cef_form.h +++ b/examples/cef/cef_form.h @@ -4,7 +4,7 @@ // Ϊ false ʱʹ洰ģʽִ֧ WS_EX_LAYERED ԴڣʹôӰҪ xml н shadowattached Ϊ false const bool kEnableOffsetRender = false; -class CefForm : public std::conditional::type +class CefForm : public std::conditional::type { public: CefForm(); @@ -39,8 +39,8 @@ private: void OnLoadEnd(int httpStatusCode); private: - ui::CefControlBase* cef_control_; - ui::CefControlBase* cef_control_dev_; + nim_comp::CefControlBase* cef_control_; + nim_comp::CefControlBase* cef_control_dev_; ui::Button* btn_dev_tool_; ui::RichEdit* edit_url_; }; diff --git a/examples/cef/main.cpp b/examples/cef/main.cpp index 0f199790..efb6d3f9 100644 --- a/examples/cef/main.cpp +++ b/examples/cef/main.cpp @@ -5,6 +5,11 @@ #include "main.h" #include "cef_form.h" +enum ThreadId +{ + kThreadUI +}; + #pragma comment(lib, "dbghelp.lib") int APIENTRY wWinMain(_In_ HINSTANCE hInstance, @@ -17,7 +22,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, // 将 bin\\cef 目录添加到环境变量，这样可以将所有 CEF 相关文件放到该目录下，方便管理 // 在项目属性->连接器->输入，延迟加载 nim_libcef.dll - nim_cef::CefManager::GetInstance()->AddCefDllToPath(); + nim_comp::CefManager::GetInstance()->AddCefDllToPath(); HRESULT hr = ::OleInitialize(NULL); if (FAILED(hr)) @@ -25,7 +30,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, // 初始化 CEF CefSettings settings; - if (!nim_cef::CefManager::GetInstance()->Initialize(nbase::win32::GetCurrentModuleDirectory() + L"cef_temp\\", settings, kEnableOffsetRender)) + if (!nim_comp::CefManager::GetInstance()->Initialize(nbase::win32::GetCurrentModuleDirectory() + L"cef_temp\\", settings, kEnableOffsetRender)) { return 0; } @@ -37,7 +42,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, thread.RunOnCurrentThreadWithLoop(nbase::MessageLoop::kUIMessageLoop); // 清理 CEF - nim_cef::CefManager::GetInstance()->UnInitialize(); + nim_comp::CefManager::GetInstance()->UnInitialize(); ::OleUninitialize(); @@ -46,7 +51,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, void MainThread::Init() { - nbase::ThreadManager::RegisterThread(kThreadMain); + nbase::ThreadManager::RegisterThread(kThreadUI); // 获取资源路径，初始化全局参数 // 默认皮肤使用 resources\\themes\\default @@ -57,7 +62,7 @@ void MainThread::Init() // 创建一个默认带有阴影的居中窗口 CefForm* window = new CefForm(); - window->Create(NULL, CefForm::kClassName.c_str(), WS_OVERLAPPEDWINDOW & ~WS_MAXIMIZEBOX, 0, nim_cef::CefManager::GetInstance()->IsEnableOffsetRender()); + window->Create(NULL, CefForm::kClassName.c_str(), WS_OVERLAPPEDWINDOW & ~WS_MAXIMIZEBOX, 0, nim_comp::CefManager::GetInstance()->IsEnableOffsetRender()); window->CenterWindow(); window->ShowWindow(); } diff --git a/examples/controls/controls_form.cpp b/examples/controls/controls_form.cpp index 257bfe5e..7206e669 100644 --- a/examples/controls/controls_form.cpp +++ b/examples/controls/controls_form.cpp @@ -103,7 +103,7 @@ void ControlForm::InitWindow() } // Post task to UI thread - nbase::ThreadManager::PostTask(kThreadMain, nbase::Bind(&ControlForm::OnLoadedResourceFile, this, xml)); // or Post2UI(nbase::Bind(&ControlForm::OnLoadedResourceFile, this, xml)); + nbase::ThreadManager::PostTask(kThreadUI, nbase::Bind(&ControlForm::OnLoadedResourceFile, this, xml)); // or Post2UI(nbase::Bind(&ControlForm::OnLoadedResourceFile, this, xml)); }; // Using ToWeakCallback to protect closure when if [ControlForm] was destoryed nbase::ThreadManager::PostTask(kThreadGlobalMisc, ToWeakCallback(closure)); // or Post2GlobalMisc(ToWeakCallback(closure)); @@ -111,7 +111,7 @@ void ControlForm::InitWindow() /* Post repeat task to update progress value 200 milliseconds once */ StdClosure repeat_task = [this]() { nbase::TimeDelta time_delta = nbase::TimeDelta::FromMicroseconds(nbase::Time::Now().ToInternalValue()); - nbase::ThreadManager::PostTask(kThreadMain, nbase::Bind(&ControlForm::OnProgressValueChagned, this, time_delta.ToMilliseconds() % 100)); + nbase::ThreadManager::PostTask(kThreadUI, nbase::Bind(&ControlForm::OnProgressValueChagned, this, time_delta.ToMilliseconds() % 100)); }; nbase::ThreadManager::PostRepeatedTask(kThreadGlobalMisc, ToWeakCallback(repeat_task), nbase::TimeDelta::FromMilliseconds(200)); @@ -124,7 +124,7 @@ void ControlForm::InitWindow() point.y = rect.top + 10; ClientToScreen(m_hWnd, &point); - ui::CMenuWnd* pMenu = new ui::CMenuWnd(NULL); + nim_comp::CMenuWnd* pMenu = new nim_comp::CMenuWnd(NULL); ui::STRINGorID xml(L"settings_menu.xml"); pMenu->Init(xml, _T("xml"), point); return true; diff --git a/examples/controls/controls_form.h b/examples/controls/controls_form.h index f4bd275f..4edb2ca3 100644 --- a/examples/controls/controls_form.h +++ b/examples/controls/controls_form.h @@ -1,5 +1,11 @@ #pragma once +enum ThreadId +{ + kThreadUI, + kThreadGlobalMisc +}; + class ControlForm : public ui::WindowImplBase { public: diff --git a/examples/controls/main.cpp b/examples/controls/main.cpp index 97608de5..91a358fb 100644 --- a/examples/controls/main.cpp +++ b/examples/controls/main.cpp @@ -30,7 +30,7 @@ void MiscThread::Cleanup() void MainThread::Init() { - nbase::ThreadManager::RegisterThread(kThreadMain); + nbase::ThreadManager::RegisterThread(kThreadUI); // 启动杂事处理线程 misc_thread_.reset(new MiscThread(kThreadGlobalMisc, "Global Misc Thread")); diff --git a/examples/controls/main.h b/examples/controls/main.h index cc822498..451ed300 100644 --- a/examples/controls/main.h +++ b/examples/controls/main.h @@ -10,7 +10,7 @@ class MiscThread : public nbase::FrameworkThread { public: - MiscThread(enum ThreadIds thread_id, const char *name) + MiscThread(enum ThreadId thread_id, const char *name) : FrameworkThread(name) , thread_id_(thread_id) {} @@ -30,7 +30,7 @@ private: virtual void Cleanup() override; private: - enum ThreadIds thread_id_; + enum ThreadId thread_id_; }; /** @class MainThread diff --git a/examples/layouts/main.cpp b/examples/layouts/main.cpp index d4e08fa4..20b22ec4 100644 --- a/examples/layouts/main.cpp +++ b/examples/layouts/main.cpp @@ -5,6 +5,11 @@ #include "main.h" #include "layouts_form.h" +enum ThreadId +{ + kThreadUI +}; + int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR lpCmdLine, @@ -24,7 +29,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, void MainThread::Init() { - nbase::ThreadManager::RegisterThread(kThreadMain); + nbase::ThreadManager::RegisterThread(kThreadUI); // 获取资源路径，初始化全局参数 // 默认皮肤使用 resources\\themes\\default diff --git a/examples/multi_browser/browser/browser_box.cpp b/examples/multi_browser/browser/browser_box.cpp index 234d36fd..69826cdf 100644 --- a/examples/multi_browser/browser/browser_box.cpp +++ b/examples/multi_browser/browser/browser_box.cpp @@ -21,7 +21,7 @@ MultiBrowserForm* BrowserBox::GetBrowserForm() const return browser_form_; } -ui::CefControlBase* BrowserBox::GetCefControl() +nim_comp::CefControlBase* BrowserBox::GetCefControl() { return cef_control_; } @@ -33,7 +33,7 @@ std::wstring& BrowserBox::GetTitle() void BrowserBox::InitBrowserBox(const std::wstring &url) { - cef_control_ = static_cast(FindSubControl(L"cef_control")); + cef_control_ = static_cast(FindSubControl(L"cef_control")); cef_control_->AttachBeforeContextMenu(nbase::Bind(&BrowserBox::OnBeforeMenu, this, std::placeholders::_1, std::placeholders::_2)); cef_control_->AttachMenuCommand(nbase::Bind(&BrowserBox::OnMenuCommand, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); cef_control_->AttachTitleChange(nbase::Bind(&BrowserBox::OnTitleChange, this, std::placeholders::_1)); @@ -80,10 +80,10 @@ ui::Control* BrowserBox::CreateControl(const std::wstring& pstrClass) { if (pstrClass == L"CefControl") { - if (nim_cef::CefManager::GetInstance()->IsEnableOffsetRender()) - return new CefControl; + if (nim_comp::CefManager::GetInstance()->IsEnableOffsetRender()) + return new nim_comp::CefControl; else - return new CefNativeControl; + return new nim_comp::CefNativeControl; } return NULL; @@ -173,7 +173,7 @@ void BrowserBox::OnLoadStart() void BrowserBox::OnLoadEnd(int httpStatusCode) { // עһṩǰ˵ - cef_control_->RegisterCppFunc(L"ShowMessageBox", ToWeakCallback([](const std::string& params, nim_cef::ReportResultFunction callback) { + cef_control_->RegisterCppFunc(L"ShowMessageBox", ToWeakCallback([](const std::string& params, nim_comp::ReportResultFunction callback) { MessageBoxA(NULL, params.c_str(), "յ JavaScript Ϣ", MB_OK); callback(false, R"({ "message": "Success." })"); })); diff --git a/examples/multi_browser/browser/browser_box.h b/examples/multi_browser/browser/browser_box.h index 17865e8d..59c140fb 100644 --- a/examples/multi_browser/browser/browser_box.h +++ b/examples/multi_browser/browser/browser_box.h @@ -36,7 +36,7 @@ public: * ȡCefؼָ * @return ui::CefControlBase* Cefؼ */ - ui::CefControlBase* GetCefControl(); + nim_comp::CefControlBase* GetCefControl(); /** * ȡҳ @@ -115,7 +115,7 @@ private: void OnLoadError(CefLoadHandler::ErrorCode errorCode, const CefString& errorText, const CefString& failedUrl); private: - ui::CefControlBase *cef_control_; + nim_comp::CefControlBase *cef_control_; // ͼ TaskbarTabItem *taskbar_item_; diff --git a/examples/multi_browser/browser/multi_browser_form.cpp b/examples/multi_browser/browser/multi_browser_form.cpp index e7aa0b92..db102b60 100644 --- a/examples/multi_browser/browser/multi_browser_form.cpp +++ b/examples/multi_browser/browser/multi_browser_form.cpp @@ -6,6 +6,7 @@ using namespace ui; using namespace std; +using namespace nim_comp; namespace { diff --git a/examples/multi_browser/browser/multi_browser_form.h b/examples/multi_browser/browser/multi_browser_form.h index 78ceb75b..acbada06 100644 --- a/examples/multi_browser/browser/multi_browser_form.h +++ b/examples/multi_browser/browser/multi_browser_form.h @@ -12,7 +12,7 @@ interface IDropTargetHelper; class BrowserBox; class BrowserTabItem; -class MultiBrowserForm : public ui::ShadowWndBase, public IDropTarget, public TaskbarManager::ITaskbarDelegate +class MultiBrowserForm : public nim_comp::ShadowWndBase, public IDropTarget, public TaskbarManager::ITaskbarDelegate { public: MultiBrowserForm(); diff --git a/examples/multi_browser/browser/multi_browser_form_dragdrop.cpp b/examples/multi_browser/browser/multi_browser_form_dragdrop.cpp index 6c8fb66d..eae2571f 100644 --- a/examples/multi_browser/browser/multi_browser_form_dragdrop.cpp +++ b/examples/multi_browser/browser/multi_browser_form_dragdrop.cpp @@ -175,7 +175,7 @@ bool MultiBrowserForm::OnProcessTabItemDrag(ui::EventArgs* param) // 把被拖拽的浏览器盒子生成一个宽度300的位图 HBITMAP bitmap = NULL; - if (nim_cef::CefManager::GetInstance()->IsEnableOffsetRender()) + if (nim_comp::CefManager::GetInstance()->IsEnableOffsetRender()) bitmap = GenerateBoxOffsetRenderBitmap(borwser_box_tab_->GetPos(true)); else bitmap = GenerateBoxWindowBitmap(); @@ -186,7 +186,7 @@ bool MultiBrowserForm::OnProcessTabItemDrag(ui::EventArgs* param) StdClosure cb = [=]{ MultiBrowserManager::GetInstance()->DoDragBorwserBox(active_browser_box_, bitmap, pt); }; - nbase::ThreadManager::PostTask(kThreadMain, cb); + nbase::ThreadManager::PostTask(kThreadUI, cb); } } break; diff --git a/examples/multi_browser/browser/multi_browser_manager.cpp b/examples/multi_browser/browser/multi_browser_manager.cpp index b12bcf31..fddcdcad 100644 --- a/examples/multi_browser/browser/multi_browser_manager.cpp +++ b/examples/multi_browser/browser/multi_browser_manager.cpp @@ -106,7 +106,7 @@ void MultiBrowserManager::RemoveBorwserBox( std::string id, const BrowserBox* bo } if (box_map_.empty()) - nim_cef::CefManager::GetInstance()->PostQuitMessage(0); + nim_comp::CefManager::GetInstance()->PostQuitMessage(0); } void MultiBrowserManager::SetEnableMerge(bool enable) diff --git a/examples/multi_browser/browser/multi_browser_manager.h b/examples/multi_browser/browser/multi_browser_manager.h index dd50f458..e1a3322a 100644 --- a/examples/multi_browser/browser/multi_browser_manager.h +++ b/examples/multi_browser/browser/multi_browser_manager.h @@ -1,6 +1,11 @@ #pragma once #include "browser_box.h" +enum ThreadId +{ + kThreadUI +}; + /** @class MultiBrowserManager * @brief 多标签浏览器管理类，用于统一管理多标签浏览器打开、合并、拆分、拖拽功能 * @date 2019/3/20 diff --git a/examples/multi_browser/main.cpp b/examples/multi_browser/main.cpp index 86003e91..bad434e7 100644 --- a/examples/multi_browser/main.cpp +++ b/examples/multi_browser/main.cpp @@ -17,7 +17,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, // 将 bin\\cef 目录添加到环境变量，这样可以将所有 CEF 相关文件放到该目录下，方便管理 // 在项目属性->连接器->输入，延迟加载 nim_libcef.dll - nim_cef::CefManager::GetInstance()->AddCefDllToPath(); + nim_comp::CefManager::GetInstance()->AddCefDllToPath(); _wsetlocale(LC_ALL, L"chs"); @@ -34,7 +34,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, // 初始化 CEF CefSettings settings; - if (!nim_cef::CefManager::GetInstance()->Initialize(nbase::win32::GetCurrentModuleDirectory() + L"cef_temp\\", settings, true)) + if (!nim_comp::CefManager::GetInstance()->Initialize(nbase::win32::GetCurrentModuleDirectory() + L"cef_temp\\", settings, true)) { return 0; } @@ -46,7 +46,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, thread.RunOnCurrentThreadWithLoop(nbase::MessageLoop::kUIMessageLoop); // 清理 CEF - nim_cef::CefManager::GetInstance()->UnInitialize(); + nim_comp::CefManager::GetInstance()->UnInitialize(); ::OleUninitialize(); @@ -55,7 +55,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, void MainThread::Init() { - nbase::ThreadManager::RegisterThread(kThreadMain); + nbase::ThreadManager::RegisterThread(kThreadUI); std::wstring theme_dir = nbase::win32::GetCurrentModuleDirectory(); ui::GlobalManager::Startup(theme_dir + L"resources\\", ui::CreateControlCallback(), false); diff --git a/examples/richlist/main.cpp b/examples/richlist/main.cpp index 4ffa5464..cabe09e1 100644 --- a/examples/richlist/main.cpp +++ b/examples/richlist/main.cpp @@ -5,6 +5,11 @@ #include "main.h" #include "richlist_form.h" +enum ThreadId +{ + kThreadUI +}; + int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR lpCmdLine, @@ -24,7 +29,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, void MainThread::Init() { - nbase::ThreadManager::RegisterThread(kThreadMain); + nbase::ThreadManager::RegisterThread(kThreadUI); // 获取资源路径，初始化全局参数 std::wstring theme_dir = nbase::win32::GetCurrentModuleDirectory(); diff --git a/examples/richlist/richlist_form.cpp b/examples/richlist/richlist_form.cpp index d7514faa..708f71c1 100644 --- a/examples/richlist/richlist_form.cpp +++ b/examples/richlist/richlist_form.cpp @@ -56,7 +56,7 @@ bool RichlistForm::OnSelected(ui::EventArgs* args) auto message = nbase::StringPrintf(L"ѡΪ %d һѡΪ %d", current, old); - ShowMsgBox(GetHWND(), MsgboxCallback(), message, false, L"ʾ", false); + nim_comp::ShowMsgBox(GetHWND(), nim_comp::MsgboxCallback(), message, false, L"ʾ", false); return true; } diff --git a/examples/virtualbox/main.cpp b/examples/virtualbox/main.cpp index 4f9993b0..62c0d1fb 100644 --- a/examples/virtualbox/main.cpp +++ b/examples/virtualbox/main.cpp @@ -6,6 +6,11 @@ #include "main_form.h" #include "VirtualTileBox.h" +enum ThreadId +{ + kThreadUI +}; + ui::Control* MyCreateControlCallback(const std::wstring& sName) { if (sName == L"VirtualTileBox") @@ -34,7 +39,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, void MainThread::Init() { - nbase::ThreadManager::RegisterThread(kThreadMain); + nbase::ThreadManager::RegisterThread(kThreadUI); // ȡԴ·ʼȫֲ std::wstring theme_dir = nbase::win32::GetCurrentModuleDirectory(); diff --git a/ui_components/ui_components.vcxproj b/ui_components/ui_components.vcxproj index a423847c..79d1bd28 100644 --- a/ui_components/ui_components.vcxproj +++ b/ui_components/ui_components.vcxproj @@ -107,7 +107,7 @@ ..\libs\;%(AdditionalLibraryDirectories) - %(AdditionalDependencies) + nim_libcef_d.lib;%(AdditionalDependencies) /IGNORE:4006,4221 %(AdditionalOptions) @@ -128,7 +128,7 @@ ..\libs\x64\;%(AdditionalLibraryDirectories) - %(AdditionalDependencies) + nim_libcef_d.lib;%(AdditionalDependencies) /IGNORE:4006,4221 %(AdditionalOptions) @@ -153,7 +153,7 @@ ..\libs\;%(AdditionalLibraryDirectories) - %(AdditionalDependencies) + nim_libcef.lib;%(AdditionalDependencies) /IGNORE:4006,4221 %(AdditionalOptions) @@ -178,7 +178,7 @@ ..\libs\x64\;%(AdditionalLibraryDirectories) - %(AdditionalDependencies) + nim_libcef.lib;%(AdditionalDependencies) /IGNORE:4006,4221 %(AdditionalOptions)