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

don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-19 13:55:27 +00:00
parent c23b255ab4
commit d3b9f782ef
297 changed files with 1003 additions and 1003 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/os2/bitmap.h
View File

@@ -184,12 +184,12 @@ public:
void SetQuality(int nQ);
wxPalette* GetPalette() const
{ return (GetBitmapData() ? (& GetBitmapData()->m_vBitmapPalette) : (wxPalette*) NULL); }
{ return (GetBitmapData() ? (& GetBitmapData()->m_vBitmapPalette) : NULL); }
void SetPalette(const wxPalette& rPalette);
inline wxMask* GetMask() const
{ return (GetBitmapData() ? GetBitmapData()->m_pBitmapMask : (wxMask*) NULL); }
{ return (GetBitmapData() ? GetBitmapData()->m_pBitmapMask : NULL); }
void SetMask(wxMask* pMask) ;
@@ -205,7 +205,7 @@ public:
{ if (GetBitmapData()) GetBitmapData()->m_pSelectedInto = pDc; }
inline wxDC* GetSelectedInto() const
{ return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : (wxDC*) NULL); }
{ return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : NULL); }
inline bool IsMono(void) const { return m_bIsMono; }

2
include/wx/os2/dataobj2.h
View File

@@ -37,7 +37,7 @@ public:
virtual bool SetData(size_t len, const void *buf);
protected:
void Init() { m_pngData = (void *)NULL; m_pngSize = 0; }
void Init() { m_pngData = NULL; m_pngSize = 0; }
void Clear() { free(m_pngData); }
void ClearAll() { Clear(); Init(); }

2
include/wx/os2/dnd.h
View File

@@ -62,7 +62,7 @@ protected:
class WXDLLIMPEXP_CORE wxDropTarget : public wxDropTargetBase
{
public:
wxDropTarget(wxDataObject* pDataObject = (wxDataObject*)NULL);
wxDropTarget(wxDataObject* pDataObject = NULL);
virtual ~wxDropTarget();
//

2
include/wx/os2/menuitem.h
View File

@@ -58,7 +58,7 @@ public:
,const wxString& rsText
,const wxString& rsHelp
,bool bIsCheckable
,wxMenu* pSubMenu = (wxMenu *)NULL
,wxMenu* pSubMenu = NULL
);
virtual ~wxMenuItem();

2
include/wx/os2/treectrl.h
View File

@@ -448,7 +448,7 @@ public:
//
// returns NULL for OS/2 in ALL cases
//
wxTextCtrl* GetEditControl(void) const {return (wxTextCtrl*)NULL;}
wxTextCtrl* GetEditControl(void) const {return NULL;}
//
// End editing and accept or discard the changes to item label

6
include/wx/os2/window.h
View File

@@ -101,8 +101,8 @@ public:
virtual void GetTextExtent( const wxString& rString
,int* pX
,int* pY
,int* pDescent = (int *)NULL
,int* pExternalLeading = (int *)NULL
,int* pDescent = NULL
,int* pExternalLeading = NULL
,const wxFont* pTheFont = (const wxFont *)NULL
) const;
#if wxUSE_MENUS_NATIVE
@@ -127,7 +127,7 @@ public:
virtual int GetScrollRange(int nOrient) const;
virtual void ScrollWindow( int nDx
,int nDy
,const wxRect* pRect = (wxRect *)NULL
,const wxRect* pRect = NULL
);
inline HWND GetScrollBarHorz(void) const {return m_hWndScrollBarHorz;}