Commit Graph

42 Commits

Author SHA1 Message Date
Vadim Zeitlin
70232f52e9 Do define __VISUALC__ when using Intel compiler under Windows.
This undoes r74888, r74913 and r74969 because all of them were still not
enough to make ICC build work correctly. So instead of trying to find all the
places where we need to test for __INTELC__ in addition to __VISUALC__, just
revert to defining __VISUALC__ for ICC under Windows as it uses its CRT anyhow
and in the vast majority of cases we are actually testing for the CRT and not
the compiler anyhow.

Closes #15359.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-14 15:08:06 +00:00
Vadim Zeitlin
42ed9e53ad Add more checks for Intel compiler.
This should have been part of r74888.

Closes #15359.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-01 23:04:51 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Vadim Zeitlin
c1818df912 Remove duplicate WXMAKINGDLL_RIBBON-related code.
For some reason both the definition of and test for WXMAKINGDLL_RIBBON was
duplicated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-06-08 02:23:55 +00:00
Vadim Zeitlin
4dca3e02a6 Define WXDLLIMPEXP_FWD_RIBBON for consistency with all the other libraries.
We defined only WXDLLIMPEXP_RIBBON but not the FWD version, do add it now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-10-23 13:51:06 +00:00
Vadim Zeitlin
2415cf6725 Remove support for MetroWerks CodeWarrior compiler.
This compiler doesn't exist any more and was probably unsupported even in 2.8,
let alone 2.9, so remove all the __MWERKS__ tests to simplify things.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-04-05 18:40:11 +00:00
Steve Lamerton
467d261e9d Rename web library to webview.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-19 10:45:16 +00:00
Steve Lamerton
906c935a80 Merge in from trunk r67662 to r64801
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-07-25 16:54:53 +00:00
Vadim Zeitlin
49d2c0adc3 Don't use __declspec(dllexport) for MinGW gcc 4.5 and later.
Due to the changes in gcc 4.5, copies of dllexported inline functions are now
generated in all object files including their declarations, increasing their
sizes tenfold, and they are also now instantiated in the DLL itself increasing
its size fourfold. Moreover, linking such a gigantic DLL requires inordinate
amounts of memory and takes a very long time, see some statistics at
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43601.

