wxCriticalSection changes undone - should work now

[wxWidgets.git] / src / msw / minifram.cpp

diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp
index 8192f2009255c71c738581d072032aab559db5e4..282ae2bbdd2fd0a6c94b36de6b641d7eb3c38ec7 100644 (file)
--- a/src/msw/minifram.cpp
+++ b/src/msw/minifram.cpp
@@ -32,9 +32,11 @@
 #include "wx/minifram.h"
 #include "wx/msw/private.h"
 
+#ifndef __TWIN32__
 #ifdef __GNUWIN32__
 #include "wx/msw/gnuwin32/extra.h"
 #endif
+#endif
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
@@ -89,7 +91,7 @@ wxMiniFrame::~wxMiniFrame(void)
 
 #include <string.h>
 
-#if !defined( __WATCOMC__ ) && !defined( __MWERKS__ )
+#if !defined( __WATCOMC__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
 #include <memory.h>
 #endif