solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Replace wxOVERRIDE with override in Objective-C++ files too

Browse source 
This completes the changes of 88d526660f (Replace wxOVERRIDE and
wxNOEXCEPT with override and noexcept, 2022-10-12).
This commit is contained in:
Vadim Zeitlin 2022-10-18 02:09:38 +02:00
parent e3cf23e945
commit 8afec036ee
29 changed files with 179 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/osx/cocoa/choice.mm
View file

@ -73,22 +73,22 @@ public:
delete m_popUpMenu;
}
void InsertItem( size_t pos, int itemid, const wxString& text) wxOVERRIDE
void InsertItem( size_t pos, int itemid, const wxString& text) override
{
m_popUpMenu->Insert( pos, itemid, text );
}
size_t GetNumberOfItems() const wxOVERRIDE
size_t GetNumberOfItems() const override
{
return m_popUpMenu->GetMenuItemCount();
}
void RemoveItem( size_t pos ) wxOVERRIDE
void RemoveItem( size_t pos ) override
{
m_popUpMenu->Delete( m_popUpMenu->FindItemByPosition( pos ) );
}
void SetItem(int pos, const wxString& s) wxOVERRIDE
void SetItem(int pos, const wxString& s) override
{
m_popUpMenu->FindItemByPosition( pos )->SetItemLabel( s ) ;
}

18
src/osx/cocoa/colour.mm
View file

@ -23,19 +23,19 @@ public:
virtual ~wxNSColorRefData();
virtual CGFloat Red() const wxOVERRIDE;
virtual CGFloat Green() const wxOVERRIDE;
virtual CGFloat Blue() const wxOVERRIDE;
virtual CGFloat Alpha() const wxOVERRIDE;
virtual CGFloat Red() const override;
virtual CGFloat Green() const override;
virtual CGFloat Blue() const override;
virtual CGFloat Alpha() const override;
virtual bool IsSolid() const wxOVERRIDE;
virtual bool IsSolid() const override;
CGColorRef GetCGColor() const wxOVERRIDE;
CGColorRef GetCGColor() const override;
virtual wxColourRefData* Clone() const wxOVERRIDE { return new wxNSColorRefData(*this); }
virtual wxColourRefData* Clone() const override { return new wxNSColorRefData(*this); }
virtual WX_NSColor GetNSColor() const wxOVERRIDE;
virtual WX_NSImage GetNSPatternImage() const wxOVERRIDE;
virtual WX_NSColor GetNSColor() const override;
virtual WX_NSImage GetNSPatternImage() const override;
private:
static CGFloat GetCGColorComponent(CGColorRef col, int rgbaIndex);
WX_NSColor m_nsColour;

12
src/osx/cocoa/datetimectrl.mm
View file

