diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml
index ce71a1c611..a6ceed0eac 100644
--- a/.github/workflows/code_checks.yml
+++ b/.github/workflows/code_checks.yml
@@ -87,8 +87,10 @@ jobs:
       - name: Check for obsolete macros use
         run: |
             git fetch --depth=1 origin master
-            if git diff origin/master ':!.github/workflows/code_checks.yml' |
-               grep -E '^\+.*(wxOVERRIDE|wxNOEXCEPT|\WNULL)'; then
+            if git diff origin/master \
+               ':!.github/workflows/code_checks.yml' \
+               ':!src/stc/scintilla/' \
+               | grep -E '^\+.*(wxOVERRIDE|wxNOEXCEPT|\WNULL)'; then
               echo "::error ::Please use C++11 equivalents of the deprecated macros in the new code."
               exit 1
             fi
diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
index 3b1151fd5d..5bfa6b6369 100644
--- a/docs/doxygen/Doxyfile
+++ b/docs/doxygen/Doxyfile
@@ -140,6 +140,7 @@ ALIASES += header{1}="Include file:^^ \verbatim #include <\1> \endverbatim"
 # some formatting aliases
 ALIASES += true="<span class='literal'>true</span>"
 ALIASES += false="<span class='literal'>false</span>"
+ALIASES += nullptr="<span class='literal'>nullptr</span>"
 ALIASES += NULL="<span class='literal'>nullptr</span>"
 ALIASES += NUL="<span class='literal'>NUL</span>"
 
diff --git a/interface/wx/stc/stc.h b/interface/wx/stc/stc.h
index ae32fca8b1..ea2fe19221 100644
--- a/interface/wx/stc/stc.h
+++ b/interface/wx/stc/stc.h
@@ -8206,7 +8206,7 @@ public:
             The position of the point to check, in window device coordinates.
         @param pos
             Receives the position of the character at the given position. May
-            be @NULL.
+            be @nullptr.
 
         @see PositionToXY(), XYToPosition()
     */
@@ -8232,10 +8232,10 @@ public:
             The position of the point to check, in window device coordinates.
         @param col
             Receives the column of the character at the given position. May be
-            @NULL.
+            @nullptr.
         @param row
             Receives the row of the character at the given position. May be
-            @NULL.
+            @nullptr.
 
         @see PositionToXY(), XYToPosition()
     */
diff --git a/src/stc/PlatWXcocoa.mm b/src/stc/PlatWXcocoa.mm
index 895f032835..c73d778693 100644
--- a/src/stc/PlatWXcocoa.mm
+++ b/src/stc/PlatWXcocoa.mm
@@ -90,7 +90,7 @@
 - (void)drawRect:(NSRect)dirtyRect
 {
     static_cast<wxWidgetCocoaImpl*>(m_wxWin->GetPeer())->
-        drawRect(&dirtyRect, self, NULL);
+        drawRect(&dirtyRect, self, nil);
 }
 
 @end
diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index 880d9484c2..9a7e3eb849 100644
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -1397,18 +1397,18 @@ public:
     }
 
     unsigned int GetImeCaretPos() const noexcept {
-        return ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, wxNullPtr, 0);
+        return ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, nullptr, 0);
     }
 
     std::vector<BYTE> GetImeAttributes() {
-        const int attrLen = ::ImmGetCompositionStringW(hIMC, GCS_COMPATTR, wxNullPtr, 0);
+        const int attrLen = ::ImmGetCompositionStringW(hIMC, GCS_COMPATTR, nullptr, 0);
         std::vector<BYTE> attr(attrLen, 0);
         ::ImmGetCompositionStringW(hIMC, GCS_COMPATTR, &attr[0], static_cast<DWORD>(attr.size()));
         return attr;
     }
 
     std::wstring GetCompositionString(DWORD dwIndex) {
-        const LONG byteLen = ::ImmGetCompositionStringW(hIMC, dwIndex, wxNullPtr, 0);
+        const LONG byteLen = ::ImmGetCompositionStringW(hIMC, dwIndex, nullptr, 0);
         std::wstring wcs(byteLen / 2, 0);
         ::ImmGetCompositionStringW(hIMC, dwIndex, &wcs[0], byteLen);
         return wcs;
diff --git a/src/stc/stc.interface.h.in b/src/stc/stc.interface.h.in
index ee7b9651af..0cf94b6950 100644
--- a/src/stc/stc.interface.h.in
+++ b/src/stc/stc.interface.h.in
@@ -718,7 +718,7 @@ public:
             The position of the point to check, in window device coordinates.
         @param pos
             Receives the position of the character at the given position. May
-            be @NULL.
+            be @nullptr.
 
         @see PositionToXY(), XYToPosition()
     */
@@ -744,10 +744,10 @@ public:
             The position of the point to check, in window device coordinates.
         @param col
             Receives the column of the character at the given position. May be
-            @NULL.
+            @nullptr.
         @param row
             Receives the row of the character at the given position. May be
-            @NULL.
+            @nullptr.
 
         @see PositionToXY(), XYToPosition()
     */