Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some compile warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-08-14 07:13:39 +00:00
parent d01ca1e4d1
commit c4bdd8225a
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/stc/stc.h
View File

@@ -4858,8 +4858,8 @@ private:
int m_x; int m_x;
int m_y; int m_y;
int m_token; // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER int m_token; // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER
int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION
int m_updated; // wxEVT_STC_UPDATEUI int m_updated; // wxEVT_STC_UPDATEUI

14
src/stc/gen_iface.py
View File

@@ -756,7 +756,7 @@ methodOverrideMap = {
'''wxString %s() const { '''wxString %s() const {
int msg = %s; int msg = %s;
int len = SendMsg(msg, 0, NULL); int len = SendMsg(msg, 0, (sptr_t)NULL);
if (!len) return wxEmptyString; if (!len) return wxEmptyString;
wxMemoryBuffer mbuf(len+1); wxMemoryBuffer mbuf(len+1);
@@ -774,7 +774,7 @@ methodOverrideMap = {
'''wxString %s(int tagNumber) const { '''wxString %s(int tagNumber) const {
int msg = %s; int msg = %s;
int len = SendMsg(msg, tagNumber, NULL); int len = SendMsg(msg, tagNumber, (sptr_t)NULL);
if (!len) return wxEmptyString; if (!len) return wxEmptyString;
wxMemoryBuffer mbuf(len+1); wxMemoryBuffer mbuf(len+1);
@@ -791,7 +791,7 @@ methodOverrideMap = {
'''wxString %s() const { '''wxString %s() const {
int msg = %s; int msg = %s;
int len = SendMsg(msg, 0, NULL); int len = SendMsg(msg, 0, (sptr_t)NULL);
if (!len) return wxEmptyString; if (!len) return wxEmptyString;
wxMemoryBuffer mbuf(len+1); wxMemoryBuffer mbuf(len+1);
@@ -809,7 +809,7 @@ methodOverrideMap = {
'''wxString %s() const { '''wxString %s() const {
int msg = %s; int msg = %s;
int len = SendMsg(msg, 0, NULL); int len = SendMsg(msg, 0, (sptr_t)NULL);
if (!len) return wxEmptyString; if (!len) return wxEmptyString;
wxMemoryBuffer mbuf(len+1); wxMemoryBuffer mbuf(len+1);
@@ -827,7 +827,7 @@ methodOverrideMap = {
'''wxString %s() const { '''wxString %s() const {
int msg = %s; int msg = %s;
int len = SendMsg(msg, 0, NULL); int len = SendMsg(msg, 0, (sptr_t)NULL);
if (!len) return wxEmptyString; if (!len) return wxEmptyString;
wxMemoryBuffer mbuf(len+1); wxMemoryBuffer mbuf(len+1);
@@ -846,7 +846,7 @@ methodOverrideMap = {
'''wxString %s(const wxString& name) const { '''wxString %s(const wxString& name) const {
int msg = %s; 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; if (!len) return wxEmptyString;
wxMemoryBuffer mbuf(len+1); wxMemoryBuffer mbuf(len+1);
@@ -865,7 +865,7 @@ methodOverrideMap = {
'''wxString %s() const { '''wxString %s() const {
int msg = %s; int msg = %s;
int len = SendMsg(msg, 0, NULL); int len = SendMsg(msg, 0, (sptr_t)NULL);
if (!len) return wxEmptyString; if (!len) return wxEmptyString;
wxMemoryBuffer mbuf(len+1); wxMemoryBuffer mbuf(len+1);

14
src/stc/stc.cpp
View File

@@ -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. // Get the set of characters making up words for when moving or selecting by word.
wxString wxStyledTextCtrl::GetWordChars() const { wxString wxStyledTextCtrl::GetWordChars() const {
int msg = 2646; int msg = 2646;
int len = SendMsg(msg, 0, NULL); int len = SendMsg(msg, 0, (sptr_t)NULL);
if (!len) return wxEmptyString; if (!len) return wxEmptyString;
wxMemoryBuffer mbuf(len+1); wxMemoryBuffer mbuf(len+1);
@@ -2212,7 +2212,7 @@ int wxStyledTextCtrl::GetMultiPaste() const
// Retrieve the value of a tag from a regular expression search. // Retrieve the value of a tag from a regular expression search.
wxString wxStyledTextCtrl::GetTag(int tagNumber) const { wxString wxStyledTextCtrl::GetTag(int tagNumber) const {
int msg = 2616; int msg = 2616;
int len = SendMsg(msg, tagNumber, NULL); int len = SendMsg(msg, tagNumber, (sptr_t)NULL);
if (!len) return wxEmptyString; if (!len) return wxEmptyString;
wxMemoryBuffer mbuf(len+1); 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. // Get the set of characters making up whitespace for when moving or selecting by word.
wxString wxStyledTextCtrl::GetWhitespaceChars() const { wxString wxStyledTextCtrl::GetWhitespaceChars() const {
int msg = 2647; int msg = 2647;
int len = SendMsg(msg, 0, NULL); int len = SendMsg(msg, 0, (sptr_t)NULL);
if (!len) return wxEmptyString; if (!len) return wxEmptyString;
wxMemoryBuffer mbuf(len+1); wxMemoryBuffer mbuf(len+1);
@@ -3184,7 +3184,7 @@ void wxStyledTextCtrl::SetPunctuationChars(const wxString& characters)
// Get the set of characters making up punctuation characters // Get the set of characters making up punctuation characters
wxString wxStyledTextCtrl::GetPunctuationChars() const { wxString wxStyledTextCtrl::GetPunctuationChars() const {
int msg = 2649; int msg = 2649;
int len = SendMsg(msg, 0, NULL); int len = SendMsg(msg, 0, (sptr_t)NULL);
if (!len) return wxEmptyString; if (!len) return wxEmptyString;
wxMemoryBuffer mbuf(len+1); 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. // Retrieve a '\n' separated list of properties understood by the current lexer.
wxString wxStyledTextCtrl::PropertyNames() const { wxString wxStyledTextCtrl::PropertyNames() const {
int msg = 4014; int msg = 4014;
int len = SendMsg(msg, 0, NULL); int len = SendMsg(msg, 0, (sptr_t)NULL);
if (!len) return wxEmptyString; if (!len) return wxEmptyString;
wxMemoryBuffer mbuf(len+1); wxMemoryBuffer mbuf(len+1);
@@ -4094,7 +4094,7 @@ int wxStyledTextCtrl::PropertyType(const wxString& name)
// Describe a property. // Describe a property.
wxString wxStyledTextCtrl::DescribeProperty(const wxString& name) const { wxString wxStyledTextCtrl::DescribeProperty(const wxString& name) const {
int msg = 4016; 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; if (!len) return wxEmptyString;
wxMemoryBuffer mbuf(len+1); 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. // Retrieve a '\n' separated list of descriptions of the keyword sets understood by the current lexer.
wxString wxStyledTextCtrl::DescribeKeyWordSets() const { wxString wxStyledTextCtrl::DescribeKeyWordSets() const {
int msg = 4017; int msg = 4017;
int len = SendMsg(msg, 0, NULL); int len = SendMsg(msg, 0, (sptr_t)NULL);
if (!len) return wxEmptyString; if (!len) return wxEmptyString;
wxMemoryBuffer mbuf(len+1); wxMemoryBuffer mbuf(len+1);