1. wxLoad/SaveFileSelector return "wxString" instead of "char *"

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

diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp
index 8039c2fd78def4fc5dcb9bb2a0b444d0088a4d4d..282ae2bbdd2fd0a6c94b36de6b641d7eb3c38ec7 100644 (file)
--- a/src/msw/minifram.cpp
+++ b/src/msw/minifram.cpp
@@ -22,6 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/setup.h"
 
 #ifndef WX_PRECOMP
 #include "wx/setup.h"

+#include "wx/event.h"

 #include "wx/app.h"
 #include "wx/utils.h"
 #endif
 #include "wx/app.h"
 #include "wx/utils.h"
 #endif


@@ -31,9 +32,11 @@
 #include "wx/minifram.h"
 #include "wx/msw/private.h"
 
 #include "wx/minifram.h"
 #include "wx/msw/private.h"
 

+#ifndef __TWIN32__

 #ifdef __GNUWIN32__
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #ifdef __GNUWIN32__
 #include "wx/msw/gnuwin32/extra.h"
 #endif

+#endif

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)


@@ -88,7 +91,7 @@ wxMiniFrame::~wxMiniFrame(void)
 
 #include <string.h>
 
 
 #include <string.h>
 

-#if !defined( __WATCOMC__ ) && !defined( __MWERKS__ )
+#if !defined( __WATCOMC__ ) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)

 #include <memory.h>
 #endif
 
 #include <memory.h>
 #endif