Fix harmless warning about NULL in wxStyledTextCtrl code.

Cast NULL to the type of third argument of SendMsg() explicitly to avoid a
warning about it from Ubuntu g++ 4.6.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index f1cfe240df12143c2a2738950b5db81104d317a7..c9b08e945c094ba98dfdeabe393443815062bfad 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -4509,7 +4509,7 @@ bool wxStyledTextCtrl::GetUseAntiAliasing() {
 }
 
 void wxStyledTextCtrl::AnnotationClearLine(int line) {
 }
 
 void wxStyledTextCtrl::AnnotationClearLine(int line) {

-    SendMsg(SCI_ANNOTATIONSETTEXT, line, NULL);
+    SendMsg(SCI_ANNOTATIONSETTEXT, line, (sptr_t)NULL);

 }
 
 
 }
 
 

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index eec517db9fff3cd9de2b3efec9028119618d047a..d9036a438bfb0e1cb40c15d127fac631ae4978d4 100644 (file)
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -647,7 +647,7 @@ bool wxStyledTextCtrl::GetUseAntiAliasing() {
 }
 
 void wxStyledTextCtrl::AnnotationClearLine(int line) {
 }
 
 void wxStyledTextCtrl::AnnotationClearLine(int line) {

-    SendMsg(SCI_ANNOTATIONSETTEXT, line, NULL);
+    SendMsg(SCI_ANNOTATIONSETTEXT, line, (sptr_t)NULL);

 }
 
 
 }