Cured some Latex problems; fixed i declaration; fixed filedlg.cpp

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

diff --git a/src/msw/dummy.cpp b/src/msw/dummy.cpp
index e03022c6f50b2daf1c029be8023bffe3725e7cfc..1a2876a2b91613e17d96eee87350e1cd3b6d16af 100644 (file)
--- a/src/msw/dummy.cpp
+++ b/src/msw/dummy.cpp
@@ -7,8 +7,6 @@
  * 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,8 +20,6 @@
  * 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"
 #if defined(__BORLANDC__)
 #if !(defined(__WIN32__) || defined(__NT__) || defined(__WIN32__))
 #pragma hdrfile "c:\wx\src\msw\wx.pch"


@@ -33,35 +29,44 @@
 #endif
 
 #include "wx/wxprec.h"
 #endif
 
 #include "wx/wxprec.h"

-#include "windows.h"

 
 #ifdef __BORLANDC__
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #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.
 // 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) && defined(__WIN16__)
-char wxDummyChar=0;
+#if defined(_MSC_VER)
+    char wxDummyChar = 0;

 #endif
 
 #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)
 #if defined(WXUSINGDLL)
 
 // NT defines APIENTRY, 3.x not
 #if !defined(APIENTRY)

-#define APIENTRY FAR PASCAL
+    #define APIENTRY FAR PASCAL

 #endif
  
 #endif
  

+int

 #ifdef __WATCOMC__
 #ifdef __WATCOMC__

-int PASCAL
+    PASCAL

 #else
 #else

-int APIENTRY
+    APIENTRY

 #endif
 #endif

-
- WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR m_lpCmdLine,
-                    int nCmdShow )
+WinMain(HINSTANCE hInstance,
+        HINSTANCE hPrevInstance,
+        LPSTR m_lpCmdLine,
+        int nCmdShow )

 {
 {

-  return wxEntry((WXHINSTANCE) hInstance, (WXHINSTANCE) hPrevInstance, m_lpCmdLine, nCmdShow);
+    wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
+
+    return wxEntry((WXHINSTANCE) hInstance, (WXHINSTANCE) hPrevInstance,
+                   m_lpCmdLine, nCmdShow);

 }
 #endif
 
 }
 #endif