Resolve removal of the rest of BCC-affected

Make changes based on feedback provided by vadz.

include/wx/memory.h

@@ -346,15 +346,8 @@ void WXDLLIMPEXP_BASE wxTraceLevel(int level, const wxChar *fmt ...) WX_ATTRIBUT
 
 #define WXDEBUG_DUMPDELAYCOUNTER
 
-// Borland C++ Builder 6 seems to have troubles with inline functions (see bug
-// 819700)
-#if 0
-    inline void wxTrace(const wxChar *WXUNUSED(fmt)) {}
-    inline void wxTraceLevel(int WXUNUSED(level), const wxChar *WXUNUSED(fmt)) {}
-#else
-    #define wxTrace(fmt)
-    #define wxTraceLevel(l, fmt)
-#endif
+#define wxTrace(fmt)
+#define wxTraceLevel(l, fmt)
 
 #define WXTRACE true ? (void)0 : wxTrace
 #define WXTRACELEVEL true ? (void)0 : wxTraceLevel

include/wx/msw/init.h

@@ -50,16 +50,12 @@ extern WXDLLIMPEXP_CORE int
 #define wxIMPLEMENT_WXWIN_MAIN                                              \
     extern "C" int WINAPI WinMain(HINSTANCE hInstance,                      \
                                   HINSTANCE hPrevInstance,                  \
-                                  wxCmdLineArgType WXUNUSED(lpCmdLine),     \
+                                  wxCmdLineArgType lpCmdLine,               \
                                   int nCmdShow)                             \
     {                                                                       \
         wxDISABLE_DEBUG_SUPPORT();                                          \
                                                                             \
-        /* NB: We pass NULL in place of lpCmdLine to behave the same as  */ \
-        /*     Borland-specific wWinMain() above. If it becomes needed   */ \
-        /*     to pass lpCmdLine to wxEntry() here, you'll have to fix   */ \
-        /*     wWinMain() above too.                                     */ \
-        return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow);           \
+        return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow);      \
     }
 
 #endif // wxUSE_GUI