diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-01-15 08:13:02 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-01-15 08:13:02 +0000 |
| commit | b4b7fadea31c8a909cefe50051691aa3e883d45d (patch) | |
| tree | a1155789e8d16895e59e647fea27a86ffe7a5fbc /src/core | |
| parent | ab51786ccf2e10217fe25c2dae5de1b2609e76cf (diff) | |
project fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@7661 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/stdchat/src/options.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdchat/src/window.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp index 430fc2cfd9..2b5b9dacd9 100644 --- a/src/core/stdchat/src/options.cpp +++ b/src/core/stdchat/src/options.cpp @@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "resource.h"
#include "chat.h"
-#include <m_fontservice.h>
-
struct branch_t
{
const TCHAR* szDescr;
diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp index 6987e6b20c..0ad24af67e 100644 --- a/src/core/stdchat/src/window.cpp +++ b/src/core/stdchat/src/window.cpp @@ -1095,7 +1095,7 @@ static int RestoreWindowPosition(HWND hwnd, HANDLE hContact, char * szModule, ch return 1;
}
-int GetTextPixelSize( TCHAR* pszText, HFONT hFont, BOOL bWidth)
+int GetTextPixelSize(TCHAR* pszText, HFONT hFont, BOOL bWidth)
{
if (!pszText || !hFont)
return 0;
@@ -1202,8 +1202,8 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) // LoadGlobalSettings(); !!!!!!!!!!!!!!!!!!!!!!
InitButtons(hwndDlg, si);
- HICON hIcon = si->wStatus==ID_STATUS_ONLINE?pci->MM_FindModule(si->pszModule)->hOnlineIcon:pci->MM_FindModule(si->pszModule)->hOfflineIcon;
// stupid hack to make icons show. I dunno why this is needed currently
+ HICON hIcon = si->wStatus == ID_STATUS_ONLINE ? pci->MM_FindModule(si->pszModule)->hOnlineIcon : pci->MM_FindModule(si->pszModule)->hOfflineIcon;
if (!hIcon) {
pci->MM_IconsChanged();
hIcon = (si->wStatus == ID_STATUS_ONLINE) ? pci->MM_FindModule(si->pszModule)->hOnlineIcon : pci->MM_FindModule(si->pszModule)->hOfflineIcon;
|