@ -72,7 +72,7 @@ public:
{
}
virtual void SetDateTime(const wxDateTime& dt) wxOVERRIDE
virtual void SetDateTime(const wxDateTime& dt) override
{
wxDateTime dtFrom, dtTo;
@ -82,12 +82,12 @@ public:
[View() setDateValue: NSDateFromWX(dt)];
}
virtual wxDateTime GetDateTime() const wxOVERRIDE
virtual wxDateTime GetDateTime() const override
{
return NSDateToWX([View() dateValue]);
}
virtual void SetDateRange(const wxDateTime& dt1, const wxDateTime& dt2) wxOVERRIDE
virtual void SetDateRange(const wxDateTime& dt1, const wxDateTime& dt2) override
{
// Note that passing nil is ok here so we don't need to test for the
// dates validity.
@ -95,7 +95,7 @@ public:
[View() setMaxDate: NSDateFromWX(dt2)];
}
virtual bool GetDateRange(wxDateTime* dt1, wxDateTime* dt2) wxOVERRIDE
virtual bool GetDateRange(wxDateTime* dt1, wxDateTime* dt2) override
{
bool hasLimits = false;
if ( dt1 )
@ -115,7 +115,7 @@ public:
virtual void controlAction(WXWidget WXUNUSED(slf),
void* WXUNUSED(cmd),
void* WXUNUSED(sender)) wxOVERRIDE
void* WXUNUSED(sender)) override
{
wxWindow* const wxpeer = GetWXPeer();
if ( wxpeer )
@ -125,7 +125,7 @@ public:
}
}
virtual void Enable(bool enable = true) wxOVERRIDE
virtual void Enable(bool enable = true) override
{
wxNSDatePicker* const nsdatePicker = View();

6
src/osx/cocoa/gauge.mm
View file

@ -50,19 +50,19 @@ public :
{
}
void SetMaximum(wxInt32 v) wxOVERRIDE
void SetMaximum(wxInt32 v) override
{
SetDeterminateMode();
wxWidgetCocoaImpl::SetMaximum( v ) ;
}
void SetValue(wxInt32 v) wxOVERRIDE
void SetValue(wxInt32 v) override
{
SetDeterminateMode();
wxWidgetCocoaImpl::SetValue( v ) ;
}
void PulseGauge() wxOVERRIDE
void PulseGauge() override
{
if ( ![(wxNSProgressIndicator*)m_osxView isIndeterminate] )
{

46
src/osx/cocoa/listbox.mm
View file

@ -105,47 +105,47 @@ public :
~wxListWidgetCocoaImpl();
virtual wxListWidgetColumn* InsertTextColumn( unsigned pos, const wxString& title, bool editable = false,
wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) wxOVERRIDE ;
wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) override ;
virtual wxListWidgetColumn* InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false,
wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) wxOVERRIDE ;
wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) override ;
// add and remove
virtual void ListDelete( unsigned int n ) wxOVERRIDE ;
virtual void ListInsert( unsigned int n ) wxOVERRIDE ;
virtual void ListClear() wxOVERRIDE ;
virtual void ListDelete( unsigned int n ) override ;
virtual void ListInsert( unsigned int n ) override ;
virtual void ListClear() override ;
// selecting
virtual void ListDeselectAll() wxOVERRIDE;
virtual void ListDeselectAll() override;
virtual void ListSetSelection( unsigned int n, bool select, bool multi ) wxOVERRIDE ;
virtual int ListGetSelection() const wxOVERRIDE ;
virtual void ListSetSelection( unsigned int n, bool select, bool multi ) override ;
virtual int ListGetSelection() const override ;
virtual int ListGetSelections( wxArrayInt& aSelections ) const wxOVERRIDE ;
virtual int ListGetSelections( wxArrayInt& aSelections ) const override ;
virtual bool ListIsSelected( unsigned int n ) const wxOVERRIDE ;
virtual bool ListIsSelected( unsigned int n ) const override ;
// display
virtual void ListScrollTo( unsigned int n ) wxOVERRIDE ;
virtual void ListScrollTo( unsigned int n ) override ;
virtual int ListGetTopItem() const wxOVERRIDE;
virtual int ListGetCountPerPage() const wxOVERRIDE;
virtual int ListGetTopItem() const override;
virtual int ListGetCountPerPage() const override;
// accessing content
virtual unsigned int ListGetCount() const wxOVERRIDE ;
virtual int DoListHitTest( const wxPoint& inpoint ) const wxOVERRIDE;
virtual unsigned int ListGetCount() const override ;
virtual int DoListHitTest( const wxPoint& inpoint ) const override;
int ListGetColumnType( int col )
{
return col;
}
virtual void UpdateLine( unsigned int n, wxListWidgetColumn* col = NULL ) wxOVERRIDE ;
virtual void UpdateLineToEnd( unsigned int n) wxOVERRIDE;
virtual void UpdateLine( unsigned int n, wxListWidgetColumn* col = NULL ) override ;
virtual void UpdateLineToEnd( unsigned int n) override;
virtual void controlDoubleAction(WXWidget slf, void* _cmd, void *sender) wxOVERRIDE;
virtual void controlDoubleAction(WXWidget slf, void* _cmd, void *sender) override;
protected :
@ -196,20 +196,20 @@ public :
virtual ~wxNSTableViewCellValue() {}
virtual void Set( CFStringRef v ) wxOVERRIDE
virtual void Set( CFStringRef v ) override
{
value = [[(NSString*)v retain] autorelease];
}
virtual void Set( const wxString& value ) wxOVERRIDE
virtual void Set( const wxString& value ) override
{
Set( (CFStringRef) wxCFStringRef( value ) );
}
virtual void Set( int v ) wxOVERRIDE
virtual void Set( int v ) override
{
value = [NSNumber numberWithInt:v];
}
virtual int GetIntValue() const wxOVERRIDE
virtual int GetIntValue() const override
{
if ( [value isKindOfClass:[NSNumber class]] )
return [ (NSNumber*) value intValue ];
@ -217,7 +217,7 @@ public :
return 0;
}
virtual wxString GetStringValue() const wxOVERRIDE
virtual wxString GetStringValue() const override
{
if ( [value isKindOfClass:[NSString class]] )
return wxCFStringRef::AsString( (NSString*) value );

34
src/osx/cocoa/mediactrl.mm
View file

@ -81,34 +81,34 @@ public:
const wxSize& size,
long style,
const wxValidator& validator,
const wxString& name) wxOVERRIDE;
const wxString& name) override;
virtual bool Play() wxOVERRIDE;
virtual bool Pause() wxOVERRIDE;
virtual bool Stop() wxOVERRIDE;
virtual bool Play() override;
virtual bool Pause() override;
virtual bool Stop() override;
virtual bool Load(const wxString& fileName) wxOVERRIDE;
virtual bool Load(const wxURI& location) wxOVERRIDE;
virtual bool Load(const wxString& fileName) override;
virtual bool Load(const wxURI& location) override;
virtual wxMediaState GetState() wxOVERRIDE;
virtual wxMediaState GetState() override;
virtual bool SetPosition(wxLongLong where) wxOVERRIDE;
virtual wxLongLong GetPosition() wxOVERRIDE;
virtual wxLongLong GetDuration() wxOVERRIDE;
virtual bool SetPosition(wxLongLong where) override;
virtual wxLongLong GetPosition() override;
virtual wxLongLong GetDuration() override;
virtual void Move(int x, int y, int w, int h) wxOVERRIDE;
wxSize GetVideoSize() const wxOVERRIDE;
virtual void Move(int x, int y, int w, int h) override;
wxSize GetVideoSize() const override;
virtual double GetPlaybackRate() wxOVERRIDE;
virtual bool SetPlaybackRate(double dRate) wxOVERRIDE;
virtual double GetPlaybackRate() override;
virtual bool SetPlaybackRate(double dRate) override;
virtual double GetVolume() wxOVERRIDE;
virtual bool SetVolume(double dVolume) wxOVERRIDE;
virtual double GetVolume() override;
virtual bool SetVolume(double dVolume) override;
void Cleanup();
void FinishLoad();
virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags) wxOVERRIDE;
virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags) override;
private:
void DoShowPlayerControls(wxMediaCtrlPlayerControls flags);

