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 097c5945f09540dd9de2a968b8c8f106b6535122..a27b1945a1e3028b78cadad9d5299377e20966b2 100644 (file)
--- 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
 #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
 #define wxUSE_LOG_DIALOG 1

+#endif

 
 #if wxUSE_LOG_DIALOG
     #include "wx/listctrl.h"
 
 #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__
             {
         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;
                     // 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 f077d38b1137afd90e8bcb074d417cc5272a68d1..f0611d2b0690eee150a327e5a839f06e525d1552 100644 (file)
--- 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)/panelg.$(OBJSUFF) \
                $(GENDIR)/progdlgg.$(OBJSUFF) \
                $(GENDIR)/sashwin.$(OBJSUFF) \

-               $(GENDIR)/scrolwin.$(OBJSUFF) \
+               $(GENDIR)/scrlwing.$(OBJSUFF) \

                $(GENDIR)/spinctlg.$(OBJSUFF) \
                $(GENDIR)/splash.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \
                $(GENDIR)/spinctlg.$(OBJSUFF) \
                $(GENDIR)/splash.$(OBJSUFF) \
                $(GENDIR)/splitter.$(OBJSUFF) \

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index b3f8c31882cffa6b9936c6a0375fcc4a640a7601..7c9db9eac1d72b883faa15fd49810d0b39c8e0c1 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2076,9 +2076,11 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
             }
             break;
 
             }
             break;
 

+#ifndef __WXMICROWIN__

         case WM_ACTIVATEAPP:
             wxTheApp->SetActive(wParam != 0, FindFocus());
             break;
         case WM_ACTIVATEAPP:
             wxTheApp->SetActive(wParam != 0, FindFocus());
             break;

+#endif

 
         case WM_ACTIVATE:
             {
 
         case WM_ACTIVATE:
             {

diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 15b397e6a7bdd30df8302b74d0a6612d91d231de..ecd9ec5a97c54f37e7b27156a0ef314a1cb831ea 100644 (file)
--- 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/notebook.h"
 #include "wx/spinbutt.h"
 #include "wx/settings.h"

+#include "wx/menu.h"

 
 #include "wx/univ/scrtimer.h"
 
 
 #include "wx/univ/scrtimer.h"