Changeset 793 in dev for branches/egtra/ab5.0/abdev/abdev-impl/Resource

Timestamp:

Jan 30, 2011, 6:29:32 PM (14 years ago)

Author:

イグトランス (egtra)

Message:

代替のリソース読み込み関数の名称を変更（WinAPIとかぶらないものへ）

Location:

branches/egtra/ab5.0/abdev/abdev-impl/Resource

Files:

• Load.cpp (modified) (5 diffs)
• Load.h (modified) (1 diff)

branches/egtra/ab5.0/abdev/abdev-impl/Resource/Load.cpp

@@ -70 +70 @@
 }
 
-}
+} // unnamed namespace
 
-HICON LoadIcon(HINSTANCE hinst, USHORT id, int cxDesired, int cyDesired, UINT load)
+HICON LoadIconAlt(HINSTANCE hinst, USHORT id, int cxDesired, int cyDesired, UINT load)
 {
     return LoadIconCursorImpl(hinst, id, cxDesired, cyDesired, load, true);
 }
 
-HICON LoadIcon(HINSTANCE hinst, USHORT id)
+HICON LoadIconAlt(HINSTANCE hinst, USHORT id)
 {
     return LoadIconCursorImpl(hinst, id, 32, 32, LR_SHARED, true);
 }
 
-HCURSOR LoadCursor(HINSTANCE hinst, USHORT id)
+HCURSOR LoadCursorAlt(HINSTANCE hinst, USHORT id)
 {
     return LoadIconCursorImpl(hinst, id, 32, 32, LR_SHARED, false);
@@ -90 +90 @@
 // How To Use LoadResource to Load Strings from a String Table
 // http://support.microsoft.com/kb/200893/en-us
-boost::optional<std::wstring> LoadString(HINSTANCE hinst, USHORT id)
+boost::optional<std::wstring> LoadStringAlt(HINSTANCE hinst, USHORT id)
 {
     UINT idRsrcBlk = id / 16 + 1;
@@ -123 +123 @@
 }
 
+namespace {
+
 // http://msdn.microsoft.com/en-us/library/ms648010.aspx
 struct ACCELTABLEENTRY
@@ -138 +140 @@
 }
 
-HACCEL LoadAccelerators(HINSTANCE hinst, USHORT id)
+} // unnamed namespace
+
+HACCEL LoadAcceleratorsAlt(HINSTANCE hinst, USHORT id)
 {
     using namespace boost::adaptors;
@@ -161 +165 @@
 }
 
-HMENU LoadMenu(HINSTANCE hinst, USHORT id)
+HMENU LoadMenuAlt(HINSTANCE hinst, USHORT id)
 {
     return LoadMenuIndirect(GetResource(hinst, id, RT_MENU));

branches/egtra/ab5.0/abdev/abdev-impl/Resource/Load.h

@@ -7 +7 @@
 namespace ActiveBasic { namespace Resource {
 
-HICON LoadIcon(HINSTANCE hinst, USHORT id, int cxDesired, int cyDesired, UINT load = 0);
-HICON LoadIcon(HINSTANCE hinst, USHORT id);
+HICON LoadIconAlt(HINSTANCE hinst, USHORT id, int cxDesired, int cyDesired, UINT load = 0);
+HICON LoadIconAlt(HINSTANCE hinst, USHORT id);
 
-HCURSOR LoadCursor(HINSTANCE hinst, USHORT id);
+HCURSOR LoadCursorAlt(HINSTANCE hinst, USHORT id);
 
-boost::optional<std::wstring> LoadString(HINSTANCE hinst, USHORT id);
+boost::optional<std::wstring> LoadStringAlt(HINSTANCE hinst, USHORT id);
 
-HACCEL LoadAccelerators(HINSTANCE hinst, USHORT id);
+HACCEL LoadAcceleratorsAlt(HINSTANCE hinst, USHORT id);
 
-HMENU LoadMenu(HINSTANCE hinst, USHORT id);
+HMENU LoadMenuAlt(HINSTANCE hinst, USHORT id);
 
 struct IconDeleter