From e5cb033463036b182fb6e5e3eed50a14987f5300 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 7 Jun 2015 18:19:34 +0000
Subject: SKINICONDESC -> MAllStrings

git-svn-id: http://svn.miranda-ng.org/main/trunk@14054 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 include/delphi/m_icolib.inc |  1 -
 include/m_icolib.h          | 29 ++++++++---------------------
 2 files changed, 8 insertions(+), 22 deletions(-)

(limited to 'include')

diff --git a/include/delphi/m_icolib.inc b/include/delphi/m_icolib.inc
index cb033101d0..f20a919b17 100644
--- a/include/delphi/m_icolib.inc
+++ b/include/delphi/m_icolib.inc
@@ -7,7 +7,6 @@ type
 // Use LPGEN instead which are just dummy wrappers/markers for "lpgen.pl".
   PSKINICONDESC = ^TSKINICONDESC;
   TSKINICONDESC = record
-    cbSize         :int;
     szSection      :TChar; // [TRANSLATED-BY-CORE] section name used to group icons
     szDescription  :TChar; // [TRANSLATED-BY-CORE] description for options dialog
     pszName        :PAnsiChar; // name to refer to icon when playing and in db
diff --git a/include/m_icolib.h b/include/m_icolib.h
index a684e53336..de1c388b53 100644
--- a/include/m_icolib.h
+++ b/include/m_icolib.h
@@ -33,27 +33,14 @@ extern int hLangpack;
 // Use LPGEN instead which are just dummy wrappers/markers for "lpgen.pl".
 
 typedef struct {
-  size_t cbSize;
-  union {
-    char *pszSection;         // section name used to group icons
-    TCHAR *ptszSection;       // [TRANSLATED-BY-CORE]
-    WCHAR *pwszSection;
-  };
-  union {
-    char *pszDescription;     // description for options dialog
-    TCHAR *ptszDescription;   // [TRANSLATED-BY-CORE]
-    WCHAR *pwszDescription;
-  };
-  char *pszName;              // name to refer to icon when playing and in db
-  union {
-    char *pszDefaultFile;     // default icon file to use
-    TCHAR *ptszDefaultFile;
-    WCHAR *pwszDefaultFile;
-  };
-  int  iDefaultIndex;         // index of icon in default file
-  HICON hDefaultIcon;         // handle to default icon
-  int cx,cy;                  // dimensions of icon (if 0 then standard size icon (big and small options available)
-  int flags;                  // combination of SIDF_*
+	MAllStrings section;     // section name used to group icons
+	MAllStrings description; // description for options dialog
+	char *pszName;           // name to refer to icon when playing and in db
+	MAllStrings defaultFile; // default icon file to use
+	int   iDefaultIndex;     // index of icon in default file
+	HICON hDefaultIcon;      // handle to default icon
+	int   cx,cy;             // dimensions of icon (if 0 then standard size icon (big and small options available)
+	int   flags;             // combination of SIDF_*
 } SKINICONDESC;
 
 #define SIDF_SORTED       0x01    // Icons in section are sorted by name
-- 
cgit v1.2.3