#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
//
const CGRect * inBounds,
CGImageRef inImage) ;
WX_NSImage WXDLLIMPEXP_CORE wxOSXCreateNSImageFromCGImage( CGImageRef image );
+CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage );
#endif
long UMAGetSystemVersion() ;
WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
+class WXDLLIMPEXP_FWD_CORE wxDialog;
+
//
//
//
virtual bool IsVisible() const ;
virtual void SetVisibility(bool);
+ // we provide a static function which can be reused from
+ // wxNonOwnedWindowCocoaImpl too
+ static bool ShowViewOrWindowWithEffect(wxWindow *win,
+ bool show,
+ wxShowEffect effect,
+ unsigned timeout);
+
+ virtual bool ShowWithEffect(bool show,
+ wxShowEffect effect,
+ unsigned timeout);
+
virtual void Raise();
virtual void Lower();
virtual bool DoHandleCharEvent(NSEvent *event, NSString *text);
virtual void DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);
+ virtual void SetupKeyEvent(wxKeyEvent &wxevent, NSEvent * nsEvent, NSString* charString = NULL);
+ virtual void SetupMouseEvent(wxMouseEvent &wxevent, NSEvent * nsEvent);
+
+
void SetFlipped(bool flipped);
virtual bool IsFlipped() const { return m_isFlipped; }
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;
virtual ~wxNonOwnedWindowCocoaImpl();
- virtual void Destroy() ;
+ virtual void WillBeDestroyed() ;
void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
long style, long extraStyle, const wxString& name ) ;
void Raise();
void Lower();
bool Show(bool show);
- bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);
+
+ virtual bool ShowWithEffect(bool show,
+ wxShowEffect effect,
+ unsigned timeout);
void Update();
bool SetTransparent(wxByte alpha);
bool SetBackgroundColour(const wxColour& col );
void SetExtraStyle( long exStyle );
+ void SetWindowStyleFlag( long style );
bool SetBackgroundStyle(wxBackgroundStyle style);
bool CanSetTransparent();
virtual bool ShowFullScreen(bool show, long style);
+ virtual void ShowWithoutActivating();
+
virtual void RequestUserAttention(int flags);
virtual void ScreenToWindow( int *x, int *y );
virtual void WindowToScreen( int *x, int *y );
+ virtual bool IsActive();
+
+ virtual void SetModified(bool modified);
+ virtual bool IsModified() const;
+
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
protected :
WX_wxNSWindow m_macWindow;
@interface wxNSButton : NSButton
{
+ NSTrackingRectTag rectTag;
}
@end
@end
- @interface wxNSTextField : NSTextField
+ @interface wxNSTextField : NSTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>)
{
wxNSTextFieldEditor* fieldEditor;
}
@end
- @interface wxNSSecureTextField : NSSecureTextField
+ @interface wxNSSecureTextField : NSSecureTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>)
{
}
@end
- @interface wxNSTextView : NSTextView
+ @interface wxNSTextView : NSTextView wxOSX_10_6_AND_LATER(<NSTextViewDelegate>)
{
}
+ - (void)textDidChange:(NSNotification *)aNotification;
+
@end
@interface wxNSMenu : NSMenu
{
BOOL sheetFinished;
int resultCode;
+ wxDialog* impl;
}
+ - (void)setImplementation: (wxDialog *)dialog;
- (BOOL)finished;
- (int)code;
- (void)waitForSheetToFinish;