14
src/osx/cocoa/menu.mm
View file

@ -172,7 +172,7 @@ public :
virtual ~wxMenuCocoaImpl();
virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) wxOVERRIDE
virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) override
{
NSMenuItem* nsmenuitem = (NSMenuItem*) pItem->GetPeer()->GetHMenuItem();
// make sure a call of SetSubMenu is also reflected (occurring after Create)
@ -195,7 +195,7 @@ public :
[m_osxMenu insertItem:nsmenuitem atIndex:pos];
}
virtual void Remove( wxMenuItem *pItem ) wxOVERRIDE
virtual void Remove( wxMenuItem *pItem ) override
{
[m_osxMenu removeItem:(NSMenuItem*) pItem->GetPeer()->GetHMenuItem()];
}
@ -297,7 +297,7 @@ public :
}
}
virtual void MakeRoot() wxOVERRIDE
virtual void MakeRoot() override
{
[NSApp setMainMenu:m_osxMenu];
@ -311,13 +311,13 @@ public :
{
}
virtual void SetTitle( const wxString& text ) wxOVERRIDE
virtual void SetTitle( const wxString& text ) override
{
wxCFStringRef cfText(text);
[m_osxMenu setTitle:cfText.AsNSString()];
}
virtual void PopUp( wxWindow *win, int x, int y ) wxOVERRIDE
virtual void PopUp( wxWindow *win, int x, int y ) override
{
NSView *view = win->GetPeer()->GetWXWidget();
@ -355,7 +355,7 @@ public :
}
}
virtual void GetMenuBarDimensions(int &x, int &y, int &width, int &height) const wxOVERRIDE
virtual void GetMenuBarDimensions(int &x, int &y, int &width, int &height) const override
{
NSRect r = [(NSScreen*)[[NSScreen screens] objectAtIndex:0] frame];
height = [m_osxMenu menuBarHeight];
@ -384,7 +384,7 @@ public :
}
WXHMENU GetHMenu() wxOVERRIDE { return m_osxMenu; }
WXHMENU GetHMenu() override { return m_osxMenu; }
static wxMenuImpl* Create( wxMenu* peer, const wxString& title );
static wxMenuImpl* CreateRootMenu( wxMenu* peer );

16
src/osx/cocoa/menuitem.mm
View file

@ -247,22 +247,22 @@ public :
~wxMenuItemCocoaImpl();
void SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE
void SetBitmap( const wxBitmap& bitmap ) override
{
[m_osxMenuItem setImage:bitmap.GetNSImage()];
}
void Enable( bool enable ) wxOVERRIDE
void Enable( bool enable ) override
{
[m_osxMenuItem setEnabled:enable];
}
void Check( bool check ) wxOVERRIDE
void Check( bool check ) override
{
[m_osxMenuItem setState:( check ? NSOnState : NSOffState) ];
}
void Hide( bool hide ) wxOVERRIDE
void Hide( bool hide ) override
{
// NB: setHidden is new as of 10.5 so we should not call it below there
if ([m_osxMenuItem respondsToSelector:@selector(setHidden:)])
@ -271,7 +271,7 @@ public :
wxLogDebug("wxMenuItemCocoaImpl::Hide not yet supported under OS X < 10.5");
}
void SetAllowsKeyEquivalentWhenHidden( bool allow ) wxOVERRIDE
void SetAllowsKeyEquivalentWhenHidden( bool allow ) override
{
// setAllowsKeyEquivalentWhenHidden is available since macOS 10.13
if (WX_IS_MACOS_AVAILABLE(10, 13))
@ -280,7 +280,7 @@ public :
wxLogDebug("wxMenuItemCocoaImpl::setAllowsKeyEquivalentWhenHidden not supported under OS X < 10.13");
}
void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) wxOVERRIDE
void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) override
{
wxCFStringRef cfText(text);
[m_osxMenuItem setTitle:cfText.AsNSString()];
@ -288,9 +288,9 @@ public :
wxMacCocoaMenuItemSetAccelerator( m_osxMenuItem, entry );
}
bool DoDefault() wxOVERRIDE;
bool DoDefault() override;
void * GetHMenuItem() wxOVERRIDE { return m_osxMenuItem; }
void * GetHMenuItem() override { return m_osxMenuItem; }
protected :
NSMenuItem* m_osxMenuItem ;

