// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
-// RCS-ID: $Id: private.h 53819 2008-05-29 14:11:45Z SC $
+// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_PRIVATE_COCOA_H_
#define _WX_PRIVATE_COCOA_H_
-#include "wx/osx/core/private.h"
-
-#include "wx/defs.h"
-
#include <ApplicationServices/ApplicationServices.h>
-#if wxOSX_USE_ATSU_TEXT
- // we need theming and atsu
- #include <Carbon/Carbon.h>
-#else
- // we only need theming, if we find a better include replace the following
- #include <Carbon/Carbon.h>
-#endif
-
#ifdef __OBJC__
#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
//
CGContextRef inContext,
const CGRect * inBounds,
CGImageRef inImage) ;
-WX_NSImage WXDLLIMPEXP_CORE wxOSXCreateNSImageFromCGImage( CGImageRef image );
-CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSSImage( WX_NSImage nsimage );
-#endif
+WX_NSImage WXDLLIMPEXP_CORE wxOSXGetNSImageFromCGImage( CGImageRef image );
+CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage );
+wxBitmap WXDLLIMPEXP_CORE wxOSXCreateSystemBitmap(const wxString& id, const wxString &client, const wxSize& size);
-long UMAGetSystemVersion() ;
-WXDLLIMPEXP_BASE void wxMacStringToPascal( const wxString&from , StringPtr to );
-WXDLLIMPEXP_BASE wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL );
-WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
-WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
-
-//
-//
-//
-
-#if wxUSE_GUI
+class WXDLLIMPEXP_FWD_CORE wxDialog;
class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl
{
public :
- wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;
+ wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false, bool isUserPane = false ) ;
wxWidgetCocoaImpl() ;
~wxWidgetCocoaImpl();
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 WXWidget GetWXWidget() const { return m_osxView; }
virtual void SetBackgroundColour(const wxColour&);
+ virtual bool SetBackgroundStyle(wxBackgroundStyle style);
virtual void GetContentArea( int &left , int &top , int &width , int &height ) const;
virtual void Move(int x, int y, int width, int height);
void SetScrollThumb( wxInt32 value, wxInt32 thumbSize );
void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
+ void SetToolTip( wxToolTip* tooltip );
void InstallEventHandler( WXWidget control = NULL );
virtual bool DoHandleKeyEvent(NSEvent *event);
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);
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;
NSEvent* m_lastKeyDownEvent;
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 Create( wxWindow* parent, WXWindow nativeWindow );
WXWindow GetWXWindow() const;
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;
+
+ virtual void SetRepresentedFilename(const wxString& filename);
+
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
+
+ CGWindowLevel GetWindowLevel() const { return m_macWindowLevel; }
+ void RestoreWindowLevel();
protected :
- WX_wxNSWindow m_macWindow;
- void * m_macFullScreenData ;
+ CGWindowLevel m_macWindowLevel;
+ WXWindow m_macWindow;
+ void * m_macFullScreenData ;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
};
#ifdef __OBJC__
+ WXDLLIMPEXP_CORE NSScreen* wxOSXGetMenuScreen();
WXDLLIMPEXP_CORE NSRect wxToNSRect( NSView* parent, const wxRect& r );
WXDLLIMPEXP_CORE wxRect wxFromNSRect( NSView* parent, const NSRect& rect );
WXDLLIMPEXP_CORE NSPoint wxToNSPoint( NSView* parent, const wxPoint& p );
@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;
- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
@end
+ // This interface must be exported in shared 64 bit multilib build but
+ // using WXEXPORT with Objective C interfaces doesn't work with old (4.0.1)
+ // gcc when using 10.4 SDK. It does work with newer gcc even in 32 bit
+ // builds but seems to be unnecessary there so to avoid the expense of a
+ // configure check verifying if this does work or not with the current
+ // compiler we just only use it for 64 bit builds where this is always
+ // supported.
+ //
+ // NB: Currently this is the only place where we need to export an
+ // interface but if we need to do it elsewhere we should define a
+ // WXEXPORT_OBJC macro once and reuse it in all places it's needed
+ // instead of duplicating this preprocessor check.
+#ifdef __LP64__
+ WXEXPORT
+#endif // 64 bit builds
+ @interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER(<NSApplicationDelegate>)
+ {
+ }
+
+ @end
#endif // __OBJC__
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
projects / wxWidgets.git / blobdiff