replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/msw/bitmap.h

@@ -58,7 +58,7 @@ public:
 #ifdef wxNEEDS_CHARPP
     wxBitmap(char** data)
     {
-        *this = wxBitmap(wx_const_cast(const char* const*, data));
+        *this = wxBitmap(const_cast<const char* const*>(data));
     }
 #endif
 

include/wx/msw/helpchm.h

@@ -56,7 +56,7 @@ protected:
     static bool CallHtmlHelp(wxWindow *win, const wxChar *str,
                              unsigned cmd, const void *param = NULL)
     {
-        return CallHtmlHelp(win, str, cmd, wx_reinterpret_cast(WXWPARAM, param));
+        return CallHtmlHelp(win, str, cmd, reinterpret_cast<WXWPARAM>(param));
     }
 
     // even simpler wrappers using GetParentWindow() and GetValidFilename() as
@@ -69,7 +69,7 @@ protected:
 
     bool CallHtmlHelp(unsigned cmd, const void *param = NULL)
     {
-        return CallHtmlHelp(cmd, wx_reinterpret_cast(WXWPARAM, param));
+        return CallHtmlHelp(cmd, reinterpret_cast<WXWPARAM>(param));
     }
 
     // wrapper around CallHtmlHelp(HH_DISPLAY_TEXT_POPUP): only one of text and

include/wx/msw/icon.h

@@ -50,7 +50,7 @@ public:
         // from XPM data
     wxIcon(const char* const* data) { CreateIconFromXpm(data); }
 #ifdef wxNEEDS_CHARPP
-    wxIcon(char **data) { CreateIconFromXpm(wx_const_cast(const char* const*, data)); }
+    wxIcon(char **data) { CreateIconFromXpm(const_cast<const char* const*>(data)); }
 #endif
         // from resource/file
     wxIcon(const wxString& name,

include/wx/msw/private.h

@@ -930,7 +930,7 @@ extern WXDLLIMPEXP_CORE wxWindow* wxFindWinFromHandle(HWND hwnd);
 // without STRICT WXHWND is the same as HWND anyhow
 inline wxWindow* wxFindWinFromHandle(WXHWND hWnd)
 {
-    return wxFindWinFromHandle(wx_static_cast(HWND, hWnd));
+    return wxFindWinFromHandle(static_cast<HWND>(hWnd));
 }
 
 // find the window for HWND which is part of some wxWindow, i.e. unlike

include/wx/msw/stackwalk.h

@@ -29,7 +29,7 @@ class WXDLLIMPEXP_BASE wxStackFrame : public wxStackFrameBase
 {
 private:
     wxStackFrame *ConstCast() const
-        { return wx_const_cast(wxStackFrame *, this); }
+        { return const_cast<wxStackFrame *>(this); }
 
     size_t DoGetParamCount() const { return m_paramTypes.GetCount(); }
 
@@ -65,7 +65,7 @@ protected:
     // helper for debug API: it wants to have addresses as DWORDs
     size_t GetSymAddr() const
     {
-        return wx_reinterpret_cast(size_t, m_address);
+        return reinterpret_cast<size_t>(m_address);
     }
 
 private:

include/wx/msw/subwin.h

@@ -61,7 +61,7 @@ public:
 
     HWND operator[](size_t n) const
     {
-        return wx_const_cast(wxSubwindows *, this)->Get(n);
+        return const_cast<wxSubwindows *>(this)->Get(n);
     }
 
     // initialize the given window: id will be stored in wxWindowIDRef ensuring