From 8573e3645f3d8e6b179cc29a7230e28192d0f9c9 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 19 Sep 2007 14:39:45 +0000
Subject: [PATCH] upping version numbers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/mac/carbon/chkconf.h      |  8 ++++
 include/wx/mac/carbon/config_xcode.h |  4 +-
 include/wx/mac/carbon/private.h      | 59 ++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/include/wx/mac/carbon/chkconf.h b/include/wx/mac/carbon/chkconf.h
index 294804f479..536b0c053e 100644
--- a/include/wx/mac/carbon/chkconf.h
+++ b/include/wx/mac/carbon/chkconf.h
@@ -58,6 +58,14 @@
     #define wxMAC_USE_NATIVE_TOOLBAR 1
 #endif
 
+/*
+ * using mixins of cocoa functionality
+ */
+ 
+#ifndef wxMAC_USE_COCOA
+    #define wxMAC_USE_COCOA 1
+#endif
+
 #endif
     /* _WX_MAC_CHKCONF_H_ */
 
diff --git a/include/wx/mac/carbon/config_xcode.h b/include/wx/mac/carbon/config_xcode.h
index 4204f53786..ca40c5bc2c 100644
--- a/include/wx/mac/carbon/config_xcode.h
+++ b/include/wx/mac/carbon/config_xcode.h
@@ -116,9 +116,9 @@
 #define WXWIN_OS_DESCRIPTION "Darwin 7.9.0 Power Macintosh"
 #define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org"
 #define PACKAGE_NAME "wxWidgets"
-#define PACKAGE_STRING "wxWidgets 2.8.3"
+#define PACKAGE_STRING "wxWidgets 2.8.6"
 #define PACKAGE_TARNAME "wxwidgets"
-#define PACKAGE_VERSION "2.8.3"
+#define PACKAGE_VERSION "2.8.6"
 
 // for regex
 #define WX_NO_REGEX_ADVANCED 1
diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index a15f04437a..c2e457ffc8 100644
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -454,6 +454,7 @@ CTabHandle         wxMacCreateColorTable( int numColors );
 */
 void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 );
 void wxMacReleaseBitmapButton( ControlButtonContentInfo*info );
+CGImageRef wxMacCreateCGImageFromBitmap( const wxBitmap& bitmap );
 
 #define MAC_WXCOLORREF(a) (*((RGBColor*)&(a)))
 #define MAC_WXHBITMAP(a) (GWorldPtr(a))
@@ -1372,5 +1373,63 @@ private :
     void* m_pool;
 };
 
+// NSObject
+
+void wxMacCocoaRelease( void* obj );
+void wxMacCocoaAutorelease( void* obj );
+void wxMacCocoaRetain( void* obj );
+
+#if wxMAC_USE_COCOA
+
+// NSCursor
+
+WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type );
+WX_NSCursor  wxMacCocoaCreateCursorFromCGImage( CGImageRef cgImageRef, float hotSpotX, float hotSpotY );
+void  wxMacCocoaSetCursor( WX_NSCursor cursor );
+void  wxMacCocoaHideCursor();
+void  wxMacCocoaShowCursor();
+
+typedef struct tagClassicCursor
+{
+    wxUint16 bits[16];
+    wxUint16 mask[16];
+    wxInt16 hotspot[2];
+}ClassicCursor;
+
+#else // !wxMAC_USE_COCOA
+
+// non Darwin
+
+typedef Cursor ClassicCursor;
+
+#endif // wxMAC_USE_COCOA
+
+// -------------
+// Common to all
+// -------------
+
+// Cursor support
+
+const short kwxCursorBullseye = 0;
+const short kwxCursorBlank = 1;
+const short kwxCursorPencil = 2;
+const short kwxCursorMagnifier = 3;
+const short kwxCursorNoEntry = 4;
+const short kwxCursorPaintBrush = 5;
+const short kwxCursorPointRight = 6;
+const short kwxCursorPointLeft = 7;
+const short kwxCursorQuestionArrow = 8;
+const short kwxCursorRightArrow = 9;
+const short kwxCursorSizeNS = 10;
+const short kwxCursorSize = 11;
+const short kwxCursorSizeNESW = 12;
+const short kwxCursorSizeNWSE = 13;
+const short kwxCursorRoller = 14;
+const short kwxCursorLast = kwxCursorRoller;
+
+// exposing our fallback cursor map
+
+extern ClassicCursor gMacCursors[];
+
 #endif
     // _WX_PRIVATE_H_