2
src/osx/cocoa/nativewin.mm
View file

@ -36,7 +36,7 @@ public:
wxNativeWidgetCocoaImpl(wxWindowMac* peer, WXWidget w) : wxWidgetCocoaImpl(peer, w)
{}
virtual void SetInitialLabel(const wxString& WXUNUSED(title), wxFontEncoding WXUNUSED(encoding)) wxOVERRIDE
virtual void SetInitialLabel(const wxString& WXUNUSED(title), wxFontEncoding WXUNUSED(encoding)) override
{
// Don't set initial label, because the control was created by the
// caller and is already fully setup. And some controls (notably

12
src/osx/cocoa/notebook.mm
View file

@ -194,7 +194,7 @@ public:
{
}
void GetContentArea( int &left , int &top , int &width , int &height ) const wxOVERRIDE
void GetContentArea( int &left , int &top , int &width , int &height ) const override
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
NSRect r = [slf contentRect];
@ -204,7 +204,7 @@ public:
height = (int)r.size.height;
}
void SetValue( wxInt32 value ) wxOVERRIDE
void SetValue( wxInt32 value ) override
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
// avoid 'changed' events when setting the tab programmatically
@ -215,7 +215,7 @@ public:
[slf setDelegate:controller];
}
wxInt32 GetValue() const wxOVERRIDE
wxInt32 GetValue() const override
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
NSTabViewItem* selectedItem = [slf selectedTabViewItem];
@ -225,7 +225,7 @@ public:
return [slf indexOfTabViewItem:selectedItem]+1;
}
void SetMaximum( wxInt32 maximum ) wxOVERRIDE
void SetMaximum( wxInt32 maximum ) override
{
wxNSTabView* slf = (wxNSTabView*) m_osxView;
int cocoacount = [slf numberOfTabViewItems ];
@ -253,7 +253,7 @@ public:
[slf setDelegate:controller];
}
void SetupTabs( const wxNotebook& notebook) wxOVERRIDE
void SetupTabs( const wxNotebook& notebook) override
{
int pcount = notebook.GetPageCount();
@ -275,7 +275,7 @@ public:
}
}
int TabHitTest(const wxPoint & pt, long* flags) wxOVERRIDE
int TabHitTest(const wxPoint & pt, long* flags) override
{
int retval = wxNOT_FOUND;

16
src/osx/cocoa/notifmsg.mm
View file

@ -75,7 +75,7 @@ public:
[m_notif release];
}
virtual bool Show(int WXUNUSED(timeout)) wxOVERRIDE
virtual bool Show(int WXUNUSED(timeout)) override
{
NSUserNotificationCenter* nc = [NSUserNotificationCenter defaultUserNotificationCenter];
[nc deliverNotification:m_notif];
@ -83,7 +83,7 @@ public:
return true;
}
virtual bool Close() wxOVERRIDE
virtual bool Close() override
{
NSUserNotificationCenter* nc = [NSUserNotificationCenter defaultUserNotificationCenter];
[nc removeDeliveredNotification:m_notif];
@ -91,34 +91,34 @@ public:
return true;
}
virtual void SetTitle(const wxString& title) wxOVERRIDE
virtual void SetTitle(const wxString& title) override
{
wxCFStringRef cftitle(title);
m_notif.title = cftitle.AsNSString();
}
virtual void SetMessage(const wxString& message) wxOVERRIDE
virtual void SetMessage(const wxString& message) override
{
wxCFStringRef cfmsg(message);
m_notif.informativeText = cfmsg.AsNSString();
}
virtual void SetParent(wxWindow *WXUNUSED(parent)) wxOVERRIDE
virtual void SetParent(wxWindow *WXUNUSED(parent)) override
{
}
virtual void SetFlags(int WXUNUSED(flags)) wxOVERRIDE
virtual void SetFlags(int WXUNUSED(flags)) override
{
// On OS X we do not add an icon based on the flags,
// as this is primarily meant for custom icons
}
virtual void SetIcon(const wxIcon& icon) wxOVERRIDE
virtual void SetIcon(const wxIcon& icon) override
{
m_notif.contentImage = icon.GetNSImage();
}
virtual bool AddAction(wxWindowID actionid, const wxString &label) wxOVERRIDE
virtual bool AddAction(wxWindowID actionid, const wxString &label) override
{
if (m_actions.size() >= 1) // Currently only 1 actions are supported
return false;

12
src/osx/cocoa/preferences.mm
View file

@ -111,7 +111,7 @@ public:
tool->SetClientData(info.get());
}
virtual bool Show(bool show) wxOVERRIDE
virtual bool Show(bool show) override
{
if ( show && !m_toolbarRealized )
{
@ -127,12 +127,12 @@ public:
return wxFrame::Show(show);
}
virtual bool ShouldPreventAppExit() const wxOVERRIDE { return false; }
virtual bool ShouldPreventAppExit() const override { return false; }
protected:
// Native preferences windows resize when the selected panel changes and
// the resizing is animated, so we need to override DoMoveWindow.
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE
virtual void DoMoveWindow(int x, int y, int width, int height) override
{
NSRect r = wxToNSRect(NULL, wxRect(x, y, width, height));
NSWindow *win = (NSWindow*)GetWXWindow();
@ -271,12 +271,12 @@ public:
m_win->Destroy();
}
virtual void AddPage(wxPreferencesPage* page) wxOVERRIDE
virtual void AddPage(wxPreferencesPage* page) override
{
GetWin()->AddPage(page);
}
virtual void Show(wxWindow* WXUNUSED(parent)) wxOVERRIDE
virtual void Show(wxWindow* WXUNUSED(parent)) override
{
// OS X preferences windows don't have parents, they are independent
// windows, so we just ignore the 'parent' argument.
@ -285,7 +285,7 @@ public:
win->Raise();
}
virtual void Dismiss() wxOVERRIDE
virtual void Dismiss() override
{
// Don't destroy the window, only hide it, because OS X preferences
// window typically remember their state even when closed. Reopening

12
src/osx/cocoa/scrolbar.mm
View file

@ -48,12 +48,12 @@ public :
m_maximum = 1;
}
void SetMaximum(wxInt32 v) wxOVERRIDE
void SetMaximum(wxInt32 v) override
{
m_maximum = (v == 0) ? 1 : v;
}
void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) wxOVERRIDE
void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) override
{
double v = ((double) value)/m_maximum;
double t = ((double) thumbSize)/(m_maximum+thumbSize);
@ -61,18 +61,18 @@ public :
[(wxNSScroller*) m_osxView setKnobProportion:t];
}
virtual wxInt32 GetValue() const wxOVERRIDE
virtual wxInt32 GetValue() const override
{
return wxRound([(wxNSScroller*) m_osxView floatValue] * m_maximum);
}
virtual wxInt32 GetMaximum() const wxOVERRIDE
virtual wxInt32 GetMaximum() const override
{
return m_maximum;
}
virtual void controlAction(WXWidget slf, void* _cmd, void *sender) wxOVERRIDE;
virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd) wxOVERRIDE;
virtual void controlAction(WXWidget slf, void* _cmd, void *sender) override;
virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd) override;
protected:
wxInt32 m_maximum;
};

