Fix compilation of wx/scopeguard.h with g++ -fno-exceptions.

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

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index dc7478372c5a9e0da21fb3eaaa842c5615b0b6af..709a39dbbef0b27f23a1a5f2f7383fa2a34f164a 100644 (file)
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -32,6 +32,12 @@
     #import <Cocoa/Cocoa.h>
 #endif
 
     #import <Cocoa/Cocoa.h>
 #endif
 

+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
+// available in 10.4 but not in the headers
+enum {
+    kEventMouseScroll             = 11
+};
+#endif

 //
 // shared between Cocoa and Carbon
 //
 //
 // shared between Cocoa and Carbon
 //


@@ -55,6 +61,8 @@ WXDLLIMPEXP_BASE wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef add
 WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
 WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
 
 WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
 WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
 

+class WXDLLIMPEXP_FWD_CORE wxDialog;
+

 //
 //
 //
 //
 //
 //


@@ -171,6 +179,10 @@ public :
 
     virtual void                controlAction(WXWidget slf, void* _cmd, void* sender);
     virtual void                controlDoubleAction(WXWidget slf, void* _cmd, void *sender);
 
     virtual void                controlAction(WXWidget slf, void* _cmd, void* sender);
     virtual void                controlDoubleAction(WXWidget slf, void* _cmd, void *sender);

+    
+    // for wxTextCtrl-derived classes, put here since they don't all derive
+    // from the same pimpl class.
+    virtual void                controlTextDidChange();

 
 protected:
     WXWidget m_osxView;
 
 protected:
     WXWidget m_osxView;


@@ -287,7 +299,7 @@ protected :
 
     @end
 
 
     @end
 

-    @interface wxNSTextField : NSTextField
+    @interface wxNSTextField : NSTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>)

     {
         wxNSTextFieldEditor* fieldEditor;
     }
     {
         wxNSTextFieldEditor* fieldEditor;
     }


@@ -297,7 +309,7 @@ protected :
 
     @end
 
 
     @end
 

-    @interface wxNSSecureTextField : NSSecureTextField
+    @interface wxNSSecureTextField : NSSecureTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>)

     {
     }
 
     {
     }
 


@@ -346,8 +358,10 @@ protected :
     {
         BOOL sheetFinished;
         int resultCode;
     {
         BOOL sheetFinished;
         int resultCode;

+        wxDialog* impl;

     }
 
     }
 

+    - (void)setImplementation: (wxDialog *)dialog;

     - (BOOL)finished;
     - (int)code;
     - (void)waitForSheetToFinish;
     - (BOOL)finished;
     - (int)code;
     - (void)waitForSheetToFinish;