X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e0d9d43318af6b7865f1d07cd1b64f6eafd0c54..e6045e08ed5218ad303ee1f3cb70dd2ad621b322:/src/msw/dummy.cpp

diff --git a/src/msw/dummy.cpp b/src/msw/dummy.cpp
index 1a2876a2b9..dda57b7e3b 100644
--- a/src/msw/dummy.cpp
+++ b/src/msw/dummy.cpp
@@ -1,9 +1,9 @@
 /*
- * File:	dummy.cc
- * Purpose:	See below
- * Author:	Julian Smart
- * Created:	1993
- * Updated:	
+ * File:  dummy.cc
+ * Purpose:  See below
+ * Author:  Julian Smart
+ * Created:  1993
+ * Updated:
  * Copyright:   (c) 1993, AIAI, University of Edinburgh
  */
 
@@ -40,18 +40,21 @@
 
 // Foils optimizations in Visual C++ (see also app.cpp). Without it,
 // dummy.obj isn't linked and we get a linker error.
-#if defined(_MSC_VER)
+#if defined(__VISUALC__)
     char wxDummyChar = 0;
 #endif
 
 // if wxWindows is in the DLL link our entry point with the application
-#if defined(WXUSINGDLL)
+// N.B. see include/wx/app.h, we're now putting this in IMPLEMENT_APP so we
+// don't have to link our apps with dummy.obj.
+
+#if 0 // defined(WXUSINGDLL)
 
 // NT defines APIENTRY, 3.x not
 #if !defined(APIENTRY)
     #define APIENTRY FAR PASCAL
 #endif
- 
+
 int
 #ifdef __WATCOMC__
     PASCAL
@@ -63,7 +66,9 @@ WinMain(HINSTANCE hInstance,
         LPSTR m_lpCmdLine,
         int nCmdShow )
 {
+#if !WXUSINGDLL
     wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
+#endif
 
     return wxEntry((WXHINSTANCE) hInstance, (WXHINSTANCE) hPrevInstance,
                    m_lpCmdLine, nCmdShow);