4
src/osx/cocoa/slider.mm
View file

@ -46,8 +46,8 @@ public :
{
}
virtual void controlAction(WXWidget slf, void* _cmd, void *sender) wxOVERRIDE;
virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd) wxOVERRIDE;
virtual void controlAction(WXWidget slf, void* _cmd, void *sender) override;
virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd) override;
};
// we will have a mouseDown, then in the native

14
src/osx/cocoa/spinbutt.mm
View file

@ -48,13 +48,13 @@ public :
{
}
virtual void SetValue(wxInt32 v) wxOVERRIDE;
virtual void SetMinimum(wxInt32 v) wxOVERRIDE;
virtual void SetMaximum(wxInt32 v) wxOVERRIDE;
virtual void SetIncrement(int value) wxOVERRIDE;
virtual int GetIncrement() const wxOVERRIDE;
virtual void controlAction(WXWidget slf, void* _cmd, void *sender) wxOVERRIDE;
virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd) wxOVERRIDE;
virtual void SetValue(wxInt32 v) override;
virtual void SetMinimum(wxInt32 v) override;
virtual void SetMaximum(wxInt32 v) override;
virtual void SetIncrement(int value) override;
virtual int GetIncrement() const override;
virtual void controlAction(WXWidget slf, void* _cmd, void *sender) override;
virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd) override;
private:
int m_formerValue;
bool m_trackValue;

16
src/osx/cocoa/srchctrl.mm
View file

