diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2014-12-21 08:17:45 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2014-12-21 08:17:45 +0000 |
| commit | b3ded48d866f59df3c9e8634eabe6e62596ad2d5 (patch) | |
| tree | a7a9f2cdd1a9846b7445e8ec6babbecee79c8c0b /plugins/Popup/src/skin.h | |
| parent | b2ba573600e650273800774c7fad23268019a353 (diff) | |
Popup: changed warning level to w4
git-svn-id: http://svn.miranda-ng.org/main/trunk@11550 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Popup/src/skin.h')
| -rw-r--r-- | plugins/Popup/src/skin.h | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/plugins/Popup/src/skin.h b/plugins/Popup/src/skin.h index f6d95da214..28726cbf28 100644 --- a/plugins/Popup/src/skin.h +++ b/plugins/Popup/src/skin.h @@ -2,9 +2,9 @@ Popup Plus plugin for Miranda IM
Copyright © 2002 Luca Santarelli,
- © 2004-2007 Victor Pavlychko
- © 2010 MPK
- © 2010 Merlin_de
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -36,38 +36,38 @@ public: enum
{
ST_TYPEMASK = 0x07,
- ST_NOTHING = 0x00,
- ST_ICON = 0x01,
- ST_TEXT = 0x02,
- ST_TITLE = 0x03,
- ST_BITMAP = 0x04,
+ ST_NOTHING = 0x00,
+ ST_ICON = 0x01,
+ ST_TEXT = 0x02,
+ ST_TITLE = 0x03,
+ ST_BITMAP = 0x04,
ST_MYBITMAP = 0x05,
- ST_AVATAR = 0x06,
- ST_CLOCK = 0x07,
+ ST_AVATAR = 0x06,
+ ST_CLOCK = 0x07,
- ST_STRETCH = 0x08,
- ST_MONO = 0x10,
- ST_BLEND = 0x20,
- ST_BADPOS = 0x40
+ ST_STRETCH = 0x08,
+ ST_MONO = 0x10,
+ ST_BLEND = 0x20,
+ ST_BADPOS = 0x40
};
enum
{
- DF_STATIC = 0x01,
- DF_ANIMATE = 0x02,
- DF_ALL = 0xff
+ DF_STATIC = 0x01,
+ DF_ANIMATE = 0x02,
+ DF_ALL = 0xff
};
enum
{
- // left, separator, digits, am/pm, right
+ // left, separator, digits, am/pm, right
CLOCK_LEFT = 0,
CLOCK_SEPARATOR = 1,
CLOCK_DIGITS = 2,
CLOCK_AM = 12,
CLOCK_PM = 13,
CLOCK_RIGHT = 14,
- CLOCK_ITEMS = 1+1+10+2+1
+ CLOCK_ITEMS = 1 + 1 + 10 + 2 + 1
};
struct SKINELEMENT
@@ -88,7 +88,7 @@ public: int proportional;
COLORREF textColor;
SKINELEMENT *next;
- };
+ };
struct RenderInfo
{
@@ -128,7 +128,7 @@ public: ~PopupSkin();
void measure(HDC hdc, PopupWnd2 *wnd, int maxw, POPUPOPTIONS *options) const;
- void display(MyBitmap *bmp, PopupWnd2 *wnd, int maxw, POPUPOPTIONS *options, DWORD drawFlags=DF_ALL) const;
+ void display(MyBitmap *bmp, PopupWnd2 *wnd, POPUPOPTIONS *options, DWORD drawFlags = DF_ALL) const;
bool onMouseMove(PopupWnd2 *wnd, int x, int y) const;
bool onMouseLeave(PopupWnd2 *wnd) const;
@@ -140,18 +140,18 @@ public: int useInternalClock() const { return m_internalClock; }
int getLegacyRegionOpacity() const { return m_legacy_region_opacity; }
int getShadowRegionOpacity() const { return m_shadow_region_opacity; }
- bool isCompatible() const { return (DWORD) m_popup_version <= (DWORD) pluginInfoEx.version; }
+ bool isCompatible() const { return (DWORD)m_popup_version <= (DWORD)pluginInfoEx.version; }
const LPTSTR getName() const { return m_name; }
- const char *getFlagName(int id) const { return m_flag_names[id-1]; }
- bool getFlag(int id) const { return (m_flags & (1 << (id-1))) != 0; }
+ const char *getFlagName(int id) const { return m_flag_names[id - 1]; }
+ bool getFlag(int id) const { return (m_flags & (1 << (id - 1))) != 0; }
void setFlag(int id, bool val) const
{
if (val)
- m_flags |= 1 << (id-1);
+ m_flags |= 1 << (id - 1);
else
- m_flags &= ~(1 << (id-1));
+ m_flags &= ~(1 << (id - 1));
}
void saveOpts() const;
@@ -176,7 +176,7 @@ public: Skins();
~Skins();
- bool load(LPCTSTR dir);
+ bool load();
const PopupSkin *getSkin(LPCTSTR name);
const SKINLIST *getSkinList() const { return m_skins; }
|