Update my-gists

YAYA-shiori · Apr 23, 2023 · 4f12b40 · 4f12b40
1 parent f95cfb5
commit 4f12b40
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/Events.cpp b/src/Events.cpp
@@ -4,7 +4,6 @@
 #include "header_files/resource.h"
 #include "header_files/UItools.hpp"
 #include "my-gists/windows/SetIcon.h"
-#include "my-gists/ukagaka/from_ghost_path.hpp"
 #include "my-gists/windows/LoadStringFromResource.hpp"
 
 void On_tamaOpen(HWND hWnd, wstring ghost_path) {
@@ -18,7 +17,7 @@ void On_tamaOpen(HWND hWnd, wstring ghost_path) {
  {
  ICON_INFO_t icon_info = GetIcon(hWnd);
  if(info.has(L"Icon")) {
- auto hIcon = from_ghost_path::load_icon(ghost_path, info[L"Icon"]);
+ auto hIcon = LoadIconWithBasePath(ghost_path, info[L"Icon"]);
  if(!hIcon)
  WriteText(LoadStringFromResource(IDS_ERROR_ICON_NOT_FOUND) + info[L"Icon"], F_ERROR);
  else {
@@ -27,7 +26,7 @@ void On_tamaOpen(HWND hWnd, wstring ghost_path) {
  }
  }
  if(info.has(L"SmallIcon")) {
- auto hIcon = from_ghost_path::load_icon(ghost_path, info[L"SmallIcon"]);
+ auto hIcon = LoadIconWithBasePath(ghost_path, info[L"SmallIcon"]);
  if(!hIcon)
  WriteText(LoadStringFromResource(IDS_ERROR_ICON_NOT_FOUND) + info[L"SmallIcon"], F_ERROR);
  else

diff --git a/src/GhostStuff.cpp b/src/GhostStuff.cpp
@@ -3,6 +3,7 @@
 #include "header_files/tama.h"
 #include "header_files/GhostStuff.hpp"
 #include "my-gists/windows/LoadStringFromResource.hpp"
+#include "my-gists/STL/string_add_string_view.hpp"
 #include "header_files/resource.h"
 #include "header_files/ToolFunctions.hpp"
 #include "header_files/UItools.hpp"
@@ -92,11 +93,6 @@ bool ExecLoad(void) {
  return 1;
 }
 
-
-inline wstring operator+(wstring s0, wstring_view s1) {
- return s0.append(s1);
-}
-
 void WriteShioriError(int id,UINT stringResourceID) {
  //id最少4个字符，不够的话前面补0
  auto idstr = to_wstring(id);

diff --git a/src/my-gists b/src/my-gists