@ -117,7 +117,7 @@ public :
~wxNSSearchFieldControl();
// search field options
virtual void ShowSearchButton( bool show ) wxOVERRIDE
virtual void ShowSearchButton( bool show ) override
{
if ( show )
[m_searchFieldCell resetSearchButtonCell];
@ -126,12 +126,12 @@ public :
[m_searchField setNeedsDisplay:YES];
}
virtual bool IsSearchButtonVisible() const wxOVERRIDE
virtual bool IsSearchButtonVisible() const override
{
return [m_searchFieldCell searchButtonCell] != nil;
}
virtual void ShowCancelButton( bool show ) wxOVERRIDE
virtual void ShowCancelButton( bool show ) override
{
if ( show )
[m_searchFieldCell resetCancelButtonCell];
@ -140,12 +140,12 @@ public :
[m_searchField setNeedsDisplay:YES];
}
virtual bool IsCancelButtonVisible() const wxOVERRIDE
virtual bool IsCancelButtonVisible() const override
{
return [m_searchFieldCell cancelButtonCell] != nil;
}
virtual void SetSearchMenu( wxMenu* menu ) wxOVERRIDE
virtual void SetSearchMenu( wxMenu* menu ) override
{
if ( menu )
[m_searchFieldCell setSearchMenuTemplate:menu->GetHMenu()];
@ -154,18 +154,18 @@ public :
[m_searchField setNeedsDisplay:YES];
}
virtual void SetDescriptiveText(const wxString& text) wxOVERRIDE
virtual void SetDescriptiveText(const wxString& text) override
{
[m_searchFieldCell setPlaceholderString:
wxCFStringRef( text , m_wxPeer->GetFont().GetEncoding() ).AsNSString()];
}
virtual bool SetFocus() wxOVERRIDE
virtual bool SetFocus() override
{
return wxNSTextFieldControl::SetFocus();
}
void controlAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender)) wxOVERRIDE
void controlAction( WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd), void *WXUNUSED(sender)) override
{
wxSearchCtrl* wxpeer = (wxSearchCtrl*) GetWXPeer();
if ( wxpeer )

2
src/osx/cocoa/statbmp.mm
View file

@ -65,7 +65,7 @@ public :
{
}
void SetLabel( const wxString& WXUNUSED(title), wxFontEncoding WXUNUSED(encoding) ) wxOVERRIDE
void SetLabel( const wxString& WXUNUSED(title), wxFontEncoding WXUNUSED(encoding) ) override
{
// although NSControl has this method, NSImageView throws an exception if it is called
}

2
src/osx/cocoa/statbox.mm
View file

@ -54,7 +54,7 @@ namespace
{
}
virtual void SetLabel( const wxString& title, wxFontEncoding encoding ) wxOVERRIDE
virtual void SetLabel( const wxString& title, wxFontEncoding encoding ) override
{
if (title.empty())
[GetNSBox() setTitlePosition:NSNoTitle];

4
src/osx/cocoa/stattext.mm
View file

@ -91,7 +91,7 @@ public:
m_lineBreak = lineBreak;
}
virtual void SetLabel(const wxString& title, wxFontEncoding encoding) wxOVERRIDE
virtual void SetLabel(const wxString& title, wxFontEncoding encoding) override
{
wxMacAutoreleasePool autoreleasepool;
@ -104,7 +104,7 @@ public:
}
#if wxUSE_MARKUP
virtual void SetLabelMarkup( const wxString& markup) wxOVERRIDE
virtual void SetLabelMarkup( const wxString& markup) override
{
wxMarkupToAttrString toAttr(GetWXPeer()->GetFont(), markup);

16
src/osx/cocoa/taskbar.mm
View file

@ -40,7 +40,7 @@ class wxTaskBarIconWindow : public wxTopLevelWindow
public:
wxTaskBarIconWindow(wxTaskBarIconImpl *impl);
double GetContentScaleFactor() const wxOVERRIDE;
double GetContentScaleFactor() const override;
void OnMenuEvent(wxCommandEvent& event);
void OnUpdateUIEvent(wxUpdateUIEvent& event);
@ -93,9 +93,9 @@ class wxTaskBarIconDockImpl: public wxTaskBarIconImpl
public:
wxTaskBarIconDockImpl(wxTaskBarIcon *taskBarIcon);
virtual ~wxTaskBarIconDockImpl();
virtual bool SetIcon(const wxBitmapBundle& icon, const wxString& tooltip = wxEmptyString) wxOVERRIDE;
virtual bool RemoveIcon() wxOVERRIDE;
virtual bool PopupMenu(wxMenu *menu) wxOVERRIDE;
virtual bool SetIcon(const wxBitmapBundle& icon, const wxString& tooltip = wxEmptyString) override;
virtual bool RemoveIcon() override;
virtual bool PopupMenu(wxMenu *menu) override;
static WX_NSMenu OSXGetDockHMenu();
protected:
@ -126,11 +126,11 @@ public:
wxTaskBarIconCustomStatusItemImpl(wxTaskBarIcon *taskBarIcon);
virtual ~wxTaskBarIconCustomStatusItemImpl();
virtual bool IsStatusItem() const wxOVERRIDE { return true; }
virtual bool IsStatusItem() const override { return true; }
virtual bool SetIcon(const wxBitmapBundle& icon, const wxString& tooltip = wxEmptyString) wxOVERRIDE;
virtual bool RemoveIcon() wxOVERRIDE;
virtual bool PopupMenu(wxMenu *menu) wxOVERRIDE;
virtual bool SetIcon(const wxBitmapBundle& icon, const wxString& tooltip = wxEmptyString) override;
virtual bool RemoveIcon() override;
virtual bool PopupMenu(wxMenu *menu) override;
protected:
NSStatusItem *m_statusItem;
wxOSXStatusItemTarget *m_target;

6
src/osx/cocoa/toolbar.mm
View file

@ -168,7 +168,7 @@ public:
return wxPoint( m_x, m_y );
}
bool Enable( bool enable ) wxOVERRIDE;
bool Enable( bool enable ) override;
void UpdateImages();
@ -262,13 +262,13 @@ public:
return m_index;
}
virtual void SetLabel(const wxString& label) wxOVERRIDE
virtual void SetLabel(const wxString& label) override
{
wxToolBarToolBase::SetLabel(label);
UpdateLabel();
}
virtual bool SetShortHelp(const wxString& help) wxOVERRIDE
virtual bool SetShortHelp(const wxString& help) override
{
if ( !wxToolBarToolBase::SetShortHelp(help) )
return false;

6
src/osx/core/bmpbndl.mm
View file

@ -112,9 +112,9 @@ public:
wxOSXImageBundleImpl(WXImage image);
~wxOSXImageBundleImpl();
virtual wxSize GetDefaultSize() const wxOVERRIDE;
virtual wxSize GetPreferredBitmapSizeAtScale(double scale) const wxOVERRIDE;
virtual wxBitmap GetBitmap(const wxSize& size) wxOVERRIDE;
virtual wxSize GetDefaultSize() const override;
virtual wxSize GetPreferredBitmapSizeAtScale(double scale) const override;
virtual wxBitmap GetBitmap(const wxSize& size) override;
};
} // anonymouse namespace

