diff options
author | George Hazan <george.hazan@gmail.com> | 2014-01-14 22:55:55 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2014-01-14 22:55:55 +0000 |
commit | ab51786ccf2e10217fe25c2dae5de1b2609e76cf (patch) | |
tree | 76f539beecb6e6af20ebbd6f60cba6e4fa20678d /src/core/stdchat | |
parent | 425f1b7f87d7599589252545156f0b993b55825f (diff) |
fix for the options reading
git-svn-id: http://svn.miranda-ng.org/main/trunk@7660 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core/stdchat')
-rw-r--r-- | src/core/stdchat/src/chat.h | 42 | ||||
-rw-r--r-- | src/core/stdchat/src/services.cpp | 2 | ||||
-rw-r--r-- | src/core/stdchat/src/tools.cpp | 4 | ||||
-rw-r--r-- | src/core/stdchat/src/window.cpp | 2 |
4 files changed, 25 insertions, 25 deletions
diff --git a/src/core/stdchat/src/chat.h b/src/core/stdchat/src/chat.h index f22487dabd..da522f8b67 100644 --- a/src/core/stdchat/src/chat.h +++ b/src/core/stdchat/src/chat.h @@ -128,36 +128,36 @@ void LoadLogIcons(void); //colorchooser.c
INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-//log.c
-void Log_StreamInEvent(HWND hwndDlg, LOGINFO* lin, SESSION_INFO *si, BOOL bRedraw, BOOL bPhaseTwo);
-void ValidateFilename (TCHAR * filename);
+// log.c
+void Log_StreamInEvent(HWND hwndDlg, LOGINFO* lin, SESSION_INFO *si, BOOL bRedraw, BOOL bPhaseTwo);
+void ValidateFilename (TCHAR * filename);
TCHAR* MakeTimeStamp(TCHAR* pszStamp, time_t time);
-char* Log_CreateRtfHeader(MODULEINFO * mi);
+char* Log_CreateRtfHeader(MODULEINFO * mi);
-//window.c
+// window.c
INT_PTR CALLBACK RoomWndProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam);
int GetTextPixelSize( TCHAR* pszText, HFONT hFont, BOOL bWidth);
-//options.c
-int OptionsInit(void);
-int OptionsUnInit(void);
-void AddIcons(void);
-HICON LoadIconEx(char* pszIcoLibName, BOOL big);
+// options.c
+int OptionsInit(void);
+int OptionsUnInit(void);
+void AddIcons(void);
+HICON LoadIconEx(char* pszIcoLibName, BOOL big);
// services.c
-void ShowRoom(SESSION_INFO *si, WPARAM wp, BOOL bSetForeground);
-//tools.c
-int GetColorIndex(const char* pszModule, COLORREF cr);
-void CheckColorsInModule(const char* pszModule);
-int GetRichTextLength(HWND hwnd);
-UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO *si, TCHAR* pszUID, TCHAR* pszWordText);
-void DestroyGCMenu(HMENU *hMenu, int iIndex);
-BOOL DoEventHookAsync(HWND hwnd, const TCHAR *pszID, const char* pszModule, int iType, TCHAR* pszUID, TCHAR* pszText, DWORD dwItem);
-BOOL DoEventHook(const TCHAR *pszID, const char* pszModule, int iType, const TCHAR* pszUID, const TCHAR* pszText, DWORD dwItem);
+void ShowRoom(SESSION_INFO *si, WPARAM wp, BOOL bSetForeground);
+
+// tools.c
+int GetColorIndex(const char* pszModule, COLORREF cr);
+void CheckColorsInModule(const char* pszModule);
+int GetRichTextLength(HWND hwnd);
+UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO *si, TCHAR* pszUID, TCHAR* pszWordText);
+void DestroyGCMenu(HMENU *hMenu, int iIndex);
+BOOL DoEventHookAsync(HWND hwnd, const TCHAR *pszID, const char* pszModule, int iType, TCHAR* pszUID, TCHAR* pszText, DWORD dwItem);
// message.c
-char* Message_GetFromStream(HWND hwndDlg, SESSION_INFO *si);
-TCHAR* DoRtfToTags( char* pszRtfText, SESSION_INFO *si);
+char* Message_GetFromStream(HWND hwndDlg, SESSION_INFO *si);
+TCHAR* DoRtfToTags( char* pszRtfText, SESSION_INFO *si);
BOOL TabM_AddTab(const TCHAR *pszID, const char* pszModule);
BOOL TabM_RemoveAll(void);
diff --git a/src/core/stdchat/src/services.cpp b/src/core/stdchat/src/services.cpp index 57d6258128..02b129554c 100644 --- a/src/core/stdchat/src/services.cpp +++ b/src/core/stdchat/src/services.cpp @@ -52,7 +52,7 @@ void ShowRoom(SESSION_INFO *si, WPARAM wp, BOOL bSetForeground) g_TabSession.lpCurrentCommand = NULL;
}
- //Do we need to create a tabbed window?
+ // Do we need to create a tabbed window?
if (g_TabSession.hWnd == NULL)
g_TabSession.hWnd = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_CHANNEL), NULL, RoomWndProc, (LPARAM)&g_TabSession);
diff --git a/src/core/stdchat/src/tools.cpp b/src/core/stdchat/src/tools.cpp index 4b34b12b30..072bf6f359 100644 --- a/src/core/stdchat/src/tools.cpp +++ b/src/core/stdchat/src/tools.cpp @@ -74,11 +74,11 @@ void CheckColorsInModule(const char* pszModule) UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO *si, TCHAR* pszUID, TCHAR* pszWordText)
{
- GCMENUITEMS gcmi = { 0 };
HMENU hSubMenu = 0;
-
*hMenu = GetSubMenu(g_hMenu, iIndex);
TranslateMenu(*hMenu);
+
+ GCMENUITEMS gcmi = { 0 };
gcmi.pszID = si->ptszID;
gcmi.pszModule = si->pszModule;
gcmi.pszUID = pszUID;
diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp index a12be7920c..6987e6b20c 100644 --- a/src/core/stdchat/src/window.cpp +++ b/src/core/stdchat/src/window.cpp @@ -2367,7 +2367,7 @@ LABEL_SHOWWINDOW: si->bNicklistEnabled = !si->bNicklistEnabled;
- SendDlgItemMessage(hwndDlg,IDC_SHOWNICKLIST,BM_SETIMAGE,IMAGE_ICON,(LPARAM)LoadIconEx( si->bNicklistEnabled ? "nicklist" : "nicklist2", FALSE ));
+ SendDlgItemMessage(hwndDlg, IDC_SHOWNICKLIST, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadIconEx(si->bNicklistEnabled ? "nicklist" : "nicklist2", FALSE));
SendMessage(hwndDlg, GC_SCROLLTOBOTTOM, 0, 0);
SendMessage(hwndDlg, WM_SIZE, 0, 0);
break;
|