Define WXBUILDING in Xcode projects.

[wxWidgets.git] / include / wx / osx / carbon / private.h

diff --git a/include/wx/osx/carbon/private.h b/include/wx/osx/carbon/private.h
index fbe7ef5e13c22f1ff79856f1070bb7de7e4adfd2..4dac1cf0dfc711a7e1aff0f52bc9cbd855f58dbd 100644 (file)
--- a/include/wx/osx/carbon/private.h
+++ b/include/wx/osx/carbon/private.h
@@ -279,7 +279,7 @@ enum {
 class WXDLLIMPEXP_CORE wxMacControl : public wxWidgetImpl
 {
 public :
 class WXDLLIMPEXP_CORE wxMacControl : public wxWidgetImpl
 {
 public :

-    wxMacControl( wxWindowMac* peer , bool isRootControl = false );
+    wxMacControl( wxWindowMac* peer , bool isRootControl = false, bool isUserPane = false );

     wxMacControl() ;
     virtual ~wxMacControl();
 
     wxMacControl() ;
     virtual ~wxMacControl();
 


@@ -332,7 +332,6 @@ public :
     wxBitmap            GetBitmap() const;
     void                SetBitmap( const wxBitmap& bitmap );
     void                SetBitmapPosition( wxDirection dir );
     wxBitmap            GetBitmap() const;
     void                SetBitmap( const wxBitmap& bitmap );
     void                SetBitmapPosition( wxDirection dir );

-    void                SetupTabs( const wxNotebook &notebook );

 
     void                GetBestRect( wxRect *r ) const;
     bool                IsEnabled() const;
 
     void                GetBestRect( wxRect *r ) const;
     bool                IsEnabled() const;


@@ -967,7 +966,8 @@ const short kwxCursorSize = 11;
 const short kwxCursorSizeNESW = 12;
 const short kwxCursorSizeNWSE = 13;
 const short kwxCursorRoller = 14;
 const short kwxCursorSizeNESW = 12;
 const short kwxCursorSizeNWSE = 13;
 const short kwxCursorRoller = 14;

-const short kwxCursorLast = kwxCursorRoller;
+const short kwxCursorWatch = 15;
+const short kwxCursorLast = kwxCursorWatch;

 
 // exposing our fallback cursor map
 
 
 // exposing our fallback cursor map