fix some compile warnings

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

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 886e597cf0c765c4f774435efe13edba0db17701..f7600b9dd6a8ed49f6a816fc058c63d95f6dbbe5 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -4858,8 +4858,8 @@ private:
     int m_x;
     int m_y;
 
     int m_x;
     int m_y;
 

-    int m_token;                // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER
-    int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION
+    int m_token;                // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER 
+    int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION 

     int m_updated;              // wxEVT_STC_UPDATEUI
 
 
     int m_updated;              // wxEVT_STC_UPDATEUI
 
 

diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
index f6f329fb307a4e6e7cbddcacc3bc859d6188c1db..805514e134984fbda7ec9328bb4def85addc1307 100755 (executable)
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -756,7 +756,7 @@ methodOverrideMap = {
 
      '''wxString %s() const {
          int msg = %s;
 
      '''wxString %s() const {
          int msg = %s;

-         int len = SendMsg(msg, 0, NULL);
+         int len = SendMsg(msg, 0, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);


@@ -774,7 +774,7 @@ methodOverrideMap = {
 
      '''wxString %s(int tagNumber) const {
          int msg = %s;
 
      '''wxString %s(int tagNumber) const {
          int msg = %s;

-         int len = SendMsg(msg, tagNumber, NULL);
+         int len = SendMsg(msg, tagNumber, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);


@@ -791,7 +791,7 @@ methodOverrideMap = {
 
      '''wxString %s() const {
          int msg = %s;
 
      '''wxString %s() const {
          int msg = %s;

-         int len = SendMsg(msg, 0, NULL);
+         int len = SendMsg(msg, 0, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);


@@ -809,7 +809,7 @@ methodOverrideMap = {
 
      '''wxString %s() const {
          int msg = %s;
 
      '''wxString %s() const {
          int msg = %s;

-         int len = SendMsg(msg, 0, NULL);
+         int len = SendMsg(msg, 0, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);


@@ -827,7 +827,7 @@ methodOverrideMap = {
 
      '''wxString %s() const {
          int msg = %s;
 
      '''wxString %s() const {
          int msg = %s;

-         int len = SendMsg(msg, 0, NULL);
+         int len = SendMsg(msg, 0, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);


@@ -846,7 +846,7 @@ methodOverrideMap = {
 
      '''wxString %s(const wxString& name) const {
          int msg = %s;
 
      '''wxString %s(const wxString& name) const {
          int msg = %s;

-         int len = SendMsg(msg, (sptr_t)(const char*)wx2stc(name), NULL);
+         int len = SendMsg(msg, (sptr_t)(const char*)wx2stc(name), (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);


@@ -865,7 +865,7 @@ methodOverrideMap = {
 
      '''wxString %s() const {
          int msg = %s;
 
      '''wxString %s() const {
          int msg = %s;

-         int len = SendMsg(msg, 0, NULL);
+         int len = SendMsg(msg, 0, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index bb3320188c93eb67a1c0f09755a79fb153593376..b607b3d92cb3ea9d3a3f6836802152b6f9e4a48f 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -963,7 +963,7 @@ void wxStyledTextCtrl::SetWordChars(const wxString& characters)
 // Get the set of characters making up words for when moving or selecting by word.
 wxString wxStyledTextCtrl::GetWordChars() const {
          int msg = 2646;
 // Get the set of characters making up words for when moving or selecting by word.
 wxString wxStyledTextCtrl::GetWordChars() const {
          int msg = 2646;

-         int len = SendMsg(msg, 0, NULL);
+         int len = SendMsg(msg, 0, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);


@@ -2212,7 +2212,7 @@ int wxStyledTextCtrl::GetMultiPaste() const
 // Retrieve the value of a tag from a regular expression search.
 wxString wxStyledTextCtrl::GetTag(int tagNumber) const {
          int msg = 2616;
 // Retrieve the value of a tag from a regular expression search.
 wxString wxStyledTextCtrl::GetTag(int tagNumber) const {
          int msg = 2616;

-         int len = SendMsg(msg, tagNumber, NULL);
+         int len = SendMsg(msg, tagNumber, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);


@@ -3163,7 +3163,7 @@ void wxStyledTextCtrl::SetWhitespaceChars(const wxString& characters)
 // Get the set of characters making up whitespace for when moving or selecting by word.
 wxString wxStyledTextCtrl::GetWhitespaceChars() const {
          int msg = 2647;
 // Get the set of characters making up whitespace for when moving or selecting by word.
 wxString wxStyledTextCtrl::GetWhitespaceChars() const {
          int msg = 2647;

-         int len = SendMsg(msg, 0, NULL);
+         int len = SendMsg(msg, 0, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);


@@ -3184,7 +3184,7 @@ void wxStyledTextCtrl::SetPunctuationChars(const wxString& characters)
 // Get the set of characters making up punctuation characters
 wxString wxStyledTextCtrl::GetPunctuationChars() const {
          int msg = 2649;
 // Get the set of characters making up punctuation characters
 wxString wxStyledTextCtrl::GetPunctuationChars() const {
          int msg = 2649;

-         int len = SendMsg(msg, 0, NULL);
+         int len = SendMsg(msg, 0, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);


@@ -4074,7 +4074,7 @@ void* wxStyledTextCtrl::PrivateLexerCall(int operation, void* pointer) {
 // Retrieve a '\n' separated list of properties understood by the current lexer.
 wxString wxStyledTextCtrl::PropertyNames() const {
          int msg = 4014;
 // Retrieve a '\n' separated list of properties understood by the current lexer.
 wxString wxStyledTextCtrl::PropertyNames() const {
          int msg = 4014;

-         int len = SendMsg(msg, 0, NULL);
+         int len = SendMsg(msg, 0, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);


@@ -4094,7 +4094,7 @@ int wxStyledTextCtrl::PropertyType(const wxString& name)
 // Describe a property.
 wxString wxStyledTextCtrl::DescribeProperty(const wxString& name) const {
          int msg = 4016;
 // Describe a property.
 wxString wxStyledTextCtrl::DescribeProperty(const wxString& name) const {
          int msg = 4016;

-         int len = SendMsg(msg, (sptr_t)(const char*)wx2stc(name), NULL);
+         int len = SendMsg(msg, (sptr_t)(const char*)wx2stc(name), (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);


@@ -4108,7 +4108,7 @@ wxString wxStyledTextCtrl::DescribeProperty(const wxString& name) const {
 // Retrieve a '\n' separated list of descriptions of the keyword sets understood by the current lexer.
 wxString wxStyledTextCtrl::DescribeKeyWordSets() const {
          int msg = 4017;
 // Retrieve a '\n' separated list of descriptions of the keyword sets understood by the current lexer.
 wxString wxStyledTextCtrl::DescribeKeyWordSets() const {
          int msg = 4017;

-         int len = SendMsg(msg, 0, NULL);
+         int len = SendMsg(msg, 0, (sptr_t)NULL);

          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);
          if (!len) return wxEmptyString;
 
          wxMemoryBuffer mbuf(len+1);