Corrected memory.cpp compilation error; Cygwin makefile uses generic wxDirDlg

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

include/wx/wx.h

@@ -65,6 +65,7 @@
 #include "wx/dirdlg.h"
 #include "wx/cmndata.h"
 #include "wx/intl.h"
+#include "wx/valtext.h"
 #ifdef wxUSE_SERIAL
 #include "wx/objstrm.h"
 #include "wx/serbase.h"

src/common/memory.cpp

@@ -532,6 +532,8 @@ bool wxDebugContext::SetFile(const wxString& file)
 
 bool wxDebugContext::SetStandardError(void)
 {
+    // Obsolete
+#if 0
 #if !defined(_WINDLL)
   wxDebugStreamBuf *buf = new wxDebugStreamBuf;
   ostream *stream = new ostream(m_streamBuf);
@@ -540,6 +542,8 @@ bool wxDebugContext::SetStandardError(void)
 #else
   return FALSE;
 #endif
+#endif
+  return FALSE;
 }
 
 

src/msw/makefile.g95

@@ -61,6 +61,7 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= \
   $(GENDIR)/choicdgg.$(OBJSUFF) \
   $(GENDIR)/colrdlgg.$(OBJSUFF) \
+  $(GENDIR)/dirdlg.$(OBJSUFF) \
   $(GENDIR)/fontdlgg.$(OBJSUFF) \
   $(GENDIR)/gridg.$(OBJSUFF) \
   $(GENDIR)/laywin.$(OBJSUFF) \
@@ -169,7 +170,6 @@ MSWOBJS = \
   dde.$(OBJSUFF) \
   dialog.$(OBJSUFF) \
   dib.$(OBJSUFF) \
-  dirdlg.$(OBJSUFF) \
   filedlg.$(OBJSUFF) \
   font.$(OBJSUFF) \
   fontdlg.$(OBJSUFF) \
@@ -225,6 +225,9 @@ MSWOBJS = \
   wave.$(OBJSUFF) \
   window.$(OBJSUFF)
 
+# Native wxDirDlg can't be compiled due to GnuWin32/OLE limitations
+#  dirdlg.$(OBJSUFF) \
+
 # OLE not supported yet by GnuWin32
 #  $(OLEDIR)/droptgt.$(OBJSUFF) \
 #  $(OLEDIR)/dropsrc.$(OBJSUFF) \