- adaptation for standard Windows ways of handling Unicode;

- obsoleted code removed;
- code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@8407 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 27 insertions, 27 deletions

diff --git a/plugins/HistoryStats/src/optionsctrlimpl.h b/plugins/HistoryStats/src/optionsctrlimpl.h
index 43313ac195..7ad304ce85 100644
--- a/plugins/HistoryStats/src/optionsctrlimpl.h
+++ b/plugins/HistoryStats/src/optionsctrlimpl.h
@@ -76,7 +76,7 @@ private:
 		DWORD m_dwData;

 

 	protected:

-		explicit Item(OptionsCtrlImpl* pCtrl, ItemType ItemType, const mu_text* szLabel, DWORD dwFlags, DWORD dwData);

+		explicit Item(OptionsCtrlImpl* pCtrl, ItemType ItemType, const TCHAR* szLabel, DWORD dwFlags, DWORD dwData);

 

 		void enableChilds(bool bEnable);

 

@@ -91,8 +91,8 @@ private:
 		virtual void setEnabled(bool bEnable) = 0;

 		virtual void childAdded(Item* pChild) = 0;

 

-		virtual void setLabel(const mu_text* szLabel);

-		virtual const mu_text* getLabel() { return m_strLabel.c_str(); }

+		virtual void setLabel(const TCHAR* szLabel);

+		virtual const TCHAR* getLabel() { return m_strLabel.c_str(); }

 	};

 

 	class Group

@@ -102,7 +102,7 @@ private:
 		bool m_bDrawLine;

 

 	public:

-		explicit Group(OptionsCtrlImpl* pCtrl, Item* pParent, const mu_text* szLabel, DWORD dwFlags, DWORD dwData);

+		explicit Group(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, DWORD dwFlags, DWORD dwData);

 

 		virtual void setEnabled(bool bEnable);

 		virtual void childAdded(Item* pChild);

@@ -122,7 +122,7 @@ private:
 		void updateItem();

 

 	public:

-		explicit Check(OptionsCtrlImpl* pCtrl, Item* pParent, const mu_text* szLabel, DWORD dwFlags, DWORD dwData);

+		explicit Check(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, DWORD dwFlags, DWORD dwData);

 

 		virtual void onToggle();

 

@@ -171,7 +171,7 @@ private:
 		void updateItem();

 

 	public:

-		explicit Radio(OptionsCtrlImpl* pCtrl, Item* pParent, Radio* pSibling, const mu_text* szLabel, DWORD dwFlags, DWORD dwData);

+		explicit Radio(OptionsCtrlImpl* pCtrl, Item* pParent, Radio* pSibling, const TCHAR* szLabel, DWORD dwFlags, DWORD dwData);

 		virtual ~Radio();

 

 		virtual void onToggle();

@@ -196,7 +196,7 @@ private:
 		ext::string getCombinedText();

 

 	public:

-		explicit Edit(OptionsCtrlImpl* pCtrl, Item* pParent, const mu_text* szLabel, const mu_text* szEdit, DWORD dwFlags, DWORD dwData);

+		explicit Edit(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szEdit, DWORD dwFlags, DWORD dwData);

 

 		virtual void onToggle() { onActivate(); }

 		virtual void onSelect();

@@ -206,10 +206,10 @@ private:
 		virtual void setEnabled(bool bEnable);

 		virtual void childAdded(Item* pChild);

 

-		virtual void setLabel(const mu_text* szLabel);

+		virtual void setLabel(const TCHAR* szLabel);

 

-		const mu_text* getString();

-		void setString(const mu_text* szString);

+		const TCHAR* getString();

+		void setString(const TCHAR* szString);

 		int getNumber() { return _ttoi(getString()); }

 		void setNumber(int nNumber) { setString(utils::intToString(nNumber).c_str()); }

 	};

@@ -230,7 +230,7 @@ private:
 		ext::string getCombinedText();

 

 	public:

-		explicit Combo(OptionsCtrlImpl* pCtrl, Item* pParent, const mu_text* szLabel, DWORD dwFlags, DWORD dwData);

+		explicit Combo(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, DWORD dwFlags, DWORD dwData);

 

 		virtual void onToggle() { onActivate(); }

 		virtual void onSelect();

@@ -240,9 +240,9 @@ private:
 		virtual void setEnabled(bool bEnable);

 		virtual void childAdded(Item* pChild);

 

-		virtual void setLabel(const mu_text* szLabel);

+		virtual void setLabel(const TCHAR* szLabel);

 

-		void addItem(const mu_text* szItem);

+		void addItem(const TCHAR* szItem);

 		int getSelected();

 		void setSelected(int nSelect);

 		void onSelChanged();

@@ -256,7 +256,7 @@ private:
 		HWND m_hButtonWnd;

 

 	public:

-		explicit Button(OptionsCtrlImpl* pCtrl, Item* pParent, const mu_text* szLabel, const mu_text* szButton, DWORD dwFlags, DWORD dwData);

+		explicit Button(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szButton, DWORD dwFlags, DWORD dwData);

 

 		virtual void onToggle() { onActivate(); }

 		virtual void onSelect();

