From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 4 Jul 2001 11:59:35 +0000 (+0000)
Subject: Getting wxMicroWindows compiled again
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8a46f9b187b416dccd36820b1c415eb4ca6cdc8e

Getting wxMicroWindows compiled again


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 097c5945f0..a27b1945a1 100644
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -58,8 +58,11 @@
 #endif // Windows
 
 // may be defined to 0 for old behavior (using wxMessageBox) - shouldn't be
-// changed normally (that's why it's here and not in setup.h)
+// changed normally (that's why it's here and not in setup.h).
+// Actually it now is in setup.h.
+#ifndef wxUSE_LOG_DIALOG
 #define wxUSE_LOG_DIALOG 1
+#endif
 
 #if wxUSE_LOG_DIALOG
     #include "wx/listctrl.h"
@@ -340,7 +343,7 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
         case wxLOG_Debug:
             #ifdef __WXDEBUG__
             {
-                #ifdef __WXMSW__
+                #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
                     // don't prepend debug/trace here: it goes to the
                     // debug window anyhow, but do put a timestamp
                     wxString str;
diff --git a/src/msw/makefile.mic b/src/msw/makefile.mic
index f077d38b11..f0611d2b06 100644
--- a/src/msw/makefile.mic
+++ b/src/msw/makefile.mic
@@ -51,7 +51,7 @@ GENERICOBJS = \
 		$(GENDIR)/panelg.$(OBJSUFF) \
 		$(GENDIR)/progdlgg.$(OBJSUFF) \
 		$(GENDIR)/sashwin.$(OBJSUFF) \
-		$(GENDIR)/scrolwin.$(OBJSUFF) \
+		$(GENDIR)/scrlwing.$(OBJSUFF) \
 		$(GENDIR)/spinctlg.$(OBJSUFF) \
 		$(GENDIR)/splash.$(OBJSUFF) \
 		$(GENDIR)/splitter.$(OBJSUFF) \
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index b3f8c31882..7c9db9eac1 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2076,9 +2076,11 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
             }
             break;
 
+#ifndef __WXMICROWIN__
         case WM_ACTIVATEAPP:
             wxTheApp->SetActive(wParam != 0, FindFocus());
             break;
+#endif
 
         case WM_ACTIVATE:
             {
diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 15b397e6a7..ecd9ec5a97 100644
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -44,6 +44,7 @@
 #include "wx/notebook.h"
 #include "wx/spinbutt.h"
 #include "wx/settings.h"
+#include "wx/menu.h"
 
 #include "wx/univ/scrtimer.h"