mingw/cygwin compilation fix (patch 556157)

[wxWidgets.git] / src / msw / dummy.cpp

diff --git a/src/msw/dummy.cpp b/src/msw/dummy.cpp
index 67004e57c8357f5f5f6f2d93122a31ca1f9a6c64..4829376c7c7f75dfe6ab8afaba18a12c7af15f45 100644 (file)
--- a/src/msw/dummy.cpp
+++ b/src/msw/dummy.cpp
@@ -1,14 +1,12 @@
 /*
 /*

- * 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
  */
 
  * Copyright:   (c) 1993, AIAI, University of Edinburgh
  */
 

-/* static const char sccsid[] = "@(#)dummy.cc  1.2 5/9/94"; */
-

 /* A dummy file to include wx.h. If precompiling wx.h, I
  * always start by compiling this and producing the PCH file.
  * Then subsequent source files use the PCH file.
 /* A dummy file to include wx.h. If precompiling wx.h, I
  * always start by compiling this and producing the PCH file.
  * Then subsequent source files use the PCH file.


@@ -22,44 +20,17 @@
  * This will produce a big PCH file.
  */
 
  * This will produce a big PCH file.
  */
 

-
-
-#if defined(__BORLANDC__)
-#if !(defined(__WIN32__) || defined(__NT__) || defined(__WIN32__))
-#pragma hdrfile "c:\wx\src\msw\wx.pch"
-#endif
-
-#pragma hdrstart
-#endif
-

 #include "wx/wxprec.h"
 #include "wx/wxprec.h"

-#include "windows.h"

 
 #ifdef __BORLANDC__
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-// Foils optimizations in Visual C++ (see also wx_main.cc)
-char wxDummyChar=0;
-
-#if defined(WXUSINGDLL)
-
-// NT defines APIENTRY, 3.x not
-#if !defined(APIENTRY)
-#define APIENTRY FAR PASCAL
-#endif
- 
-#ifdef __WATCOMC__
-int PASCAL
-#else
-int APIENTRY
-#endif
+#include "wx/msw/msvcrt.h"

 
 

- WinMain(HANDLE hInstance, HANDLE hPrevInstance, LPSTR m_lpCmdLine,
-                    int nCmdShow )
-{
-  return wxEntry((WXHINSTANCE) hInstance, (WXHINSTANCE) hPrevInstance, m_lpCmdLine, nCmdShow);
-}
+// Foils optimizations in Visual C++ (see also app.cpp). Without it,
+// dummy.obj isn't linked and we get a linker error.
+#if defined(__VISUALC__) && defined(__WIN16__)
+    char wxDummyChar = 0;

 #endif
 
 #endif
 

-