X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9dae7798b164a5f4abc85d16f49cabd4e0980c0..85b657c79d32e5876ce5b8ae1e7b9519fee18247:/include/wx/defs.h diff --git a/include/wx/defs.h b/include/wx/defs.h index 61415505d4..06eff5caa1 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -54,16 +54,12 @@ // suppress some Visual C++ warnings #ifdef __VISUALC__ + // the only "real" warning here is 4244 but there arej ust too many of them + // in our code... one day someone should go and fix them but until then... # pragma warning(disable:4201) // nonstandard extension used: nameless struct/union # pragma warning(disable:4244) // conversion from double to float -# pragma warning(disable:4100) // unreferenced formal parameter -# pragma warning(disable:4511) // copy ctor couldn't be generated -# pragma warning(disable:4512) // operator=() couldn't be generated -# pragma warning(disable:4699) // using precompiled header -# pragma warning(disable:4134) // conversion between pointers to members of same class # pragma warning(disable:4710) // function not inlined -# pragma warning(disable:4284) // -# pragma warning(disable:4097) // +# pragma warning(disable:4097) // typedef used as class #ifndef WIN32 # pragma warning(disable:4135) // conversion between different integral types # pragma warning(disable:4769) // assignment of near pointer to long integer @@ -234,7 +230,7 @@ typedef int wxWindowID; // check for explicit keyword support #ifndef HAVE_EXPLICIT #if defined(__VISUALC__) && (__VISUALC__ >= 1100) - // VC++ 6.0 and 5.0 have explicit (what about the earlier versions?) + // VC++ 6.0 and 5.0 have explicit (what about earlier versions?) #define HAVE_EXPLICIT #elif ( defined(__MINGW32__) || defined(__CYGWIN32__) ) \ && wxCHECK_GCC_VERSION(2, 95) @@ -260,7 +256,7 @@ typedef int wxWindowID; // check for static/const/reinterpret_cast<>() #ifndef HAVE_STATIC_CAST #if defined(__VISUALC__) && (__VISUALC__ >= 1100) - // VC++ 6.0 and 5.0 have C++ casts (what about the earlier versions?) + // VC++ 6.0 and 5.0 have C++ casts (what about earlier versions?) #define HAVE_CXX_CASTS #elif ( defined(__MINGW32__) || defined(__CYGWIN32__) ) \ && wxCHECK_GCC_VERSION(2, 95) @@ -275,6 +271,30 @@ typedef int wxWindowID; #endif #endif // HAVE_CXX_CASTS +#ifndef HAVE_STD_WSTRING + #if defined(__VISUALC__) && (__VISUALC__ >= 1100) + // VC++ 6.0 and 5.0 have std::wstring (what about earlier versions?) + #define HAVE_STD_WSTRING + #elif ( defined(__MINGW32__) || defined(__CYGWIN32__) ) \ + && wxCHECK_GCC_VERSION(3, 1) + // GCC 3.1 has std::wstring; 3.0 never was in MinGW, 2.95 hasn't it + #define HAVE_STD_WSTRING + #endif +#endif + +#ifndef HAVE_STD_STRING_COMPARE + #if defined(__VISUALC__) && (__VISUALC__ >= 1100) + // VC++ 6.0 and 5.0 have std::string::compare + // (what about earlier versions?) + #define HAVE_STD_STRING_COMPARE + #elif ( defined(__MINGW32__) || defined(__CYGWIN32__) ) \ + && wxCHECK_GCC_VERSION(3, 1) + // GCC 3.1 has std::string::compare; + // 3.0 never was in MinGW, 2.95 hasn't it + #define HAVE_STD_STRING_COMPARE + #endif +#endif + // ---------------------------------------------------------------------------- // portable calling conventions macros // ---------------------------------------------------------------------------- @@ -375,8 +395,10 @@ typedef int wxWindowID; #define WXMAKINGDLL_BASE #endif + #define WXMAKINGDLL_NET #define WXMAKINGDLL_CORE #define WXMAKINGDLL_HTML + #define WXMAKINGDLL_XML #endif // WXMAKINGDLL // WXDLLEXPORT maps to export declaration when building the DLL, to import @@ -392,6 +414,17 @@ typedef int wxWindowID; #define WXDLLIMPEXP_DATA_BASE(type) type #endif +#ifdef WXMAKINGDLL_NET + #define WXDLLIMPEXP_NET WXEXPORT + #define WXDLLIMPEXP_DATA_NET(type) WXEXPORT type +#elif defined(WXUSINGDLL) + #define WXDLLIMPEXP_NET WXIMPORT + #define WXDLLIMPEXP_DATA_NET(type) WXIMPORT type +#else // not making nor using DLL + #define WXDLLIMPEXP_NET + #define WXDLLIMPEXP_DATA_NET(type) type +#endif + #ifdef WXMAKINGDLL_CORE #define WXDLLIMPEXP_CORE WXEXPORT #define WXDLLIMPEXP_DATA_CORE(type) WXEXPORT type @@ -414,6 +447,22 @@ typedef int wxWindowID; #define WXDLLIMPEXP_DATA_HTML(type) type #endif +#ifdef WXMAKINGDLL_GL + #define WXDLLIMPEXP_GL WXEXPORT +#elif defined(WXUSINGDLL) + #define WXDLLIMPEXP_GL WXIMPORT +#else // not making nor using DLL + #define WXDLLIMPEXP_GL +#endif + +#ifdef WXMAKINGDLL_XML + #define WXDLLIMPEXP_XML WXEXPORT +#elif defined(WXUSINGDLL) + #define WXDLLIMPEXP_XML WXIMPORT +#else // not making nor using DLL + #define WXDLLIMPEXP_XML +#endif + // for backwards compatibility, define suffix-less versions too #define WXDLLEXPORT WXDLLIMPEXP_CORE #define WXDLLEXPORT_DATA WXDLLIMPEXP_DATA_CORE @@ -566,6 +615,7 @@ enum wxWIN32S, // Windows 32S API wxWIN95, // Windows 95 wxWIN386, // Watcom 32-bit supervisor modus + wxWINDOWS_CE, // Windows CE wxMGL_UNIX, // MGL with direct hardware access wxMGL_X, // MGL on X wxMGL_WIN32, // MGL on Win32 @@ -1220,20 +1270,6 @@ enum wxBorder #define wxSP_ARROW_KEYS 0x1000 #define wxSP_WRAP 0x2000 -/* - * wxSplitterWindow flags - */ -#define wxSP_NOBORDER 0x0000 -#define wxSP_NOSASH 0x0010 -#define wxSP_BORDER 0x0020 -#define wxSP_PERMIT_UNSPLIT 0x0040 -#define wxSP_LIVE_UPDATE 0x0080 -#define wxSP_3DSASH 0x0100 -#define wxSP_3DBORDER 0x0200 -#define wxSP_FULLSASH 0x0400 -#define wxSP_3D (wxSP_3DBORDER | wxSP_3DSASH) -#define wxSP_SASH_AQUA 0x0800 - /* * wxNotebook flags */ @@ -1379,6 +1415,19 @@ enum wxID_FIND, wxID_DUPLICATE, wxID_SELECTALL, + wxID_DELETE, + wxID_REPLACE, + wxID_REPLACE_ALL, + wxID_PROPERTIES, + + wxID_VIEW_DETAILS, + wxID_VIEW_LARGEICONS, + wxID_VIEW_SMALLICONS, + wxID_VIEW_LIST, + wxID_VIEW_SORTDATE, + wxID_VIEW_SORTNAME, + wxID_VIEW_SORTSIZE, + wxID_VIEW_SORTTYPE, wxID_FILE1 = 5050, wxID_FILE2, @@ -1995,11 +2044,13 @@ typedef struct objc_object *WX_##klass #endif // defined(__GNUC__) && defined(__APPLE__) DECLARE_WXCOCOA_OBJC_CLASS(NSApplication); +DECLARE_WXCOCOA_OBJC_CLASS(NSBitmapImageRep); DECLARE_WXCOCOA_OBJC_CLASS(NSBox); DECLARE_WXCOCOA_OBJC_CLASS(NSButton); DECLARE_WXCOCOA_OBJC_CLASS(NSColor); DECLARE_WXCOCOA_OBJC_CLASS(NSControl); DECLARE_WXCOCOA_OBJC_CLASS(NSEvent); +DECLARE_WXCOCOA_OBJC_CLASS(NSImage); DECLARE_WXCOCOA_OBJC_CLASS(NSLayoutManager); DECLARE_WXCOCOA_OBJC_CLASS(NSMenu); DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem); @@ -2305,5 +2356,9 @@ typedef struct window_t *WXWidget; classname(const classname&); \ classname& operator=(const classname&); +#define DECLARE_NO_ASSIGN_CLASS(classname) \ + private: \ + classname& operator=(const classname&); + #endif // _WX_DEFS_H_