16
src/osx/core/uilocale.mm
View file

@ -76,7 +76,7 @@ public:
{
}
~wxUILocaleImplCF() wxOVERRIDE
~wxUILocaleImplCF() override
{
[m_nsloc release];
}
@ -100,14 +100,14 @@ public:
return new wxUILocaleImplCF(nsloc);
}
void Use() wxOVERRIDE;
wxString GetName() const wxOVERRIDE;
wxLocaleIdent GetLocaleId() const wxOVERRIDE;
wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat) const wxOVERRIDE;
wxString GetLocalizedName(wxLocaleName name, wxLocaleForm form) const wxOVERRIDE;
wxLayoutDirection GetLayoutDirection() const wxOVERRIDE;
void Use() override;
wxString GetName() const override;
wxLocaleIdent GetLocaleId() const override;
wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat) const override;
wxString GetLocalizedName(wxLocaleName name, wxLocaleForm form) const override;
wxLayoutDirection GetLayoutDirection() const override;
int CompareStrings(const wxString& lhs, const wxString& rhs,
int flags) const wxOVERRIDE;
int flags) const override;
private:
NSLocale* const m_nsloc;

8
src/osx/iphone/choice.mm
View file

@ -98,23 +98,23 @@ public:
[v setDataSource:v];
}
void InsertItem( size_t pos, int itemid, const wxString& text) wxOVERRIDE
void InsertItem( size_t pos, int itemid, const wxString& text) override
{
wxCFStringRef cftext(text);
[((wxUIPickerView*)m_osxView).rows insertObject:cftext.AsNSString() atIndex:pos];
}
size_t GetNumberOfItems() const wxOVERRIDE
size_t GetNumberOfItems() const override
{
return [((wxUIPickerView*)m_osxView).rows count];
}
void RemoveItem( size_t pos ) wxOVERRIDE
void RemoveItem( size_t pos ) override
{
[((wxUIPickerView*)m_osxView).rows removeObjectAtIndex:pos];
}
void SetItem(int pos, const wxString& text) wxOVERRIDE
void SetItem(int pos, const wxString& text) override
{
wxCFStringRef cftext(text);
[((wxUIPickerView*)m_osxView).rows replaceObjectAtIndex:pos withObject:cftext.AsNSString()];

14
src/osx/iphone/menu.mm
View file

@ -174,7 +174,7 @@ public :
virtual ~wxMenuCocoaImpl();
virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) wxOVERRIDE
virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) override
{
UIMenuElement* uimenuitem = (UIMenuElement*) pItem->GetPeer()->GetHMenuItem();
m_children.push_back(uimenuitem);
@ -200,12 +200,12 @@ public :
*/
}
virtual void Remove( wxMenuItem *pItem ) wxOVERRIDE
virtual void Remove( wxMenuItem *pItem ) override
{
// [m_osxMenu removeItem:(UIMenuItem*) pItem->GetPeer()->GetHMenuItem()];
}
virtual void MakeRoot() wxOVERRIDE
virtual void MakeRoot() override
{
}
@ -213,13 +213,13 @@ public :
{
}
virtual void SetTitle( const wxString& text ) wxOVERRIDE
virtual void SetTitle( const wxString& text ) override
{
// wxCFStringRef cfText(text);
// [m_osxMenu setTitle:cfText.AsNSString()];
}
virtual void PopUp( wxWindow *win, int x, int y ) wxOVERRIDE
virtual void PopUp( wxWindow *win, int x, int y ) override
{
#if 0 // TODO wxIOS
UIView *view = win->GetPeer()->GetWXWidget();
@ -259,7 +259,7 @@ public :
#endif
}
virtual void GetMenuBarDimensions(int &x, int &y, int &width, int &height) const wxOVERRIDE
virtual void GetMenuBarDimensions(int &x, int &y, int &width, int &height) const override
{
#if 0 // TODO wxIOS
NSRect r = [(NSScreen*)[[NSScreen screens] objectAtIndex:0] frame];
@ -291,7 +291,7 @@ public :
*/
}
WXHMENU GetHMenu() wxOVERRIDE {
WXHMENU GetHMenu() override {
if ( m_osxMenu == nil )
{
m_osxMenu.reset( [UIMenu menuWithTitle:wxCFStringRef(m_peer->GetTitle()).AsNSString() children:m_children] );

14
src/osx/iphone/menuitem.mm
View file

@ -192,11 +192,11 @@ public :
~wxMenuItemCocoaImpl();
void SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE
void SetBitmap( const wxBitmap& bitmap ) override
{
}
void Enable( bool enable ) wxOVERRIDE
void Enable( bool enable ) override
{
UIMenuElement* menuElement = m_osxMenuItem.get();
if ( [menuElement isKindOfClass:UIAction.class] )
@ -209,7 +209,7 @@ public :
}
}
void Check( bool check ) wxOVERRIDE
void Check( bool check ) override
{
UIMenuElement* menuElement = m_osxMenuItem.get();
if ( [menuElement isKindOfClass:UIAction.class] )
@ -219,7 +219,7 @@ public :
}
}
void Hide( bool hide ) wxOVERRIDE
void Hide( bool hide ) override
{
UIMenuElement* menuElement = m_osxMenuItem.get();
if ( [menuElement isKindOfClass:UIAction.class] )
@ -232,14 +232,14 @@ public :
}
}
void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) wxOVERRIDE
void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) override
{
// recreate, it's readonly
}
bool DoDefault() wxOVERRIDE;
bool DoDefault() override;
void * GetHMenuItem() wxOVERRIDE { return m_osxMenuItem; }
void * GetHMenuItem() override { return m_osxMenuItem; }
protected :
wxCFRef<UIMenuElement*> m_osxMenuItem ;

