removed GSocket_[Un]Streamed(), GSocket_SetNonOriented() must be used instead

[wxWidgets.git] / include / wx / msw / wx.rc

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index fa299cbc136a1c04b536152a678b55e90ebd05f8..4fdda467da662fc3e1066fb8e549c42181358183 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -30,9 +30,13 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #if (defined( __GNUWIN32__ ) && !defined(__TWIN32__)) || defined(__MWERKS__)
 /////////////////////////////////////////////////////////////////////////////
 
 #if (defined( __GNUWIN32__ ) && !defined(__TWIN32__)) || defined(__MWERKS__)

-       #include <wx/msw/gnuwin32/winresrc.h>
+    #include <wx/msw/gnuwin32/winresrc.h>

 #else
 #else

-       #include <windows.h>
+    #include <windows.h>
+#endif
+
+#if defined(_WIN32_WCE)
+    #include "wx/msw/wince/wince.rc"

 #endif
 
 //////////////////////////////////////////////////////////////////////////////
 #endif
 
 //////////////////////////////////////////////////////////////////////////////


@@ -110,4 +114,9 @@ wxBITMAP_STD_COLOURS    BITMAP "wx/msw/colours.bmp"
 // Manifest file for Windows XP
 //
 
 // Manifest file for Windows XP
 //
 

+#if !defined(__WIN64__)
+#if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)

 1 24 "wx/msw/wx.manifest"
 1 24 "wx/msw/wx.manifest"

+#endif
+#endif
+