X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eefe52da50fcdda92521bb3a68a236fdc0e8ed8d..df53be12c55c077d9c2e1c479a1552188638495c:/include/wx/osx/core/private.h diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h index 2e7a377222..d423355b2e 100644 --- a/include/wx/osx/core/private.h +++ b/include/wx/osx/core/private.h @@ -21,12 +21,32 @@ #include "wx/osx/core/cfstring.h" #include "wx/osx/core/cfdataref.h" +// 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 wxOSX_USE_COCOA_OR_CARBON + +WXDLLIMPEXP_BASE long UMAGetSystemVersion() ; + +void WXDLLIMPEXP_CORE wxMacStringToPascal( const wxString&from , unsigned char * to ); +wxString WXDLLIMPEXP_CORE wxMacMakeStringFromPascal( const unsigned char * from ); + +#endif + #if wxUSE_GUI #if wxOSX_USE_IPHONE #include #else -#include +#include #endif #include "wx/bitmap.h" @@ -34,7 +54,7 @@ class WXDLLIMPEXP_CORE wxMacCGContextStateSaver { - DECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver) + wxDECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver); public: wxMacCGContextStateSaver( CGContextRef cg ) @@ -53,7 +73,7 @@ private: class WXDLLIMPEXP_CORE wxDeferredObjectDeleter : public wxObject { public : - wxDeferredObjectDeleter( wxObject* obj ) : m_obj(obj) + wxDeferredObjectDeleter( wxObject* obj ) : m_obj(obj) { } virtual ~wxDeferredObjectDeleter() @@ -79,6 +99,86 @@ class wxWindowMac; extern wxWindow* g_MacLastWindow; class wxNonOwnedWindow; +// temporary typedef so that no additional casts are necessary within carbon code at the moment + +class wxMacControl; +class wxWidgetImpl; +class wxComboBox; +class wxNotebook; +class wxTextCtrl; + +WXDLLIMPEXP_CORE wxWindowMac * wxFindWindowFromWXWidget(WXWidget inControl ); + +#if wxOSX_USE_CARBON +typedef wxMacControl wxWidgetImplType; +#else +typedef wxWidgetImpl wxWidgetImplType; +#endif + +#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 ; } + + static wxMenuItemImpl* Create( wxMenuItem* peer, wxMenu *pParentMenu, + int id, + const wxString& text, + wxAcceleratorEntry *entry, + const wxString& strHelp, + wxItemKind kind, + wxMenu *pSubMenu ); + +protected : + wxMenuItem* m_peer; + + DECLARE_ABSTRACT_CLASS(wxMenuItemImpl) +} ; + +class wxMenuImpl : public wxObject +{ +public : + wxMenuImpl( wxMenu* peer ) : m_peer(peer) + { + } + + 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) +} ; +#endif + + class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject { public : @@ -88,12 +188,10 @@ public : void Init(); - virtual void Destroy(); - 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 @@ -102,21 +200,33 @@ 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; virtual void Move(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; + virtual void SetControlSize( wxWindowVariant variant ) = 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; @@ -124,19 +234,262 @@ 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; + + 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 wxWidgetImpl* CreateUserPane( wxWindowMac* wxpeer, const wxPoint& pos, const wxSize& size, - long style, long extraStyle, const wxString& name) ; - static wxWidgetImpl* CreateContentView( wxNonOwnedWindow* now ) ; + + static wxWidgetImplType* CreateUserPane( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle) ; + static wxWidgetImplType* CreateContentView( wxNonOwnedWindow* now ) ; + + static wxWidgetImplType* CreateButton( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle) ; + + static wxWidgetImplType* CreateDisclosureTriangle( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle) ; + + static wxWidgetImplType* CreateStaticLine( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle) ; + + static wxWidgetImplType* CreateGroupBox( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle) ; + + static wxWidgetImplType* CreateStaticText( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle) ; + + static wxWidgetImplType* CreateTextControl( wxTextCtrl* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxString& content, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle) ; + + static wxWidgetImplType* CreateSearchControl( wxTextCtrl* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxString& content, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle) ; + + static wxWidgetImplType* CreateCheckBox( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle); + + static wxWidgetImplType* CreateRadioButton( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle); + + static wxWidgetImplType* CreateToggleButton( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle); + + static wxWidgetImplType* CreateBitmapToggleButton( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxBitmap& bitmap, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle); + + static wxWidgetImplType* CreateBitmapButton( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxBitmap& bitmap, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle); + + static wxWidgetImplType* CreateTabView( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle); + + static wxWidgetImplType* CreateGauge( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + wxInt32 value, + wxInt32 minimum, + wxInt32 maximum, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle); + + static wxWidgetImplType* CreateSlider( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + wxInt32 value, + wxInt32 minimum, + wxInt32 maximum, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle); + + static wxWidgetImplType* CreateSpinButton( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + wxInt32 value, + wxInt32 minimum, + wxInt32 maximum, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle); + + static wxWidgetImplType* CreateScrollBar( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle); + + static wxWidgetImplType* CreateChoice( wxWindowMac* wxpeer, + wxWindowMac* parent, + wxWindowID id, + wxMenu* menu, + 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 extraStyle); + +#if wxOSX_USE_COCOA + static wxWidgetImplType* CreateComboBox( wxComboBox* wxpeer, + wxWindowMac* parent, + wxWindowID id, + wxMenu* menu, + const wxPoint& pos, + const wxSize& size, + long style, + long extraStyle); +#endif // converts from Toplevel-Content relative to local static void Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to ); @@ -144,10 +497,210 @@ protected : bool m_isRootControl; wxWindowMac* m_wxPeer; bool m_needsFocusRect; + bool m_needsFrame; + bool m_shouldSendEvents; DECLARE_ABSTRACT_CLASS(wxWidgetImpl) }; +// +// the interface to be implemented eg by a listbox +// + +class WXDLLIMPEXP_CORE wxListWidgetColumn +{ +public : + virtual ~wxListWidgetColumn() {} +} ; + +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; +} ; + +class WXDLLIMPEXP_CORE wxListWidgetImpl +{ +public: + wxListWidgetImpl() {} + virtual ~wxListWidgetImpl() { } + + 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, + wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) = 0 ; + + // add and remove + + // TODO will be replaced + virtual void ListDelete( unsigned int n ) = 0; + virtual void ListInsert( unsigned int n ) = 0; + virtual void ListClear() = 0; + + // selecting + + virtual void ListDeselectAll() = 0; + virtual void ListSetSelection( unsigned int n, bool select, bool multi ) = 0; + 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; + virtual void UpdateLine( unsigned int n, wxListWidgetColumn* col = NULL ) = 0; + virtual void UpdateLineToEnd( unsigned int n) = 0; + + // 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 : + // 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 ; + virtual void SetStringValue( const wxString &val ) = 0 ; + virtual void SetSelection( long from, long to ) = 0 ; + 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 long GetLastPosition() const ; + virtual void Replace( long from, long to, const wxString &str ) ; + virtual void Remove( long from, long to ) ; + + + virtual bool HasOwnContextMenu() const + { return false ; } + + virtual bool SetupCursor( const wxPoint& WXUNUSED(pt) ) + { return false ; } + + virtual void Clear() ; + virtual bool CanUndo() const; + virtual void Undo() ; + virtual bool CanRedo() const; + virtual void Redo() ; + virtual int GetNumberOfLines() const ; + virtual long XYToPosition(long x, long y) const; + virtual bool PositionToXY(long pos, long *x, long *y) const ; + virtual void ShowPosition(long WXUNUSED(pos)) ; + virtual int GetLineLength(long lineNo) const ; + virtual wxString GetLineText(long lineNo) const ; + virtual void CheckSpelling(bool WXUNUSED(check)) { } + + virtual wxSize GetBestSize() const { return wxDefaultSize; } + +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 +// + +class wxSearchWidgetImpl +{ +public : + wxSearchWidgetImpl(){} + virtual ~wxSearchWidgetImpl(){} + + // search field options + virtual void ShowSearchButton( bool show ) = 0; + virtual bool IsSearchButtonVisible() const = 0; + + virtual void ShowCancelButton( bool show ) = 0; + virtual bool IsCancelButtonVisible() const = 0; + + virtual void SetSearchMenu( wxMenu* menu ) = 0; + + virtual void SetDescriptiveText(const wxString& text) = 0; +} ; + +// +// toplevel window implementation class +// + class wxNonOwnedWindowImpl : public wxObject { public : @@ -160,94 +713,120 @@ 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() { } - virtual bool Show(bool show) + virtual bool Show(bool WXUNUSED(show)) { return false; } - - virtual bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout) + + virtual bool ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout)) { return Show(show); } - + virtual void Update() { } - virtual bool SetTransparent(wxByte alpha) + virtual bool SetTransparent(wxByte WXUNUSED(alpha)) { return false; } - virtual bool SetBackgroundColour(const wxColour& col ) + virtual bool SetBackgroundColour(const wxColour& WXUNUSED(col) ) { return false; } - virtual void SetExtraStyle( long exStyle ) + virtual void SetExtraStyle( long WXUNUSED(exStyle) ) + { + } + + virtual void SetWindowStyleFlag( long WXUNUSED(style) ) { } - - virtual bool SetBackgroundStyle(wxBackgroundStyle 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; - virtual bool SetShape(const wxRegion& region) + virtual bool SetShape(const wxRegion& WXUNUSED(region)) { 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) @@ -274,7 +853,7 @@ private : void wxMacCocoaRelease( void* obj ); void wxMacCocoaAutorelease( void* obj ); -void wxMacCocoaRetain( void* obj ); +void* wxMacCocoaRetain( void* obj ); #endif