projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added wxTE_PROCESS_TAB
[wxWidgets.git]
/
src
/
msw
/
dummy.cpp
diff --git
a/src/msw/dummy.cpp
b/src/msw/dummy.cpp
index 67004e57c8357f5f5f6f2d93122a31ca1f9a6c64..e03022c6f50b2daf1c029be8023bffe3725e7cfc 100644
(file)
--- a/
src/msw/dummy.cpp
+++ b/
src/msw/dummy.cpp
@@
-39,8
+39,11
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-// Foils optimizations in Visual C++ (see also wx_main.cc)
+// 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;
char wxDummyChar=0;
+#endif
#if defined(WXUSINGDLL)
#if defined(WXUSINGDLL)
@@
-55,7
+58,7
@@
int PASCAL
int APIENTRY
#endif
int APIENTRY
#endif
- WinMain(H
ANDLE hInstance, HANDL
E hPrevInstance, LPSTR m_lpCmdLine,
+ WinMain(H
INSTANCE hInstance, HINSTANC
E hPrevInstance, LPSTR m_lpCmdLine,
int nCmdShow )
{
return wxEntry((WXHINSTANCE) hInstance, (WXHINSTANCE) hPrevInstance, m_lpCmdLine, nCmdShow);
int nCmdShow )
{
return wxEntry((WXHINSTANCE) hInstance, (WXHINSTANCE) hPrevInstance, m_lpCmdLine, nCmdShow);