@@ -266,7 +266,7 @@ private:
 		virtual void setEnabled(bool bEnable);

 		virtual void childAdded(Item* pChild);

 

-		virtual void setLabel(const mu_text* szLabel);

+		virtual void setLabel(const TCHAR* szLabel);

 	};

 

 	class DateTime

@@ -294,7 +294,7 @@ private:
 		ext::string getCombinedText();

 

 	public:

-		explicit DateTime(OptionsCtrlImpl* pCtrl, Item* pParent, const mu_text* szLabel, const mu_text* szFormat, DWORD dwTimestamp, DWORD dwFlags, DWORD dwData);

+		explicit DateTime(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szFormat, DWORD dwTimestamp, DWORD dwFlags, DWORD dwData);

 

 		virtual void onToggle() { onActivate(); }

 		virtual void onSelect();

@@ -304,7 +304,7 @@ private:
 		virtual void setEnabled(bool bEnable);

 		virtual void childAdded(Item* pChild);

 

-		virtual void setLabel(const mu_text* szLabel);

+		virtual void setLabel(const TCHAR* szLabel);

 

 		bool isNone();

 		void setNone();

@@ -325,7 +325,7 @@ private:
 		COLORREF getColorValue();

 

 	public:

-		explicit Color(OptionsCtrlImpl* pCtrl, Item* pParent, const mu_text* szLabel, COLORREF crColor, DWORD dwFlags, DWORD dwData);

+		explicit Color(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, COLORREF crColor, DWORD dwFlags, DWORD dwData);

 

 		virtual void onToggle() { onActivate(); }

 		virtual void onSelect();

@@ -335,7 +335,7 @@ private:
 		virtual void setEnabled(bool bEnable);

 		virtual void childAdded(Item* pChild);

 

-		virtual void setLabel(const mu_text* szLabel);

+		virtual void setLabel(const TCHAR* szLabel);

 

 		COLORREF getColor();

 		void setColor(COLORREF crColor);

@@ -343,7 +343,7 @@ private:
 	};

 

 private:

-	static const mu_text* m_ClassName;

+	static const TCHAR* m_ClassName;

 	static HIMAGELIST m_hStateIcons;

 	static int m_nStateIconsRef;

 

@@ -402,8 +402,8 @@ private:
 	HTREEITEM onOCMInsertButton(HTREEITEM hParent, OCBUTTON* pButton);

 	HTREEITEM onOCMInsertDateTime(HTREEITEM hParent, OCDATETIME* pDateTime);

 	HTREEITEM onOCMInsertColor(HTREEITEM hParent, OCCOLOR* pColor);

-	const mu_text* onOCMGetItemLabel(HTREEITEM hItem);

-	void onOCMSetItemLabel(HTREEITEM hItem, const mu_text* szLabel);

+	const TCHAR* onOCMGetItemLabel(HTREEITEM hItem);

+	void onOCMSetItemLabel(HTREEITEM hItem, const TCHAR* szLabel);

 	bool onOCMIsItemEnabled(HTREEITEM hItem);

 	void onOCMEnableItem(HTREEITEM hItem, bool bEnable);

 	DWORD onOCMGetItemData(HTREEITEM hItem);

@@ -414,9 +414,9 @@ private:
 	void onOCMSetRadioChecked(HTREEITEM hRadio, int nCheck);

 	int onOCMGetEditNumber(HTREEITEM hEdit);

 	void onOCMSetEditNumber(HTREEITEM hEdit, int nNumber);

-	const mu_text* onOCMGetEditString(HTREEITEM hEdit);

-	void onOCMSetEditString(HTREEITEM hEdit, const mu_text *szString);

-	void onOCMAddComboItem(HTREEITEM hCombo, const mu_text* szItem);

+	const TCHAR* onOCMGetEditString(HTREEITEM hEdit);

+	void onOCMSetEditString(HTREEITEM hEdit, const TCHAR *szString);

+	void onOCMAddComboItem(HTREEITEM hCombo, const TCHAR* szItem);

 	int onOCMGetComboSelected(HTREEITEM hCombo);

 	void onOCMSetComboSelected(HTREEITEM hCombo, int nSelect);

 	void onOCMEnsureVisible(HTREEITEM hItem);

@@ -434,13 +434,13 @@ private:
 	void onOCMSetItemColor(HTREEITEM hColor, COLORREF crColor);

 

 private:

-	void insertItem(Item* pParent, Item* pItem, const mu_text* szNodeText, DWORD dwFlags, int iImage);

+	void insertItem(Item* pParent, Item* pItem, const TCHAR* szNodeText, DWORD dwFlags, int iImage);

 	void setModified(Item* pItem, bool bModified = true);

 	bool isItemValid(HTREEITEM hItem);

 	Item* getItem(HTREEITEM hItem);

 	void setItem(HTREEITEM hItem, Item* pItem);

 	void setStateImage(HTREEITEM hItem, int iImage);

-	void setNodeText(HTREEITEM hItem, const mu_text* szNodeText);

+	void setNodeText(HTREEITEM hItem, const TCHAR* szNodeText);

 	bool getItemFreeRect(HTREEITEM hItem, RECT& outRect);

 };