From 05cf95ed0d95aa51f26f05d4aff0fc10e1964cdb Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 7 Sep 2008 20:09:57 +0000 Subject: [PATCH] non-precomp fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/nonownedwnd.mm | 10 +++------- src/osx/cocoa/window.mm | 4 +++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm index eba768adb8..ec7fcf12c1 100644 --- a/src/osx/cocoa/nonownedwnd.mm +++ b/src/osx/cocoa/nonownedwnd.mm @@ -10,16 +10,12 @@ ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" - -#if wxOSX_USE_COCOA -#include -#else -#include +#ifndef WX_PRECOMP + #include "wx/nonownedwnd.h" + #include "wx/frame.h" #endif -#ifdef __WXMAC__ #include "wx/osx/private.h" -#endif NSRect wxToNSRect( NSView* parent, const wxRect& r ) { diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm index a358f96dca..df977ab281 100644 --- a/src/osx/cocoa/window.mm +++ b/src/osx/cocoa/window.mm @@ -11,7 +11,9 @@ #include "wx/wxprec.h" -#include +#ifndef WX_PRECOMP +#include "wx/nonownedwnd.h" +#endif #ifdef __WXMAC__ #include "wx/osx/private.h" -- 2.47.2