summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-06-20 23:51:53 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-06-20 23:51:53 +0000
commit57abc51aad272a656282a52a460a47abe24e07d6 (patch)
treec6f3538e63c9c736cfa7129423d1b498273278b6 /include
parentb9f120f97699286410fe902f93135235eed0b127 (diff)
- MS_SKIN2_ADDICON replaced with Skin_AddIcon;
- SKINICONDESC_SIZE* constants removed and replaced with sizeof(sid); - added SIDF_PATH_UNICODE for all plugins; - dynamic translation fixed in the icolib options dialog git-svn-id: http://svn.miranda-ng.org/main/trunk@507 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include')
-rw-r--r--include/m_icolib.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/include/m_icolib.h b/include/m_icolib.h
index f9056b2a58..1ec7ee74f7 100644
--- a/include/m_icolib.h
+++ b/include/m_icolib.h
@@ -24,14 +24,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef M_ICOLIB_H__
#define M_ICOLIB_H__ 1
-#define SKINICONDESC_SIZE sizeof(SKINICONDESC) // v0.0.1.0+
-#define SKINICONDESC_SIZE_V1 (offsetof(SKINICONDESC, hDefaultIcon))
-#define SKINICONDESC_SIZE_V2 (offsetof(SKINICONDESC, cx)) // v0.0.0.2+
-#define SKINICONDESC_SIZE_V3 (offsetof(SKINICONDESC, flags)) // v0.0.0.3+
+extern int hLangpack;
// WARNING: do not use Translate(TS) for p(t)szSection or p(t)szDescription as they
// are translated by the core, which may lead to double translation.
// Use LPGEN instead which are just dummy wrappers/markers for "lpgen.pl".
+
typedef struct {
size_t cbSize;
union {
@@ -71,17 +69,14 @@ typedef struct {
#define SIDF_ALL_TCHAR 0
#endif
-//
// Add a icon into options UI
//
// wParam = (WPARAM)0
// lParam = (LPARAM)(SKINICONDESC*)sid;
// returns a handle to the newly added item
-//
-#define MS_SKIN2_ADDICON "Skin2/Icons/AddIcon"
__inline static HANDLE Skin_AddIcon(SKINICONDESC* si)
-{ return (HANDLE)CallService(MS_SKIN2_ADDICON, 0, (LPARAM)si);
+{ return (HANDLE)CallService("Skin2/Icons/AddIcon", hLangpack, (LPARAM)si);
}
//