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

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 525fa9114abc6298a17dff7cddad123c9b78a0a9..f1199332a04c63fddfe70f10d75e49e4d5e5b6a1 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -65,6 +65,7 @@
 #include "wx/dirdlg.h"
 #include "wx/cmndata.h"
 #include "wx/intl.h"
 #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"
 #ifdef wxUSE_SERIAL
 #include "wx/objstrm.h"
 #include "wx/serbase.h"

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 046c703af2d8fe011ad306581586511810e81fea..e89bd8835c7ecf758a47dc93ccf8921f9f530ac7 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -532,6 +532,8 @@ bool wxDebugContext::SetFile(const wxString& file)
 
 bool wxDebugContext::SetStandardError(void)
 {
 
 bool wxDebugContext::SetStandardError(void)
 {

+    // Obsolete
+#if 0

 #if !defined(_WINDLL)
   wxDebugStreamBuf *buf = new wxDebugStreamBuf;
   ostream *stream = new ostream(m_streamBuf);
 #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
 #else
   return FALSE;
 #endif

+#endif
+  return FALSE;

 }
 
 
 }
 
 

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 2550f3d3d57a5f183f2798717618f02ac8cc2ea8..844c66caa8ecab94e6cedaceae2621d2825a03c6 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -61,6 +61,7 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= \
   $(GENDIR)/choicdgg.$(OBJSUFF) \
   $(GENDIR)/colrdlgg.$(OBJSUFF) \
 GENERICOBJS= \
   $(GENDIR)/choicdgg.$(OBJSUFF) \
   $(GENDIR)/colrdlgg.$(OBJSUFF) \

+  $(GENDIR)/dirdlg.$(OBJSUFF) \

   $(GENDIR)/fontdlgg.$(OBJSUFF) \
   $(GENDIR)/gridg.$(OBJSUFF) \
   $(GENDIR)/laywin.$(OBJSUFF) \
   $(GENDIR)/fontdlgg.$(OBJSUFF) \
   $(GENDIR)/gridg.$(OBJSUFF) \
   $(GENDIR)/laywin.$(OBJSUFF) \


@@ -169,7 +170,6 @@ MSWOBJS = \
   dde.$(OBJSUFF) \
   dialog.$(OBJSUFF) \
   dib.$(OBJSUFF) \
   dde.$(OBJSUFF) \
   dialog.$(OBJSUFF) \
   dib.$(OBJSUFF) \

-  dirdlg.$(OBJSUFF) \

   filedlg.$(OBJSUFF) \
   font.$(OBJSUFF) \
   fontdlg.$(OBJSUFF) \
   filedlg.$(OBJSUFF) \
   font.$(OBJSUFF) \
   fontdlg.$(OBJSUFF) \


@@ -225,6 +225,9 @@ MSWOBJS = \
   wave.$(OBJSUFF) \
   window.$(OBJSUFF)
 
   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) \
 # OLE not supported yet by GnuWin32
 #  $(OLEDIR)/droptgt.$(OBJSUFF) \
 #  $(OLEDIR)/dropsrc.$(OBJSUFF) \