Finished porting Robin's wxSizers

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

diff --git a/src/msw/curico.cpp b/src/msw/curico.cpp
index fa3767391c2bbe4c1afeaa9978cd166bfd9dcaea..5bd16e67a0867a723c2a7cfef1e51587e2424dc0 100644 (file)
--- a/src/msw/curico.cpp
+++ b/src/msw/curico.cpp
@@ -25,14 +25,14 @@
 #endif
 
 #ifndef __TWIN32__
-#ifdef __GNUWIN32__
+#if defined (__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #endif
 
+#include "wx/wxchar.h"
 #include "wx/msw/curicop.h"
 #include "wx/msw/curico.h"
-#include "wx/wxchar.h"
 #include "wx/string.h"
 
 //*****************************************************************************