Source changes needed to get MDI support compiling on OS X Cocoa, and a explicit...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/cocoa/chkconf.h b/include/wx/osx/cocoa/chkconf.h
index c4b80425e7af1b01ec6e1a66657de22140226b2c..9780efedf3f7e79df2501581940b4c2470c46af4 100644 (file)
--- a/include/wx/osx/cocoa/chkconf.h
+++ b/include/wx/osx/cocoa/chkconf.h
@@ -44,16 +44,6 @@
  * turning off capabilities that don't work under cocoa yet
  */
 
-#if wxUSE_MDI
-#undef wxUSE_MDI
-#define wxUSE_MDI 0
-#endif
-
-#if wxUSE_MDI_ARCHITECTURE
-#undef wxUSE_MDI_ARCHITECTURE
-#define wxUSE_MDI_ARCHITECTURE 0
-#endif
-
 #if wxUSE_DRAG_AND_DROP
 #undef wxUSE_DRAG_AND_DROP
 #define wxUSE_DRAG_AND_DROP 0
@@ -74,12 +64,6 @@
 #define wxUSE_DATAVIEWCTRL 0
 #endif
 
-#if wxUSE_DOC_VIEW_ARCHITECTURE
-#undef wxUSE_DOC_VIEW_ARCHITECTURE
-#endif
-
-#define wxUSE_DOC_VIEW_ARCHITECTURE 0
-
 #if wxUSE_WXHTML_HELP
 #undef wxUSE_WXHTML_HELP
 #endif

diff --git a/include/wx/osx/uma.h b/include/wx/osx/uma.h
index 46ded9e42bdbd53999c63f3e47879cfbe1201517..899dae109e7de7b32be8e1b32a4c7330a8c2bb4d 100644 (file)
--- a/include/wx/osx/uma.h
+++ b/include/wx/osx/uma.h
@@ -1,5 +1,3 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/osx/classic/uma.h"
-#else
+#if __WXOSX_CARBON__
 #include "wx/osx/carbon/uma.h"
 #endif

diff --git a/src/osx/carbon/mdi.cpp b/src/osx/carbon/mdi.cpp
index cee55ca047ef1747c648edcd103356c441b3cca4..3cd460be7581515ccf67f0a009aac36051bb450f 100644 (file)
--- a/src/osx/carbon/mdi.cpp
+++ b/src/osx/carbon/mdi.cpp
@@ -50,7 +50,7 @@ static const int IDM_WINDOWTILEVERT = 4005;
 
 void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
 {
-#if 1 // TODO REMOVE
+#if wxOSX_USE_CARBON // TODO REMOVE
     if ( inWindowRef )
     {
 //        bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
@@ -74,6 +74,8 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
         SetPort( port ) ;
 #endif
     }
+#elif defined(wxOSX_USE_COCOA)
+// TODO: implement me!
 #endif
 }
 

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index d2374b6b8c12c1ead718ac5b9d0947f53d22b477..ab7f2f4cff67b3bae7a2b2adb4de392d94310afe 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -163,7 +163,7 @@ wxBitmap wxWindowDCImpl::DoGetAsBitmap(const wxRect *subrect) const
     NSBitmapImageRep *rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect: [view bounds]] retain];
     [view unlockFocus];
     
-    CGImageRef cgImageRef = [rep CGImage]; 
+    CGImageRef cgImageRef = (CGImageRef)[rep CGImage]; 
 
     wxBitmap bitmap(CGImageGetWidth(cgImageRef)  , CGImageGetHeight(cgImageRef) );
     CGRect r = CGRectMake( 0 , 0 , CGImageGetWidth(cgImageRef)  , CGImageGetHeight(cgImageRef) );