Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved CVS conflict

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-08-04 10:05:41 +00:00
parent 6ebeb4c721
commit b7972e1fa8
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/msw/wince/setup.h
View File

@@ -252,13 +252,8 @@
// Use standard C++ streams if 1. If 0, use wxWin streams implementation only. // Use standard C++ streams if 1. If 0, use wxWin streams implementation only.
#define wxUSE_STD_IOSTREAM 0 #define wxUSE_STD_IOSTREAM 0
<<<<<<< setup.h
// Enable converion to standard C++ string if 1.
#define wxUSE_STD_STRING 1
=======
// Enable conversion to standard C++ string if 1. // Enable conversion to standard C++ string if 1.
#define wxUSE_STD_STRING 0 #define wxUSE_STD_STRING 0
>>>>>>> 1.62
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// non GUI features selection // non GUI features selection
@@ -484,7 +479,6 @@
// Recommended setting: 1 if you have the QT SDK installed and you need it, else 0 // Recommended setting: 1 if you have the QT SDK installed and you need it, else 0
#define wxUSE_QUICKTIME 0 #define wxUSE_QUICKTIME 0
<<<<<<< setup.h
// Use DirectShow (requires linkage to strmiids.lib) // Use DirectShow (requires linkage to strmiids.lib)
// //
// Default is 0 // Default is 0
@@ -492,8 +486,6 @@
// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0 // Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0
#define wxUSE_DIRECTSHOW 0 #define wxUSE_DIRECTSHOW 0
=======
>>>>>>> 1.62
// Use GStreamer for Unix (req a lot of dependancies) // Use GStreamer for Unix (req a lot of dependancies)
// //
// Default is 0 // Default is 0