modifications for compilation under Mac OS X

applied patches extracted from submission by Marc Newsam (tested under Mac OS 9) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-15 21:51:14 +00:00
parent f0c5ebdc0d
commit 03e11df547
149 changed files with 1693 additions and 761 deletions
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -54,7 +54,7 @@ protected:
    #include "wx/msw/statbr95.h"

    typedef wxStatusBar95 wxStatusBarReal;
-#elif defined(__WXMAC__)
+#elif defined(__WXMAC__) && !defined(__UNIX__)
    #include "wx/mac/statusbr.h"

    typedef wxStatusBarMac wxStatusBarReal;