X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe21801d4a3d44c86c5e0e142d77246837a83105..c1ea6afb878385e2586007fc85fef05c2c722a2b:/include/wx/tbarbase.h?ds=sidebyside

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index b0be7b0e7b..d13bf22333 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -60,13 +60,13 @@ public:
     // ctors & dtor
     // ------------
 
-    wxToolBarToolBase(wxToolBarBase *tbar = (wxToolBarBase *)NULL,
+    wxToolBarToolBase(wxToolBarBase *tbar = NULL,
                       int toolid = wxID_SEPARATOR,
                       const wxString& label = wxEmptyString,
                       const wxBitmap& bmpNormal = wxNullBitmap,
                       const wxBitmap& bmpDisabled = wxNullBitmap,
                       wxItemKind kind = wxITEM_NORMAL,
-                      wxObject *clientData = (wxObject *) NULL,
+                      wxObject *clientData = NULL,
                       const wxString& shortHelpString = wxEmptyString,
                       const wxString& longHelpString = wxEmptyString)
         : m_label(label),
@@ -197,7 +197,7 @@ public:
     }
 
     // add tool to/remove it from a toolbar
-    virtual void Detach() { m_tbar = (wxToolBarBase *)NULL; }
+    virtual void Detach() { m_tbar = NULL; }
     virtual void Attach(wxToolBarBase *tbar) { m_tbar = tbar; }
 
     // these methods are only for tools of wxITEM_DROPDOWN kind (but even such
@@ -622,7 +622,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxToolBarBase)
+    wxDECLARE_NO_COPY_CLASS(wxToolBarBase);
 };
 
 // deprecated function for creating the image for disabled buttons, use