warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -531,7 +531,7 @@ methodOverrideMap = {
|
|||||||
'wxString %s(const wxString& key);',
|
'wxString %s(const wxString& key);',
|
||||||
|
|
||||||
'''wxString %s(const wxString& key) {
|
'''wxString %s(const wxString& key) {
|
||||||
int len = SendMsg(SCI_GETPROPERTY, (long)(const char*)wx2stc(key), NULL);
|
int len = SendMsg(SCI_GETPROPERTY, (long)(const char*)wx2stc(key), (long)NULL);
|
||||||
if (!len) return wxEmptyString;
|
if (!len) return wxEmptyString;
|
||||||
|
|
||||||
wxMemoryBuffer mbuf(len+1);
|
wxMemoryBuffer mbuf(len+1);
|
||||||
@@ -547,7 +547,7 @@ methodOverrideMap = {
|
|||||||
'wxString %s(const wxString& key);',
|
'wxString %s(const wxString& key);',
|
||||||
|
|
||||||
'''wxString %s(const wxString& key) {
|
'''wxString %s(const wxString& key) {
|
||||||
int len = SendMsg(SCI_GETPROPERTYEXPANDED, (long)(const char*)wx2stc(key), NULL);
|
int len = SendMsg(SCI_GETPROPERTYEXPANDED, (long)(const char*)wx2stc(key), (long)NULL);
|
||||||
if (!len) return wxEmptyString;
|
if (!len) return wxEmptyString;
|
||||||
|
|
||||||
wxMemoryBuffer mbuf(len+1);
|
wxMemoryBuffer mbuf(len+1);
|
||||||
|
@@ -2523,7 +2523,7 @@ void wxStyledTextCtrl::SetLexerLanguage(const wxString& language) {
|
|||||||
|
|
||||||
// Retrieve a 'property' value previously set with SetProperty.
|
// Retrieve a 'property' value previously set with SetProperty.
|
||||||
wxString wxStyledTextCtrl::GetProperty(const wxString& key) {
|
wxString wxStyledTextCtrl::GetProperty(const wxString& key) {
|
||||||
int len = SendMsg(SCI_GETPROPERTY, (long)(const char*)wx2stc(key), NULL);
|
int len = SendMsg(SCI_GETPROPERTY, (long)(const char*)wx2stc(key), (long)NULL);
|
||||||
if (!len) return wxEmptyString;
|
if (!len) return wxEmptyString;
|
||||||
|
|
||||||
wxMemoryBuffer mbuf(len+1);
|
wxMemoryBuffer mbuf(len+1);
|
||||||
@@ -2537,7 +2537,7 @@ wxString wxStyledTextCtrl::GetProperty(const wxString& key) {
|
|||||||
// Retrieve a 'property' value previously set with SetProperty,
|
// Retrieve a 'property' value previously set with SetProperty,
|
||||||
// with '$()' variable replacement on returned buffer.
|
// with '$()' variable replacement on returned buffer.
|
||||||
wxString wxStyledTextCtrl::GetPropertyExpanded(const wxString& key) {
|
wxString wxStyledTextCtrl::GetPropertyExpanded(const wxString& key) {
|
||||||
int len = SendMsg(SCI_GETPROPERTYEXPANDED, (long)(const char*)wx2stc(key), NULL);
|
int len = SendMsg(SCI_GETPROPERTYEXPANDED, (long)(const char*)wx2stc(key), (long)NULL);
|
||||||
if (!len) return wxEmptyString;
|
if (!len) return wxEmptyString;
|
||||||
|
|
||||||
wxMemoryBuffer mbuf(len+1);
|
wxMemoryBuffer mbuf(len+1);
|
||||||
|
@@ -531,7 +531,7 @@ methodOverrideMap = {
|
|||||||
'wxString %s(const wxString& key);',
|
'wxString %s(const wxString& key);',
|
||||||
|
|
||||||
'''wxString %s(const wxString& key) {
|
'''wxString %s(const wxString& key) {
|
||||||
int len = SendMsg(SCI_GETPROPERTY, (long)(const char*)wx2stc(key), NULL);
|
int len = SendMsg(SCI_GETPROPERTY, (long)(const char*)wx2stc(key), (long)NULL);
|
||||||
if (!len) return wxEmptyString;
|
if (!len) return wxEmptyString;
|
||||||
|
|
||||||
wxMemoryBuffer mbuf(len+1);
|
wxMemoryBuffer mbuf(len+1);
|
||||||
@@ -547,7 +547,7 @@ methodOverrideMap = {
|
|||||||
'wxString %s(const wxString& key);',
|
'wxString %s(const wxString& key);',
|
||||||
|
|
||||||
'''wxString %s(const wxString& key) {
|
'''wxString %s(const wxString& key) {
|
||||||
int len = SendMsg(SCI_GETPROPERTYEXPANDED, (long)(const char*)wx2stc(key), NULL);
|
int len = SendMsg(SCI_GETPROPERTYEXPANDED, (long)(const char*)wx2stc(key), (long)NULL);
|
||||||
if (!len) return wxEmptyString;
|
if (!len) return wxEmptyString;
|
||||||
|
|
||||||
wxMemoryBuffer mbuf(len+1);
|
wxMemoryBuffer mbuf(len+1);
|
||||||
|
@@ -2523,7 +2523,7 @@ void wxStyledTextCtrl::SetLexerLanguage(const wxString& language) {
|
|||||||
|
|
||||||
// Retrieve a 'property' value previously set with SetProperty.
|
// Retrieve a 'property' value previously set with SetProperty.
|
||||||
wxString wxStyledTextCtrl::GetProperty(const wxString& key) {
|
wxString wxStyledTextCtrl::GetProperty(const wxString& key) {
|
||||||
int len = SendMsg(SCI_GETPROPERTY, (long)(const char*)wx2stc(key), NULL);
|
int len = SendMsg(SCI_GETPROPERTY, (long)(const char*)wx2stc(key), (long)NULL);
|
||||||
if (!len) return wxEmptyString;
|
if (!len) return wxEmptyString;
|
||||||
|
|
||||||
wxMemoryBuffer mbuf(len+1);
|
wxMemoryBuffer mbuf(len+1);
|
||||||
@@ -2537,7 +2537,7 @@ wxString wxStyledTextCtrl::GetProperty(const wxString& key) {
|
|||||||
// Retrieve a 'property' value previously set with SetProperty,
|
// Retrieve a 'property' value previously set with SetProperty,
|
||||||
// with '$()' variable replacement on returned buffer.
|
// with '$()' variable replacement on returned buffer.
|
||||||
wxString wxStyledTextCtrl::GetPropertyExpanded(const wxString& key) {
|
wxString wxStyledTextCtrl::GetPropertyExpanded(const wxString& key) {
|
||||||
int len = SendMsg(SCI_GETPROPERTYEXPANDED, (long)(const char*)wx2stc(key), NULL);
|
int len = SendMsg(SCI_GETPROPERTYEXPANDED, (long)(const char*)wx2stc(key), (long)NULL);
|
||||||
if (!len) return wxEmptyString;
|
if (!len) return wxEmptyString;
|
||||||
|
|
||||||
wxMemoryBuffer mbuf(len+1);
|
wxMemoryBuffer mbuf(len+1);
|
||||||
|
Reference in New Issue
Block a user