utils: sync with berliOS

git-svn-id: http://pescuma.googlecode.com/svn/trunk/Miranda@186 c086bb3d-8645-0410-b8da-73a8550f86e7

1 files changed, 3 insertions, 0 deletions

diff --git a/Plugins/utils/mir_options.h b/Plugins/utils/mir_options.h
index c392373..31b757b 100644
--- a/Plugins/utils/mir_options.h
+++ b/Plugins/utils/mir_options.h
@@ -34,6 +34,8 @@ Boston, MA 02111-1307, USA.
 #define CONTROL_COMBO_TEXT 7		// Stored as TCHARs, max len 1024

 #define CONTROL_COMBO_ITEMDATA 8	// Stored as TCHARs, max len 1024

 #define CONTROL_FILE 9				// Stored as TCHARs, max len 1024

+#define CONTROL_INT 10				// Stored as DWORD

+#define CONTROL_PASSWORD 11			// Stored as chars, max len 1024

 

 

 typedef BOOL (* FPAllowProtocol) (const char *proto);

@@ -46,6 +48,7 @@ typedef struct {
 	union {

 		DWORD dwDefValue;

 		TCHAR *tszDefValue;

+		char *szDefValue;

 	};

 	union {

 		int nIDSpin;