don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -105,7 +105,7 @@ public:
|
||||
|
||||
wxBitmap GetSubBitmap( const wxRect& rect ) const;
|
||||
|
||||
bool SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = (wxPalette *) NULL ) const;
|
||||
bool SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = NULL ) const;
|
||||
bool LoadFile( const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
|
||||
|
||||
wxPalette *GetPalette() const;
|
||||
|
@@ -49,7 +49,7 @@ public:
|
||||
}
|
||||
|
||||
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(); }
|
||||
|
||||
|
@@ -114,8 +114,8 @@ typedef struct {
|
||||
#define XFreeCursor(d, c) GrDestroyCursor(c)
|
||||
#define XFreeGC(d, gc) GrDestroyGC(gc)
|
||||
#define XSetBackground(d, gc, c) GrSetGCBackground(gc, c)
|
||||
#define DefaultVisual(d, s) ((Visual*) NULL)
|
||||
#define DefaultColormap(d, s) DefaultColormapOfScreen((Screen*) NULL)
|
||||
#define DefaultVisual(d, s) (NULL)
|
||||
#define DefaultColormap(d, s) DefaultColormapOfScreen(NULL)
|
||||
#define DefaultScreenOfDisplay(d) 0
|
||||
#define XSetFillStyle(d, gc, s) wxNoop()
|
||||
#define XSetLineAttributes(d, gc, a, b, c, e) wxNoop()
|
||||
|
@@ -73,13 +73,13 @@ public:
|
||||
virtual int GetCharWidth() const;
|
||||
virtual void GetTextExtent(const wxString& string,
|
||||
int *x, int *y,
|
||||
int *descent = (int *) NULL,
|
||||
int *externalLeading = (int *) NULL,
|
||||
int *descent = NULL,
|
||||
int *externalLeading = NULL,
|
||||
const wxFont *theFont = (const wxFont *) NULL)
|
||||
const;
|
||||
|
||||
virtual void ScrollWindow( int dx, int dy,
|
||||
const wxRect* rect = (wxRect *) NULL );
|
||||
const wxRect* rect = NULL );
|
||||
|
||||
#if wxUSE_DRAG_AND_DROP
|
||||
virtual void SetDropTarget( wxDropTarget *dropTarget );
|
||||
|
Reference in New Issue
Block a user