Commit Graph

7 Commits

Author SHA1 Message Date
Vadim Zeitlin
382c4adea6 Fix preprocessor definitions for wxBase build under OS X.
Define __WXOSX__ for non-GUI build under Darwin. Ensure that the rest of the
code compiles correctly when just __WXOSX__ is defined but neither of
__WXOSX_{CARBON,COCOA,IPHONE}__ is. This ensures that wxBase can actually be
built under Mac.

Move OS X symbols definitions in wx/platform.h after wx/setup.h inclusion as
they rely on __DARWIN__ and wxUSE_GUI values which are both define in that
file now. Still keep them before wx/chkconf.h inclusion which relies on
__WXOSX_XXX__ being defined. Yes, it's a mess and should be cleaned up more
permanently some day.

Also remove some redundancy from wx/osx/{carbon,cocoa}/private.h by factoring
out common parts into wx/osx/core/private.h. Also include this header itself
from wx/osx/private.h directly instead of including it thrice from different
sub-ports headers.

Closes #12660.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-09 23:53:42 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-21 10:41:26 +00:00
Stefan Csomor
7d68e720e7 fixing end-of-file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-23 09:10:37 +00:00
Stefan Csomor
935e6c7dc1 defines reordered, support for non-precomp cocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-06 16:30:42 +00:00
Stefan Csomor
fe1a36a70c OSX reshuffling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-30 15:00:41 +00:00
Stefan Csomor
ef0e92205a fixing file paths after renaming
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-11 19:17:41 +00:00
Stefan Csomor
5c6eb3a84b renaming
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-11 16:30:48 +00:00