rename wxRendererNative::DrawRadioButton() to DrawOptionButton() to avoid conflict...

[wxWidgets.git] / include / wx / tbarbase.h

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index b0be7b0e7b569766eb08b72de7c6f3fa2684477e..fc09d4658610474b90a14229396f099242e2f61f 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -60,13 +60,13 @@ public:
     // ctors & dtor
     // ------------
 
     // 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,
                       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),
                       const wxString& shortHelpString = wxEmptyString,
                       const wxString& longHelpString = wxEmptyString)
         : m_label(label),


@@ -197,7 +197,7 @@ public:
     }
 
     // add tool to/remove it from a toolbar
     }
 
     // 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
     virtual void Attach(wxToolBarBase *tbar) { m_tbar = tbar; }
 
     // these methods are only for tools of wxITEM_DROPDOWN kind (but even such