| Index: core/fxge/apple/fx_mac_imp.cpp
|
| diff --git a/core/fxge/apple/fx_mac_imp.cpp b/core/fxge/apple/fx_mac_imp.cpp
|
| index 16dd4aef66d5b73194225205a127be5a803a6ac8..a0f2acb37056387246d20c990166240f0a16b298 100644
|
| --- a/core/fxge/apple/fx_mac_imp.cpp
|
| +++ b/core/fxge/apple/fx_mac_imp.cpp
|
| @@ -74,7 +74,7 @@ void* CFX_MacFontInfo::MapFont(int weight,
|
| return GetFont("Courier New");
|
| }
|
| if (charset == FXFONT_ANSI_CHARSET || charset == FXFONT_SYMBOL_CHARSET) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| switch (charset) {
|
| case FXFONT_SHIFTJIS_CHARSET:
|
| @@ -93,7 +93,7 @@ void* CFX_MacFontInfo::MapFont(int weight,
|
| if (it != m_FontList.end())
|
| return it->second;
|
|
|
| - return NULL;
|
| + return nullptr;
|
| }
|
|
|
| std::unique_ptr<IFX_SystemFontInfo> IFX_SystemFontInfo::CreateDefault(
|
| @@ -111,6 +111,6 @@ void CFX_GEModule::InitPlatform() {
|
| }
|
| void CFX_GEModule::DestroyPlatform() {
|
| delete (CApplePlatform*)m_pPlatformData;
|
| - m_pPlatformData = NULL;
|
| + m_pPlatformData = nullptr;
|
| }
|
| #endif
|
|
|