diff options
| author | George Hazan <ghazan@miranda.im> | 2017-03-27 14:13:09 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-03-27 14:13:09 +0300 |
| commit | 54928843e7fcd6d42be6d8d5d1127830fda97eca (patch) | |
| tree | 4aadd786decd149ac79b96de8de0d9dde2f75315 | |
| parent | d465fca4cc2e6e682fb11b68a22be3962003f307 (diff) | |
fix for a return type
| -rw-r--r-- | include/m_gui.h | 2 | ||||
| -rw-r--r-- | libs/win32/mir_core.lib | bin | 314120 -> 314126 bytes | |||
| -rw-r--r-- | libs/win64/mir_core.lib | bin | 315034 -> 315038 bytes | |||
| -rw-r--r-- | src/mir_core/src/mir_core.def | 2 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core64.def | 2 | ||||
| -rw-r--r-- | src/mir_core/src/ui_utils.cpp | 4 |
6 files changed, 5 insertions, 5 deletions
diff --git a/include/m_gui.h b/include/m_gui.h index 18f47b90c0..462dbd3053 100644 --- a/include/m_gui.h +++ b/include/m_gui.h @@ -505,7 +505,7 @@ public: void Enable(bool bIsEnable = true);
__forceinline void Disable() { Enable(false); }
- BOOL Enabled(void) const;
+ bool Enabled(void) const;
void NotifyChange();
diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib Binary files differindex 7b94503376..f28283c1a0 100644 --- a/libs/win32/mir_core.lib +++ b/libs/win32/mir_core.lib diff --git a/libs/win64/mir_core.lib b/libs/win64/mir_core.lib Binary files differindex 258359bccd..b825069932 100644 --- a/libs/win64/mir_core.lib +++ b/libs/win64/mir_core.lib diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index 68cf90c200..e768d86645 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -578,7 +578,7 @@ mir_wstrcmpi @280 ?EditLabel@CCtrlTreeView@@QAEPAUHWND__@@PAU_TREEITEM@@@Z @743 NONAME
?Enable@CCtrlBase@@QAEX_N@Z @744 NONAME
?EnableGroupView@CCtrlListView@@QAEHH@Z @745 NONAME
-?Enabled@CCtrlBase@@QBEHXZ @746 NONAME
+?Enabled@CCtrlBase@@QBE_NXZ @746 NONAME
?EndEditLabel@CCtrlClc@@QAEX_N@Z @747 NONAME
?EndEditLabelNow@CCtrlTreeView@@QAEXH@Z @748 NONAME
?EnsureVisible@CCtrlClc@@QAEXPAX_N@Z @749 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index 3c4841edfd..9fa749687d 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -578,7 +578,7 @@ mir_wstrcmpi @280 ?EditLabel@CCtrlTreeView@@QEAAPEAUHWND__@@PEAU_TREEITEM@@@Z @743 NONAME
?Enable@CCtrlBase@@QEAAX_N@Z @744 NONAME
?EnableGroupView@CCtrlListView@@QEAAHH@Z @745 NONAME
-?Enabled@CCtrlBase@@QEBAHXZ @746 NONAME
+?Enabled@CCtrlBase@@QEBA_NXZ @746 NONAME
?EndEditLabel@CCtrlClc@@QEAAX_N@Z @747 NONAME
?EndEditLabelNow@CCtrlTreeView@@QEAAXH@Z @748 NONAME
?EnsureVisible@CCtrlClc@@QEAAXPEAX_N@Z @749 NONAME
diff --git a/src/mir_core/src/ui_utils.cpp b/src/mir_core/src/ui_utils.cpp index c11f67240c..bbfc2c205d 100644 --- a/src/mir_core/src/ui_utils.cpp +++ b/src/mir_core/src/ui_utils.cpp @@ -2707,9 +2707,9 @@ void CCtrlBase::Enable(bool bIsEnable) ::EnableWindow(m_hwnd, bIsEnable);
}
-BOOL CCtrlBase::Enabled() const
+bool CCtrlBase::Enabled() const
{
- return (m_hwnd) ? IsWindowEnabled(m_hwnd) : FALSE;
+ return (m_hwnd) ? IsWindowEnabled(m_hwnd) != 0 : false;
}
void CCtrlBase::NotifyChange()
|