2
src/osx/iphone/statbmp.mm
View file

@ -41,7 +41,7 @@ public :
{
}
void SetLabel( const wxString& title, wxFontEncoding encoding ) wxOVERRIDE
void SetLabel( const wxString& title, wxFontEncoding encoding ) override
{
// although NSControl has this method, NSImageView throws an exception if it is called
}

8
src/osx/iphone/utils.mm
View file

@ -135,7 +135,7 @@ wxMouseState wxGetMouseState()
class wxDisplayImplSingleiOS : public wxDisplayImplSingle
{
public:
virtual wxRect GetGeometry() const wxOVERRIDE
virtual wxRect GetGeometry() const override
{
CGRect bounds = [[UIScreen mainScreen] bounds];
@ -156,12 +156,12 @@ public:
return wxRect(0, 0, width, height);
}
virtual int GetDepth() const wxOVERRIDE
virtual int GetDepth() const override
{
return 32; // TODO can we determine this ?
}
virtual wxSize GetPPI() const wxOVERRIDE
virtual wxSize GetPPI() const override
{
return wxSize(72, 72);
}
@ -170,7 +170,7 @@ public:
class wxDisplayFactorySingleiOS : public wxDisplayFactorySingle
{
protected:
virtual wxDisplayImpl *CreateSingleDisplay() wxOVERRIDE
virtual wxDisplayImpl *CreateSingleDisplay() override
{
return new wxDisplayImplSingleiOS;
}

18
src/osx/webview_webkit.mm
View file

@ -860,10 +860,10 @@ public:
~wxWebViewWebKitHandlerRequest()
{ wxDELETE(m_data); }
virtual wxString GetRawURI() const wxOVERRIDE
virtual wxString GetRawURI() const override
{ return wxCFStringRef::AsString(m_request.URL.absoluteString); }
virtual wxInputStream* GetData() const wxOVERRIDE
virtual wxInputStream* GetData() const override
{
if (!m_data && m_request.HTTPBody)
m_data = new wxMemoryInputStream(m_request.HTTPBody.bytes, m_request.HTTPBody.length);
@ -871,10 +871,10 @@ public:
return m_data;
}
virtual wxString GetMethod() const wxOVERRIDE
virtual wxString GetMethod() const override
{ return wxCFStringRef::AsString(m_request.HTTPMethod); }
virtual wxString GetHeader(const wxString& name) const wxOVERRIDE
virtual wxString GetHeader(const wxString& name) const override
{
return wxCFStringRef::AsString(
[m_request valueForHTTPHeaderField:wxCFStringRef(name).AsNSString()]);
@ -900,19 +900,19 @@ public:
[m_task release];
}
virtual void SetStatus(int status) wxOVERRIDE
virtual void SetStatus(int status) override
{ m_status = status; }
virtual void SetContentType(const wxString& contentType) wxOVERRIDE
virtual void SetContentType(const wxString& contentType) override
{ SetHeader("Content-Type", contentType); }
virtual void SetHeader(const wxString& name, const wxString& value) wxOVERRIDE
virtual void SetHeader(const wxString& name, const wxString& value) override
{
[m_headers setValue:wxCFStringRef(value).AsNSString()
forKey:wxCFStringRef(name).AsNSString()];
}
virtual void Finish(wxSharedPtr<wxWebViewHandlerResponseData> data) wxOVERRIDE
virtual void Finish(wxSharedPtr<wxWebViewHandlerResponseData> data) override
{
m_data = data;
wxInputStream* stream = data->GetStream();
@ -934,7 +934,7 @@ public:
[m_task didFinish];
}
virtual void FinishWithError() wxOVERRIDE
virtual void FinishWithError() override
{
NSError *error = [[NSError alloc] initWithDomain:NSURLErrorDomain
code:NSURLErrorFileDoesNotExist