To avoid all these problems, don't use dllexport at all any more but rely on
binutils support for auto export/import which seems to work fine and results
in much smaller DLLs which are created much faster.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-06-17 21:53:26 +00:00
Steve Lamerton
9c805dec6c Fix compilation under dll builds. Wrap source files in wxUSE_WEB checks to allow minimal builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-05 20:30:51 +00:00
Steve Lamerton
384b8d9f3d Various typos fixes and minor build system changes. After a rebake wxMSW should now compile, although without any functionality.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-05 13:01:54 +00:00
Peter Cawley
3c3ead1d15 Merged GSOC Ribbon work from SOC2009_RIBBON branch into trunk.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-16 12:06:02 +00:00
Francesco Montorsi
23318a5358 declare all NameStr[] strings as const char using the correct WXDLLIMPEXP_DATA_ macros; in the process, change wxPropGrid window classes to take 'const wxString& name' arguments instead of 'const wxChar *name'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-02 22:16:14 +00:00
Stefan Csomor
74cc3ec18e make sure virtual method isn't inlined away
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-02 19:13:54 +00:00
Jaakko Salli
d4cd6b3e0e Added missing propgrid related lines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-02 14:37:53 +00:00
Stefan Csomor
5f9c3802c1 fixes #9982
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 19:04:42 +00:00
Vadim Zeitlin
1c4293cb91 added wxPropertyGrid from Jaakko Salli (#9934)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-12 20:57:41 +00:00
Václav Slavík
16361ec941 Generalized wxScrolledWindow into wxScrolled<T> that can derive from
anything (typically wxPanel or wxWindow). Fixed generic wxListCtrl to
use wxScrolled<wxWindow> - this fixes focus problems with label-editing
text control. Fixes to wxScrolledWindow doxygen docs.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-01 15:07:03 +00:00
Francesco Montorsi
53a2db124c substitute WXDLLEXPORT with WXDLLIMPEXP_CORE and WXDLLEXPORT_DATA with WXDLLIMPEXP_DATA_CORE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-26 15:06:00 +00:00
Vadim Zeitlin
1e6b2edfc8 remove ODBC and DBgrid libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-23 13:40:27 +00:00
Vadim Zeitlin
8ece1737f4 define WXDLLIMPEXP_FWD_XXX as nothing for mingw32 too to avoid warnings about __declspec being ignored in forward declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-01 12:14:35 +00:00
Vadim Zeitlin
7c77f33480 added WXDLLIMPEXP_TEMPLATE_INSTANCE_BASE() macro and use it to work around VC6 warnings about non DLL-exported templates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-14 21:02:09 +00:00
Václav Slavík
b9d4eff64f check for HAVE_VISIBILITY first when setting WXIMPORT/WXEXPORT; only set it on platforms where it makes sense
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-13 18:36:14 +00:00
Václav Slavík
5e3c3fc9b8 WXIMPORT must specify default visibility too, otherwise things like typeinfo may break subtly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-06 14:53:24 +00:00
Václav Slavík
0ff20b9f00 added GCC visibility support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-09 10:12:51 +00:00
Václav Slavík
b5dbe15d0b added WXDLLIMPEXP_FWD_FOO macros in addition to WXDLLIMPEXP_FOO for use with forward declarations (in preparation for GCC visibility support)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-09 10:09:52 +00:00
Vadim Zeitlin
c079af66c8 fix WXDLLIMPEXP_STC definition when building all wx libraries as DLLs (patch 1704527)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-21 15:13:37 +00:00
Julian Smart
3b2cb4316b Moved wxRichTextCtrl to its own library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-29 07:16:39 +00:00
Vadim Zeitlin
f5a9eef7c7 define WXMAKINGDLL_QA when WXMAKINGDLL is defined (patch 1502015)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-26 00:03:33 +00:00
Julian Smart
5e4903f5cc Further wxAUI commits
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-06 13:34:54 +00:00
Michael Wetherell
7275146d4d Unrevert Cygwin changes after discussion. Cygwin will be unix with the new
version of bakefile, but allow wxMSW to stay a Windows build until there is
a unix version of it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-22 20:58:47 +00:00
Michael Wetherell
ff8fbb8dbe Revert Cygwin changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-16 15:31:33 +00:00
Michael Wetherell
3d94765e6e Let Cygwin be a Windows build for wxMSW and a unix build otherwise
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-16 13:58:23 +00:00
Vadim Zeitlin
61639efb66 added qa library (currently consisting of wxDebugReport and related classes only); moved debugrpt.* files there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-21 00:11:06 +00:00
Vadim Zeitlin
0ae4d1210a define WXMAKINGDLL_GL if WXMAKINGDLL (patch 1106875)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-31 22:36:05 +00:00
Robin Dunn
c220a8ec4f More DLL build fixes for wxMediaCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-24 00:07:45 +00:00
Ryan Norton
ff2b312fc8 dll fixes for media lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 12:46:51 +00:00
Robin Dunn
c846884b38 Make sure that WXMAKINGDLL_XRC is defined correctly for monolithic DLL builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-07 22:58:09 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
David Webster
fd92852491 Need to ensure WXEXPORT and WXIMPORT are not defined for EMX or INNOTEK builds when compiling with WXMAKINGDLL=1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-10 16:38:00 +00:00
Vadim Zeitlin
0cc66b6c0b moved DLL import/export declarations from wx/defs.h to (new) wx/dlimpexp.h for GSocket; added wxUnusedVar() and wxDUMMY_INITIALIZE() to wx/defs.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 10:25:56 +00:00