X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e181c7a2c32193fc8138cc32ed07984eadd4a21..43ff861df48f0837dac98005dd397c5f127ca136:/include/wx/osx/core/private.h diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h index 462e0e882f..a42f8287ab 100644 --- a/include/wx/osx/core/private.h +++ b/include/wx/osx/core/private.h @@ -21,13 +21,32 @@ #include "wx/osx/core/cfstring.h" #include "wx/osx/core/cfdataref.h" -#if wxOSX_USE_COCOA_OR_CARBON +// Define helper macros allowing to insert small snippets of code to be +// compiled for high enough OS X version only: this shouldn't be abused for +// anything big but it's handy for e.g. specifying OS X 10.6-only protocols in +// the Objective C classes declarations when they're not supported under the +// previous versions +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + #define wxOSX_10_6_AND_LATER(x) x +#else + #define wxOSX_10_6_AND_LATER(x) +#endif + +#if !wxUSE_GUI || wxOSX_USE_COCOA_OR_CARBON + +// Carbon functions are currently still used in wxOSX/Cocoa too (including +// wxBase part of it). +#include WXDLLIMPEXP_BASE long UMAGetSystemVersion() ; void WXDLLIMPEXP_CORE wxMacStringToPascal( const wxString&from , unsigned char * to ); wxString WXDLLIMPEXP_CORE wxMacMakeStringFromPascal( const unsigned char * from ); +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 ); + #endif #if wxUSE_GUI @@ -43,7 +62,7 @@ wxString WXDLLIMPEXP_CORE wxMacMakeStringFromPascal( const unsigned char * from class WXDLLIMPEXP_CORE wxMacCGContextStateSaver { - DECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver) + wxDECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver); public: wxMacCGContextStateSaver( CGContextRef cg ) @@ -62,7 +81,7 @@ private: class WXDLLIMPEXP_CORE wxDeferredObjectDeleter : public wxObject { public : - wxDeferredObjectDeleter( wxObject* obj ) : m_obj(obj) + wxDeferredObjectDeleter( wxObject* obj ) : m_obj(obj) { } virtual ~wxDeferredObjectDeleter() @@ -92,8 +111,12 @@ class wxNonOwnedWindow; class wxMacControl; class wxWidgetImpl; +class wxComboBox; class wxNotebook; class wxTextCtrl; +class wxSearchCtrl; + +WXDLLIMPEXP_CORE wxWindowMac * wxFindWindowFromWXWidget(WXWidget inControl ); #if wxOSX_USE_CARBON typedef wxMacControl wxWidgetImplType; @@ -101,20 +124,21 @@ typedef wxMacControl wxWidgetImplType; typedef wxWidgetImpl wxWidgetImplType; #endif -class wxMenuItemImpl : public wxObject +#if wxUSE_MENUS +class wxMenuItemImpl : public wxObject { public : wxMenuItemImpl( wxMenuItem* peer ) : m_peer(peer) { } - + virtual ~wxMenuItemImpl() ; virtual void SetBitmap( const wxBitmap& bitmap ) = 0; virtual void Enable( bool enable ) = 0; virtual void Check( bool check ) = 0; virtual void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) = 0; virtual void Hide( bool hide = true ) = 0; - + virtual void * GetHMenuItem() = 0; wxMenuItem* GetWXPeer() { return m_peer ; } @@ -126,40 +150,44 @@ public : const wxString& strHelp, wxItemKind kind, wxMenu *pSubMenu ); - + + // handle OS specific menu items if they weren't handled during normal processing + virtual bool DoDefault() { return false; } protected : wxMenuItem* m_peer; - - DECLARE_ABSTRACT_CLASS(wxMenuItemImpl); + + DECLARE_ABSTRACT_CLASS(wxMenuItemImpl) } ; -class wxMenuImpl : public wxObject +class wxMenuImpl : public wxObject { public : wxMenuImpl( wxMenu* peer ) : m_peer(peer) { } - - virtual ~wxMenuImpl() ; - virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) = 0; + + virtual ~wxMenuImpl() ; + virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) = 0; virtual void Remove( wxMenuItem *pItem ) = 0; - + virtual void MakeRoot() = 0; virtual void SetTitle( const wxString& text ) = 0; virtual WXHMENU GetHMenu() = 0; - + wxMenu* GetWXPeer() { return m_peer ; } + virtual void PopUp( wxWindow *win, int x, int y ) = 0; + static wxMenuImpl* Create( wxMenu* peer, const wxString& title ); static wxMenuImpl* CreateRootMenu( wxMenu* peer ); protected : wxMenu* m_peer; - - DECLARE_ABSTRACT_CLASS(wxMenuItemImpl); -} ; + DECLARE_ABSTRACT_CLASS(wxMenuItemImpl) +} ; +#endif class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject @@ -174,7 +202,7 @@ public : bool IsRootControl() const { return m_isRootControl; } wxWindowMac* GetWXPeer() const { return m_wxPeer; } - + bool IsOk() const { return GetWXWidget() != NULL; } // not only the control itself, but also all its parents must be visible @@ -183,15 +211,23 @@ public : // set the visibility of this widget (maybe latent) virtual void SetVisibility( bool visible ) = 0; + virtual bool ShowWithEffect(bool WXUNUSED(show), + wxShowEffect WXUNUSED(effect), + unsigned WXUNUSED(timeout)) + { + return false; + } + virtual void Raise() = 0; - + virtual void Lower() = 0; virtual void ScrollRect( const wxRect *rect, int dx, int dy ) = 0; virtual WXWidget GetWXWidget() const = 0; - + virtual void SetBackgroundColour( const wxColour& col ) = 0; + virtual bool SetBackgroundStyle(wxBackgroundStyle style) = 0; // all coordinates in native parent widget relative coordinates virtual void GetContentArea( int &left , int &top , int &width , int &height ) const = 0; @@ -199,6 +235,20 @@ public : virtual void GetPosition( int &x, int &y ) const = 0; virtual void GetSize( int &width, int &height ) const = 0; virtual void SetControlSize( wxWindowVariant variant ) = 0; + virtual float GetContentScaleFactor() const + { + return 1.0; + } + + // the native coordinates may have an 'aura' for shadows etc, if this is the case the layout + // inset indicates on which insets the real control is drawn + virtual void GetLayoutInset(int &left , int &top , int &right, int &bottom) const + { + left = top = right = bottom = 0; + } + + // native view coordinates are topleft to bottom right (flipped regarding CoreGraphics origin) + virtual bool IsFlipped() const { return true; } virtual void SetNeedsDisplay( const wxRect* where = NULL ) = 0; virtual bool GetNeedsDisplay() const = 0; @@ -206,219 +256,265 @@ public : virtual bool NeedsFocusRect() const; virtual void SetNeedsFocusRect( bool needs ); + virtual bool NeedsFrame() const; + virtual void SetNeedsFrame( bool needs ); + virtual bool CanFocus() const = 0; // return true if successful virtual bool SetFocus() = 0; virtual bool HasFocus() const = 0; - + virtual void RemoveFromParent() = 0; virtual void Embed( wxWidgetImpl *parent ) = 0; - + virtual void SetDefaultButton( bool isDefault ) = 0; virtual void PerformClick() = 0; virtual void SetLabel( const wxString& title, wxFontEncoding encoding ) = 0; +#if wxOSX_USE_COCOA + virtual void SetLabelMarkup( const wxString& WXUNUSED(markup) ) { } +#endif + + virtual void SetCursor( const wxCursor & cursor ) = 0; + virtual void CaptureMouse() = 0; + virtual void ReleaseMouse() = 0; virtual wxInt32 GetValue() const = 0; virtual void SetValue( wxInt32 v ) = 0; + virtual wxBitmap GetBitmap() const = 0; virtual void SetBitmap( const wxBitmap& bitmap ) = 0; + virtual void SetBitmapPosition( wxDirection dir ) = 0; virtual void SetupTabs( const wxNotebook ¬ebook ) =0; virtual void GetBestRect( wxRect *r ) const = 0; virtual bool IsEnabled() const = 0; virtual void Enable( bool enable ) = 0; virtual void SetMinimum( wxInt32 v ) = 0; virtual void SetMaximum( wxInt32 v ) = 0; + virtual wxInt32 GetMinimum() const = 0; + virtual wxInt32 GetMaximum() const = 0; virtual void PulseGauge() = 0; virtual void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) = 0; virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ) = 0; + virtual void SetToolTip(wxToolTip* WXUNUSED(tooltip)) { } + // is the clicked event sent AFTER the state already changed, so no additional // state changing logic is required from the outside virtual bool ButtonClickDidStateChange() = 0; + virtual void InstallEventHandler( WXWidget control = NULL ) = 0; + + // Mechanism used to keep track of whether a change should send an event + // Do SendEvents(false) when starting actions that would trigger programmatic events + // and SendEvents(true) at the end of the block. + virtual void SendEvents(bool shouldSendEvents) { m_shouldSendEvents = shouldSendEvents; } + virtual bool ShouldSendEvents() { return m_shouldSendEvents; } + + // static methods for associating native controls and their implementations + + static wxWidgetImpl* + FindFromWXWidget(WXWidget control); + + static void RemoveAssociations( wxWidgetImpl* impl); + + static void Associate( WXWidget control, wxWidgetImpl *impl ); + + static WXWidget FindFocus(); + // static creation methods, must be implemented by all toolkits - - static wxWidgetImplType* CreateUserPane( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxPoint& pos, + + static wxWidgetImplType* CreateUserPane( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle) ; static wxWidgetImplType* CreateContentView( wxNonOwnedWindow* now ) ; - static wxWidgetImplType* CreateButton( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, + static wxWidgetImplType* CreateButton( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, const wxString& label, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle) ; - static wxWidgetImplType* CreateDisclosureTriangle( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, + static wxWidgetImplType* CreateDisclosureTriangle( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, const wxString& label, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle) ; - - static wxWidgetImplType* CreateStaticLine( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxPoint& pos, + + static wxWidgetImplType* CreateStaticLine( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle) ; - static wxWidgetImplType* CreateGroupBox( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, + static wxWidgetImplType* CreateGroupBox( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, const wxString& label, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle) ; - static wxWidgetImplType* CreateStaticText( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, + static wxWidgetImplType* CreateStaticText( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, const wxString& label, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle) ; - static wxWidgetImplType* CreateTextControl( wxTextCtrl* wxpeer, - wxWindowMac* parent, - wxWindowID id, + static wxWidgetImplType* CreateTextControl( wxTextCtrl* wxpeer, + wxWindowMac* parent, + wxWindowID id, const wxString& content, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle) ; - static wxWidgetImplType* CreateSearchControl( wxTextCtrl* wxpeer, - wxWindowMac* parent, - wxWindowID id, + static wxWidgetImplType* CreateSearchControl( wxSearchCtrl* wxpeer, + wxWindowMac* parent, + wxWindowID id, const wxString& content, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle) ; - static wxWidgetImplType* CreateCheckBox( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, + static wxWidgetImplType* CreateCheckBox( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, const wxString& label, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle); - - static wxWidgetImplType* CreateRadioButton( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, + + static wxWidgetImplType* CreateRadioButton( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, const wxString& label, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle); - static wxWidgetImplType* CreateToggleButton( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, + static wxWidgetImplType* CreateToggleButton( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, const wxString& label, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle); - static wxWidgetImplType* CreateBitmapToggleButton( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, + static wxWidgetImplType* CreateBitmapToggleButton( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, const wxBitmap& bitmap, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle); - static wxWidgetImplType* CreateBitmapButton( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, + static wxWidgetImplType* CreateBitmapButton( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, const wxBitmap& bitmap, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle); - static wxWidgetImplType* CreateTabView( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxPoint& pos, + static wxWidgetImplType* CreateTabView( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle); - static wxWidgetImplType* CreateGauge( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, + static wxWidgetImplType* CreateGauge( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, wxInt32 value, wxInt32 minimum, wxInt32 maximum, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle); - static wxWidgetImplType* CreateSlider( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, + static wxWidgetImplType* CreateSlider( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, wxInt32 value, wxInt32 minimum, wxInt32 maximum, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle); - static wxWidgetImplType* CreateSpinButton( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, + static wxWidgetImplType* CreateSpinButton( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, wxInt32 value, wxInt32 minimum, wxInt32 maximum, - const wxPoint& pos, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle); - static wxWidgetImplType* CreateScrollBar( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxPoint& pos, + static wxWidgetImplType* CreateScrollBar( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle); - static wxWidgetImplType* CreateChoice( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, + static wxWidgetImplType* CreateChoice( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, wxMenu* menu, - const wxPoint& pos, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle); + + static wxWidgetImplType* CreateListBox( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle); - static wxWidgetImplType* CreateListBox( wxWindowMac* wxpeer, - wxWindowMac* parent, - wxWindowID id, - const wxPoint& pos, +#if wxOSX_USE_COCOA + static wxWidgetImplType* CreateComboBox( wxComboBox* wxpeer, + wxWindowMac* parent, + wxWindowID id, + wxMenu* menu, + const wxPoint& pos, const wxSize& size, - long style, + long style, long extraStyle); +#endif // converts from Toplevel-Content relative to local static void Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to ); @@ -426,6 +522,8 @@ protected : bool m_isRootControl; wxWindowMac* m_wxPeer; bool m_needsFocusRect; + bool m_needsFrame; + bool m_shouldSendEvents; DECLARE_ABSTRACT_CLASS(wxWidgetImpl) }; @@ -434,7 +532,7 @@ protected : // the interface to be implemented eg by a listbox // -class WXDLLIMPEXP_CORE wxListWidgetColumn +class WXDLLIMPEXP_CORE wxListWidgetColumn { public : virtual ~wxListWidgetColumn() {} @@ -445,11 +543,13 @@ class WXDLLIMPEXP_CORE wxListWidgetCellValue public : wxListWidgetCellValue() {} virtual ~wxListWidgetCellValue() {} - + virtual void Set( CFStringRef value ) = 0; virtual void Set( const wxString& value ) = 0; virtual void Set( int value ) = 0; - + virtual void Check( bool check ); + + virtual bool IsChecked() const; virtual int GetIntValue() const = 0; virtual wxString GetStringValue() const = 0; } ; @@ -459,12 +559,12 @@ class WXDLLIMPEXP_CORE wxListWidgetImpl public: wxListWidgetImpl() {} virtual ~wxListWidgetImpl() { } - - virtual wxListWidgetColumn* InsertTextColumn( unsigned pos, const wxString& title, bool editable = false, + + virtual wxListWidgetColumn* InsertTextColumn( unsigned pos, const wxString& title, bool editable = false, wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) = 0 ; - virtual wxListWidgetColumn* InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false, + virtual wxListWidgetColumn* InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false, wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) = 0 ; - + // add and remove // TODO will be replaced @@ -479,7 +579,7 @@ public: virtual int ListGetSelection() const = 0; virtual int ListGetSelections( wxArrayInt& aSelections ) const = 0; virtual bool ListIsSelected( unsigned int n ) const = 0; - + // display virtual void ListScrollTo( unsigned int n ) = 0; @@ -489,21 +589,32 @@ public: // accessing content virtual unsigned int ListGetCount() const = 0; + + virtual int DoListHitTest( const wxPoint& inpoint ) const = 0; }; // // interface to be implemented by a textcontrol // +class WXDLLIMPEXP_FWD_CORE wxTextAttr; +class WXDLLIMPEXP_FWD_CORE wxTextEntry; + // common interface for all implementations class WXDLLIMPEXP_CORE wxTextWidgetImpl { public : - wxTextWidgetImpl() {} + // Any widgets implementing this interface must be associated with a + // wxTextEntry so instead of requiring the derived classes to implement + // another (pure) virtual function, just take the pointer to this entry in + // our ctor and implement GetTextEntry() ourselves. + wxTextWidgetImpl(wxTextEntry *entry) : m_entry(entry) {} virtual ~wxTextWidgetImpl() {} + wxTextEntry *GetTextEntry() const { return m_entry; } + virtual bool CanFocus() const { return true; } virtual wxString GetStringValue() const = 0 ; @@ -512,13 +623,14 @@ public : virtual void GetSelection( long* from, long* to ) const = 0 ; virtual void WriteText( const wxString& str ) = 0 ; + virtual bool GetStyle( long position, wxTextAttr& style); virtual void SetStyle( long start, long end, const wxTextAttr& style ) ; virtual void Copy() ; virtual void Cut() ; virtual void Paste() ; virtual bool CanPaste() const ; virtual void SetEditable( bool editable ) ; - virtual wxTextPos GetLastPosition() const ; + virtual long GetLastPosition() const ; virtual void Replace( long from, long to, const wxString &str ) ; virtual void Remove( long from, long to ) ; @@ -541,8 +653,54 @@ public : virtual int GetLineLength(long lineNo) const ; virtual wxString GetLineText(long lineNo) const ; virtual void CheckSpelling(bool WXUNUSED(check)) { } + + virtual wxSize GetBestSize() const { return wxDefaultSize; } + + virtual bool SetHint(const wxString& WXUNUSED(hint)) { return false; } +private: + wxTextEntry * const m_entry; + + wxDECLARE_NO_COPY_CLASS(wxTextWidgetImpl); +}; + +// common interface for all implementations +class WXDLLIMPEXP_CORE wxComboWidgetImpl + +{ +public : + wxComboWidgetImpl() {} + + virtual ~wxComboWidgetImpl() {} + + virtual int GetSelectedItem() const { return -1; }; + virtual void SetSelectedItem(int WXUNUSED(item)) {}; + + virtual int GetNumberOfItems() const { return -1; }; + + virtual void InsertItem(int WXUNUSED(pos), const wxString& WXUNUSED(item)) {} + + virtual void RemoveItem(int WXUNUSED(pos)) {} + + virtual void Clear() {} + + virtual wxString GetStringAtIndex(int WXUNUSED(pos)) const { return wxEmptyString; } + + virtual int FindString(const wxString& WXUNUSED(text)) const { return -1; } }; +// +// common interface for buttons +// + +class wxButtonImpl +{ + public : + wxButtonImpl(){} + virtual ~wxButtonImpl(){} + + virtual void SetPressedBitmap( const wxBitmap& bitmap ) = 0; +} ; + // // common interface for search controls // @@ -581,21 +739,21 @@ public : virtual ~wxNonOwnedWindowImpl() { } - - virtual void Destroy() + + virtual void WillBeDestroyed() { } virtual void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, long style, long extraStyle, const wxString& name ) = 0; - - + + virtual WXWindow GetWXWindow() const = 0; - + virtual void Raise() { } - + virtual void Lower() { } @@ -604,12 +762,12 @@ public : { return false; } - + virtual bool ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout)) { return Show(show); } - + virtual void Update() { } @@ -627,18 +785,22 @@ public : virtual void SetExtraStyle( long WXUNUSED(exStyle) ) { } - + + virtual void SetWindowStyleFlag( long WXUNUSED(style) ) + { + } + virtual bool SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style)) - { + { return false ; } - - bool CanSetTransparent() + + virtual bool CanSetTransparent() { return false; } - virtual void GetContentArea( int &left , int &top , int &width , int &height ) const = 0; + virtual void GetContentArea( int &left , int &top , int &width , int &height ) const = 0; virtual void MoveWindow(int x, int y, int width, int height) = 0; virtual void GetPosition( int &x, int &y ) const = 0; virtual void GetSize( int &width, int &height ) const = 0; @@ -647,34 +809,50 @@ public : { return false; } - + virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) = 0; - + virtual bool IsMaximized() const = 0; - + virtual bool IsIconized() const= 0; - + virtual void Iconize( bool iconize )= 0; - + virtual void Maximize(bool maximize) = 0; - + virtual bool IsFullScreen() const= 0; - + + virtual void ShowWithoutActivating() { Show(true); } + virtual bool ShowFullScreen(bool show, long style)= 0; virtual void RequestUserAttention(int flags) = 0; - - virtual void ScreenToWindow( int *x, int *y ) = 0; - + + virtual void ScreenToWindow( int *x, int *y ) = 0; + virtual void WindowToScreen( int *x, int *y ) = 0; - + + virtual bool IsActive() = 0; + wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } - + + static wxNonOwnedWindowImpl* + FindFromWXWindow(WXWindow window); + + static void RemoveAssociations( wxNonOwnedWindowImpl* impl); + + static void Associate( WXWindow window, wxNonOwnedWindowImpl *impl ); + // static creation methods, must be implemented by all toolkits - + + static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, WXWindow native) ; + static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size, long style, long extraStyle, const wxString& name ) ; + virtual void SetModified(bool WXUNUSED(modified)) { } + virtual bool IsModified() const { return false; } + protected : wxNonOwnedWindow* m_wxPeer; DECLARE_ABSTRACT_CLASS(wxNonOwnedWindowImpl) @@ -701,7 +879,7 @@ private : void wxMacCocoaRelease( void* obj ); void wxMacCocoaAutorelease( void* obj ); -void wxMacCocoaRetain( void* obj ); +void* wxMacCocoaRetain( void* obj ); #endif