Getting wxMicroWindows compiled again

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

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;