Changed order of #ifdefs to get native version on OS/2, even if

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

diff --git a/src/msw/dummy.cpp b/src/msw/dummy.cpp
index 1a2876a2b91613e17d96eee87350e1cd3b6d16af..ae232c15c761ab64b7770f33c04bd126e8324059 100644 (file)
--- 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
  */
 
  * Copyright:   (c) 1993, AIAI, University of Edinburgh
  */
 


@@ -20,54 +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"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

-#include <windows.h>
-

 #include "wx/msw/msvcrt.h"
 
 // Foils optimizations in Visual C++ (see also app.cpp). Without it,
 // dummy.obj isn't linked and we get a linker error.
 #include "wx/msw/msvcrt.h"
 
 // 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
 
     char wxDummyChar = 0;
 #endif
 

-// if wxWindows is in the DLL link our entry point with the application
-#if defined(WXUSINGDLL)
-
-// NT defines APIENTRY, 3.x not
-#if !defined(APIENTRY)
-    #define APIENTRY FAR PASCAL
-#endif
- 
-int
-#ifdef __WATCOMC__
-    PASCAL
-#else
-    APIENTRY
-#endif
-WinMain(HINSTANCE hInstance,
-        HINSTANCE hPrevInstance,
-        LPSTR m_lpCmdLine,
-        int nCmdShow )
-{
-    wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
-
-    return wxEntry((WXHINSTANCE) hInstance, (WXHINSTANCE) hPrevInstance,
-                   m_lpCmdLine, nCmdShow);
-}
-#endif
-
-