compilation fix

miranda-ng · Mar 12, 2023 · 80bf10f · 80bf10f
1 parent c3047f0
commit 80bf10f
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 53 deletions.
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
@@ -309,8 +309,8 @@ LRESULT CALLBACK SplitterSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-CMsgDialog::CMsgDialog(MCONTACT hContact) :
-	CSuper(g_plugin, IDD_MSGSPLITNEW),
+CMsgDialog::CMsgDialog(int iDlgId, MCONTACT hContact) :
+	CSuper(g_plugin, iDlgId),
 	m_pPanel(this),
 	timerAwayMsg(this, 4),
 	m_btnAdd(this, IDC_ADD),

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
@@ -315,7 +315,7 @@ void TSAPI CreateNewTabForContact(TContainerData *pContainer, MCONTACT hContact,
 	if (bActivateTab)
 		TabCtrl_SetCurSel(pContainer->m_hwndTabs, iTabId);
 
-	CMsgDialog *pWindow = new CMsgDialog(hContact);
+	CMsgDialog *pWindow = new CMsgDialog(IDD_MSGSPLITNEW, hContact);
 	pWindow->m_iTabID = iTabId;
 	pWindow->m_pContainer = pContainer;
 	pContainer->m_iChilds++;

diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
@@ -602,7 +602,7 @@ class CMsgDialog : public CSrmmBaseDialog
 	CCtrlButton m_btnAdd, m_btnQuote, m_btnCancelAdd;
 
 public:
-	CMsgDialog(MCONTACT hContact);
+	CMsgDialog(int dlgId, MCONTACT hContact);
 	CMsgDialog(SESSION_INFO *si);
 	~CMsgDialog();
 
@@ -621,11 +621,11 @@ class CMsgDialog : public CSrmmBaseDialog
 
 	void onDblClick_List(CCtrlListBox *);
 
-	int OnFilter(MSGFILTER *);
+	int  OnFilter(MSGFILTER *);
 
 	bool OnInitDialog() override;
 	void OnDestroy() override;
-	int Resizer(UTILRESIZECONTROL *urc) override;
+	int  Resizer(UTILRESIZECONTROL *urc) override;
 
 	INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override;
 	LRESULT WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) override;
@@ -668,43 +668,44 @@ class CMsgDialog : public CSrmmBaseDialog
 
 	void LogEvent(DBEVENTINFO &dbei);
 
-	void    DM_OptionsApplied(bool bRemakeLog = true);
-	void    DM_RecalcPictureSize(void);
-	void    DM_ScrollToBottom(WPARAM wParam, LPARAM lParam);
-
-	void    ActivateTooltip(int iCtrlId, const wchar_t *pwszMessage);
-	void    CheckStatusIconClick(POINT pt, const RECT &rc, int gap, int code);
-	void    DrawStatusIcons(HDC hDC, const RECT &rc, int gap);
-	void    EnableSendButton(bool bMode) const;
-	void    EnableSending(bool bMode) const;
-	void    FormatRaw(CMStringW&, int flags, bool isSent);
-	bool    FormatTitleBar(const wchar_t *szFormat, CMStringW &dest);
-	bool    GetAvatarVisibility(void);
-	void    GetClientIcon(void);
-	HICON   GetMyContactIcon(const CMOption<bool> *opt);
-	void    GetMyNick(void);
-	HICON   IconFromAvatar(void) const;
-	void    KbdState(bool &isShift, bool &isControl, bool &isAlt);
-	void    LimitMessageText(int iLen);
-	int     LoadLocalFlags(void);
-	void    NotifyDeliveryFailure(void) const;
-	void    RemakeLog(void);
-	void    SaveSplitter(void);
-	void    SelectContainer(void);
-	void    SetDialogToType(void);
-	void    ShowPicture(bool showNewPic);
-	void    SplitterMoved(int x, HWND hwnd);
-	void    SwitchToContainer(const wchar_t *szNewName);
-	int     Typing(int secs);
-	void    UpdateReadChars(void) const;
-	void    UpdateSaveAndSendButton(void);
-
-	int     MsgWindowDrawHandler(DRAWITEMSTRUCT *dis);
-	int     MsgWindowMenuHandler(int selection, int menuId);
-	int     MsgWindowUpdateMenu(HMENU submenu, int menuID);
-
-	void    RenderToolbarBG(HDC hdc, const RECT &rcWindow) const;
-	void    UpdateToolbarBG(void);
+	void DM_OptionsApplied(bool bRemakeLog = true);
+	void DM_RecalcPictureSize(void);
+	void DM_ScrollToBottom(WPARAM wParam, LPARAM lParam);
+
+	void ActivateTooltip(int iCtrlId, const wchar_t *pwszMessage);
+	void CheckStatusIconClick(POINT pt, const RECT &rc, int gap, int code);
+	void DrawStatusIcons(HDC hDC, const RECT &rc, int gap);
+	void EnableSendButton(bool bMode) const;
+	void EnableSending(bool bMode) const;
+	void FormatRaw(CMStringW&, int flags, bool isSent);
+	bool FormatTitleBar(const wchar_t *szFormat, CMStringW &dest);
+	bool GetAvatarVisibility(void);
+	void GetClientIcon(void);
+	void GetMyNick(void);
+	void KbdState(bool &isShift, bool &isControl, bool &isAlt);
+	void LimitMessageText(int iLen);
+	int  LoadLocalFlags(void);
+	void NotifyDeliveryFailure(void) const;
+	void RemakeLog(void);
+	void SaveSplitter(void);
+	void SelectContainer(void);
+	void SetDialogToType(void);
+	void ShowPicture(bool showNewPic);
+	void SplitterMoved(int x, HWND hwnd);
+	void SwitchToContainer(const wchar_t *szNewName);
+	int  Typing(int secs);
+	void UpdateReadChars(void) const;
+	void UpdateSaveAndSendButton(void);
+
+	int  MsgWindowDrawHandler(DRAWITEMSTRUCT *dis);
+	int  MsgWindowMenuHandler(int selection, int menuId);
+	int  MsgWindowUpdateMenu(HMENU submenu, int menuID);
+
+	void RenderToolbarBG(HDC hdc, const RECT &rcWindow) const;
+	void UpdateToolbarBG(void);
+
+	HICON GetMyContactIcon(const CMOption<bool> *opt);
+	HICON IconFromAvatar(void) const;
 };
 
 extern LIST<void> g_arUnreadWindows;
@@ -717,21 +718,21 @@ extern LIST<void> g_arUnreadWindows;
 
 struct myTabCtrl
 {
-	HPEN    m_hPenShadow, m_hPenItemShadow, m_hPenLight;
-	HFONT   m_hMenuFont;
+	HPEN     m_hPenShadow, m_hPenItemShadow, m_hPenLight;
+	HFONT    m_hMenuFont;
 	COLORREF colors[10];
-	HBRUSH  m_brushes[4];
-	uint32_t   m_fixedwidth;
-	int     m_bottomAdjust;
+	HBRUSH   m_brushes[4];
+	uint32_t m_fixedwidth;
+	int      m_bottomAdjust;
 };
 
 struct TIconDesc
 {
-	char   *szName;
-	char   *szDesc;
-	HICON  *phIcon;       // where the handle is saved...
-	INT_PTR uId;           // icon ID
-	BOOL    bForceSmall;   // true: force 16x16
+	char    *szName;
+	char    *szDesc;
+	HICON   *phIcon;       // where the handle is saved...
+	INT_PTR  uId;           // icon ID
+	BOOL     bForceSmall;   // true: force 16x16
 };
 
 struct TIconDescW