Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge wxOVERRIDE additions branch

Browse Source 
Add even more wxOVERRIDEs to avoid clang warnings under OS X.

Closes https://github.com/wxWidgets/wxWidgets/pull/130
This commit is contained in:
Vadim Zeitlin
2015-11-22 15:22:23 +01:00
parent fc5033afde 474461601f
commit 6d38fb81dc
38 changed files with 528 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/generic/animate.h
View File

@@ -95,23 +95,23 @@ public:
~wxAnimationCtrl(); ~wxAnimationCtrl();
public: public:
virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY); virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE;
virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY); virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE;
virtual void Stop(); virtual void Stop() wxOVERRIDE;
virtual bool Play() virtual bool Play() wxOVERRIDE
{ return Play(true /* looped */); } { return Play(true /* looped */); }
virtual bool IsPlaying() const virtual bool IsPlaying() const wxOVERRIDE
{ return m_isPlaying; } { return m_isPlaying; }
void SetAnimation(const wxAnimation &animation); void SetAnimation(const wxAnimation &animation) wxOVERRIDE;
wxAnimation GetAnimation() const wxAnimation GetAnimation() const wxOVERRIDE
{ return m_animation; } { return m_animation; }
virtual void SetInactiveBitmap(const wxBitmap &bmp); virtual void SetInactiveBitmap(const wxBitmap &bmp) wxOVERRIDE;
// override base class method // override base class method
virtual bool SetBackgroundColour(const wxColour& col); virtual bool SetBackgroundColour(const wxColour& col) wxOVERRIDE;
public: // event handlers public: // event handlers
@@ -153,8 +153,8 @@ protected: // internal utilities
bool RebuildBackingStoreUpToFrame(unsigned int); bool RebuildBackingStoreUpToFrame(unsigned int);
void DrawFrame(wxDC &dc, unsigned int); void DrawFrame(wxDC &dc, unsigned int);
virtual void DisplayStaticImage(); virtual void DisplayStaticImage() wxOVERRIDE;
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
protected: protected:
unsigned int m_currentFrame; // Current frame unsigned int m_currentFrame; // Current frame

24
include/wx/generic/bmpcbox.h
View File

@@ -98,30 +98,30 @@ public:
unsigned int pos, wxClientData *clientData); unsigned int pos, wxClientData *clientData);
// Sets the image for the given item. // Sets the image for the given item.
virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap); virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap) wxOVERRIDE;
virtual bool SetFont(const wxFont& font); virtual bool SetFont(const wxFont& font) wxOVERRIDE;
protected: protected:
virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, int item, int flags) const; virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, int item, int flags) const wxOVERRIDE;
virtual void OnDrawItem(wxDC& dc, const wxRect& rect, int item, int flags) const; virtual void OnDrawItem(wxDC& dc, const wxRect& rect, int item, int flags) const wxOVERRIDE;
virtual wxCoord OnMeasureItem(size_t item) const; virtual wxCoord OnMeasureItem(size_t item) const wxOVERRIDE;
virtual wxCoord OnMeasureItemWidth(size_t item) const; virtual wxCoord OnMeasureItemWidth(size_t item) const wxOVERRIDE;
// Event handlers // Event handlers
void OnSize(wxSizeEvent& event); void OnSize(wxSizeEvent& event);
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual wxItemContainer* GetItemContainer() { return this; } virtual wxItemContainer* GetItemContainer() wxOVERRIDE { return this; }
virtual wxWindow* GetControl() { return this; } virtual wxWindow* GetControl() wxOVERRIDE { return this; }
// wxItemContainer implementation // wxItemContainer implementation
virtual int DoInsertItems(const wxArrayStringsAdapter & items, virtual int DoInsertItems(const wxArrayStringsAdapter & items,
unsigned int pos, unsigned int pos,
void **clientData, wxClientDataType type); void **clientData, wxClientDataType type) wxOVERRIDE;
virtual void DoClear(); virtual void DoClear() wxOVERRIDE;
virtual void DoDeleteOneItem(unsigned int n); virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
private: private:
bool m_inResize; bool m_inResize;

14
include/wx/generic/collpaneg.h
View File

@@ -53,16 +53,16 @@ public:
const wxString& name = wxCollapsiblePaneNameStr); const wxString& name = wxCollapsiblePaneNameStr);
// public wxCollapsiblePane API // public wxCollapsiblePane API
virtual void Collapse(bool collapse = true); virtual void Collapse(bool collapse = true) wxOVERRIDE;
virtual void SetLabel(const wxString &label); virtual void SetLabel(const wxString &label) wxOVERRIDE;
virtual bool IsCollapsed() const virtual bool IsCollapsed() const wxOVERRIDE
{ return m_pPane==NULL || !m_pPane->IsShown(); } { return m_pPane==NULL || !m_pPane->IsShown(); }
virtual wxWindow *GetPane() const virtual wxWindow *GetPane() const wxOVERRIDE
{ return m_pPane; } { return m_pPane; }
virtual wxString GetLabel() const; virtual wxString GetLabel() const wxOVERRIDE;
virtual bool Layout(); virtual bool Layout() wxOVERRIDE;
// for the generic collapsible pane only: // for the generic collapsible pane only:
@@ -74,7 +74,7 @@ public:
protected: protected:
// overridden methods // overridden methods
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
int GetBorder() const; int GetBorder() const;

2
include/wx/generic/colrdlgg.h
View File

@@ -38,7 +38,7 @@ public:
wxColourData &GetColourData() { return m_colourData; } wxColourData &GetColourData() { return m_colourData; }
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
// Internal functions // Internal functions
void OnMouseEvent(wxMouseEvent& event); void OnMouseEvent(wxMouseEvent& event);

2
include/wx/generic/datectrl.h
View File

@@ -82,7 +82,7 @@ private:
void OnFocus(wxFocusEvent& event); void OnFocus(wxFocusEvent& event);
#ifdef __WXOSX_COCOA__ #ifdef __WXOSX_COCOA__
virtual void OSXGenerateEvent(const wxDateTime& WXUNUSED(dt)) { } virtual void OSXGenerateEvent(const wxDateTime& WXUNUSED(dt)) wxOVERRIDE { }
#endif #endif
wxComboCtrl* m_combo; wxComboCtrl* m_combo;

8
include/wx/generic/dirdlgg.h
View File

@@ -54,12 +54,12 @@ public:
const wxString& name = wxDirDialogNameStr); const wxString& name = wxDirDialogNameStr);
//// Accessors //// Accessors
void SetPath(const wxString& path); void SetPath(const wxString& path) wxOVERRIDE;
wxString GetPath() const; wxString GetPath() const wxOVERRIDE;
//// Overrides //// Overrides
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
virtual void EndModal(int retCode); virtual void EndModal(int retCode) wxOVERRIDE;
// this one is specific to wxGenericDirDialog // this one is specific to wxGenericDirDialog
wxTextCtrl* GetInputCtrl() const { return m_input; } wxTextCtrl* GetInputCtrl() const { return m_input; }

32
include/wx/generic/filedlgg.h
View File

@@ -60,39 +60,39 @@ public:
virtual ~wxGenericFileDialog(); virtual ~wxGenericFileDialog();
virtual void SetDirectory(const wxString& dir) virtual void SetDirectory(const wxString& dir) wxOVERRIDE
{ m_filectrl->SetDirectory(dir); } { m_filectrl->SetDirectory(dir); }
virtual void SetFilename(const wxString& name) virtual void SetFilename(const wxString& name) wxOVERRIDE
{ m_filectrl->SetFilename(name); } { m_filectrl->SetFilename(name); }
virtual void SetMessage(const wxString& message) { SetTitle(message); } virtual void SetMessage(const wxString& message) wxOVERRIDE { SetTitle(message); }
virtual void SetPath(const wxString& path) virtual void SetPath(const wxString& path) wxOVERRIDE
{ m_filectrl->SetPath(path); } { m_filectrl->SetPath(path); }
virtual void SetFilterIndex(int filterIndex) virtual void SetFilterIndex(int filterIndex) wxOVERRIDE
{ m_filectrl->SetFilterIndex(filterIndex); } { m_filectrl->SetFilterIndex(filterIndex); }
virtual void SetWildcard(const wxString& wildCard) virtual void SetWildcard(const wxString& wildCard) wxOVERRIDE
{ m_filectrl->SetWildcard(wildCard); } { m_filectrl->SetWildcard(wildCard); }
virtual wxString GetPath() const virtual wxString GetPath() const wxOVERRIDE
{ return m_filectrl->GetPath(); } { return m_filectrl->GetPath(); }
virtual void GetPaths(wxArrayString& paths) const virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE
{ m_filectrl->GetPaths(paths); } { m_filectrl->GetPaths(paths); }
virtual wxString GetDirectory() const virtual wxString GetDirectory() const wxOVERRIDE
{ return m_filectrl->GetDirectory(); } { return m_filectrl->GetDirectory(); }
virtual wxString GetFilename() const virtual wxString GetFilename() const wxOVERRIDE
{ return m_filectrl->GetFilename(); } { return m_filectrl->GetFilename(); }
virtual void GetFilenames(wxArrayString& files) const virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE
{ m_filectrl->GetFilenames(files); } { m_filectrl->GetFilenames(files); }
virtual wxString GetWildcard() const virtual wxString GetWildcard() const wxOVERRIDE
{ return m_filectrl->GetWildcard(); } { return m_filectrl->GetWildcard(); }
virtual int GetFilterIndex() const virtual int GetFilterIndex() const wxOVERRIDE
{ return m_filectrl->GetFilterIndex(); } { return m_filectrl->GetFilterIndex(); }
virtual bool SupportsExtraControl() const { return true; } virtual bool SupportsExtraControl() const wxOVERRIDE { return true; }
// implementation only from now on // implementation only from now on
// ------------------------------- // -------------------------------
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
virtual bool Show( bool show = true ); virtual bool Show( bool show = true ) wxOVERRIDE;
void OnList( wxCommandEvent &event ); void OnList( wxCommandEvent &event );
void OnReport( wxCommandEvent &event ); void OnReport( wxCommandEvent &event );

4
include/wx/generic/fontdlgg.h
View File

@@ -45,7 +45,7 @@ public:
: wxFontDialogBase(parent, data) { Init(); } : wxFontDialogBase(parent, data) { Init(); }
virtual ~wxGenericFontDialog(); virtual ~wxGenericFontDialog();
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
// Internal functions // Internal functions
void OnCloseWindow(wxCloseEvent& event); void OnCloseWindow(wxCloseEvent& event);
@@ -61,7 +61,7 @@ public:
protected: protected:
virtual bool DoCreate(wxWindow *parent); virtual bool DoCreate(wxWindow *parent) wxOVERRIDE;
private: private:

26
include/wx/generic/spinctlg.h
View File

@@ -64,27 +64,27 @@ public:
// T GetMin() const // T GetMin() const
// T GetMax() const // T GetMax() const
// T GetIncrement() const // T GetIncrement() const
virtual bool GetSnapToTicks() const { return m_snap_to_ticks; } virtual bool GetSnapToTicks() const wxOVERRIDE { return m_snap_to_ticks; }
// unsigned GetDigits() const - wxSpinCtrlDouble only // unsigned GetDigits() const - wxSpinCtrlDouble only
// operations // operations
virtual void SetValue(const wxString& text); virtual void SetValue(const wxString& text) wxOVERRIDE;
// void SetValue(T val) // void SetValue(T val)
// void SetRange(T minVal, T maxVal) // void SetRange(T minVal, T maxVal)
// void SetIncrement(T inc) // void SetIncrement(T inc)
virtual void SetSnapToTicks(bool snap_to_ticks); virtual void SetSnapToTicks(bool snap_to_ticks) wxOVERRIDE;
// void SetDigits(unsigned digits) - wxSpinCtrlDouble only // void SetDigits(unsigned digits) - wxSpinCtrlDouble only
// Select text in the textctrl // Select text in the textctrl
void SetSelection(long from, long to); void SetSelection(long from, long to) wxOVERRIDE;
// implementation from now on // implementation from now on
// forward these functions to all subcontrols // forward these functions to all subcontrols
virtual bool Enable(bool enable = true); virtual bool Enable(bool enable = true) wxOVERRIDE;
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
virtual bool SetBackgroundColour(const wxColour& colour); virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE;
// get the subcontrols // get the subcontrols
wxTextCtrl *GetText() const { return m_textCtrl; } wxTextCtrl *GetText() const { return m_textCtrl; }
@@ -98,16 +98,16 @@ public:
// this window itself is used only as a container for its sub windows so it // this window itself is used only as a container for its sub windows so it
// shouldn't accept the focus at all and any attempts to explicitly set // shouldn't accept the focus at all and any attempts to explicitly set
// focus to it should give focus to its text constol part // focus to it should give focus to its text constol part
virtual bool AcceptsFocus() const { return false; } virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
virtual void SetFocus(); virtual void SetFocus() wxOVERRIDE;
friend class wxSpinCtrlTextGeneric; friend class wxSpinCtrlTextGeneric;
protected: protected:
// override the base class virtuals involved into geometry calculations // override the base class virtuals involved into geometry calculations
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE;
virtual void DoMoveWindow(int x, int y, int width, int height); virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
#ifdef __WXMSW__ #ifdef __WXMSW__
// and, for MSW, enabling this window itself // and, for MSW, enabling this window itself
@@ -165,7 +165,7 @@ private:
void Init(); void Init();
// Implement pure virtual function inherited from wxCompositeWindow. // Implement pure virtual function inherited from wxCompositeWindow.
virtual wxWindowList GetCompositeWindowParts() const; virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE;
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };

2
include/wx/generic/splitter.h
View File

@@ -217,7 +217,7 @@ public:
virtual void SizeWindows(); virtual void SizeWindows();
#ifdef __WXMAC__ #ifdef __WXMAC__
virtual bool MacClipGrandChildren() const { return true ; } virtual bool MacClipGrandChildren() const wxOVERRIDE { return true ; }
#endif #endif
// Sets the sash size: this doesn't do anything and shouldn't be used at // Sets the sash size: this doesn't do anything and shouldn't be used at

6
include/wx/html/webkit.h
View File

@@ -87,9 +87,9 @@ public:
int GetScrollPos(); int GetScrollPos();
// don't hide base class virtuals // don't hide base class virtuals
virtual void SetScrollPos( int orient, int pos, bool refresh = true ) virtual void SetScrollPos( int orient, int pos, bool refresh = true ) wxOVERRIDE
{ return wxControl::SetScrollPos(orient, pos, refresh); } { return wxControl::SetScrollPos(orient, pos, refresh); }
virtual int GetScrollPos( int orient ) const virtual int GetScrollPos( int orient ) const wxOVERRIDE
{ return wxControl::GetScrollPos(orient); } { return wxControl::GetScrollPos(orient); }
//we need to resize the webview when the control size changes //we need to resize the webview when the control size changes
@@ -98,7 +98,7 @@ public:
void OnMouseEvents(wxMouseEvent &event); void OnMouseEvents(wxMouseEvent &event);
protected: protected:
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
void MacVisibilityChanged(); void MacVisibilityChanged() wxOVERRIDE;
private: private:
wxWindow *m_parent; wxWindow *m_parent;

14
include/wx/osx/anybutton.h
View File

@@ -18,19 +18,19 @@ public:
static wxSize GetDefaultSize(); static wxSize GetDefaultSize();
virtual void SetLabel(const wxString& label); virtual void SetLabel(const wxString& label) wxOVERRIDE;
protected: protected:
virtual wxSize DoGetBestSize() const ; virtual wxSize DoGetBestSize() const wxOVERRIDE;
void OnEnterWindow( wxMouseEvent& event); void OnEnterWindow( wxMouseEvent& event);
void OnLeaveWindow( wxMouseEvent& event); void OnLeaveWindow( wxMouseEvent& event);
virtual wxBitmap DoGetBitmap(State which) const; virtual wxBitmap DoGetBitmap(State which) const wxOVERRIDE;
virtual void DoSetBitmap(const wxBitmap& bitmap, State which); virtual void DoSetBitmap(const wxBitmap& bitmap, State which) wxOVERRIDE;
virtual void DoSetBitmapPosition(wxDirection dir); virtual void DoSetBitmapPosition(wxDirection dir) wxOVERRIDE;
virtual void DoSetBitmapMargins(int x, int y) virtual void DoSetBitmapMargins(int x, int y) wxOVERRIDE
{ {
m_marginX = x; m_marginX = x;
m_marginY = y; m_marginY = y;
@@ -38,7 +38,7 @@ protected:
} }
#if wxUSE_MARKUP && wxOSX_USE_COCOA #if wxUSE_MARKUP && wxOSX_USE_COCOA
virtual bool DoSetLabelMarkup(const wxString& markup); virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE;
#endif // wxUSE_MARKUP && wxOSX_USE_COCOA #endif // wxUSE_MARKUP && wxOSX_USE_COCOA

16
include/wx/osx/app.h
View File

@@ -38,21 +38,21 @@ class WXDLLIMPEXP_CORE wxApp: public wxAppBase
wxApp(); wxApp();
virtual ~wxApp(); virtual ~wxApp();
virtual void WakeUpIdle(); virtual void WakeUpIdle() wxOVERRIDE;
virtual void SetPrintMode(int mode) { m_printMode = mode; } virtual void SetPrintMode(int mode) wxOVERRIDE { m_printMode = mode; }
virtual int GetPrintMode() const { return m_printMode; } virtual int GetPrintMode() const { return m_printMode; }
// calling OnInit with an auto-release pool ready ... // calling OnInit with an auto-release pool ready ...
virtual bool CallOnInit(); virtual bool CallOnInit() wxOVERRIDE;
#if wxUSE_GUI #if wxUSE_GUI
// setting up all MacOS Specific Event-Handlers etc // setting up all MacOS Specific Event-Handlers etc
virtual bool OnInitGui(); virtual bool OnInitGui() wxOVERRIDE;
#endif // wxUSE_GUI #endif // wxUSE_GUI
virtual int OnRun(); virtual int OnRun() wxOVERRIDE;
virtual bool ProcessIdle(); virtual bool ProcessIdle() wxOVERRIDE;
// implementation only // implementation only
void OnIdle(wxIdleEvent& event); void OnIdle(wxIdleEvent& event);
@@ -67,8 +67,8 @@ public:
static bool sm_isEmbedded; static bool sm_isEmbedded;
// Implementation // Implementation
virtual bool Initialize(int& argc, wxChar **argv); virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE;
virtual void CleanUp(); virtual void CleanUp() wxOVERRIDE;
// the installed application event handler // the installed application event handler
WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; } WXEVENTHANDLERREF MacGetEventHandler() { return m_macEventHandler ; }

14
include/wx/osx/checklst.h
View File

@@ -64,19 +64,19 @@ public:
const wxString& name = wxListBoxNameStr); const wxString& name = wxListBoxNameStr);
// items may be checked // items may be checked
bool IsChecked(unsigned int uiIndex) const; bool IsChecked(unsigned int uiIndex) const wxOVERRIDE;
void Check(unsigned int uiIndex, bool bCheck = true); void Check(unsigned int uiIndex, bool bCheck = true) wxOVERRIDE;
// data callbacks // data callbacks
virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ) wxOVERRIDE;
virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ) wxOVERRIDE;
protected: protected:
// override all methods which add/delete items to update m_checks array as // override all methods which add/delete items to update m_checks array as
// well // well
virtual void OnItemInserted(unsigned int pos); virtual void OnItemInserted(unsigned int pos) wxOVERRIDE;
virtual void DoDeleteOneItem(unsigned int n); virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
virtual void DoClear(); virtual void DoClear() wxOVERRIDE;
// the array containing the checked status of the items // the array containing the checked status of the items
wxArrayInt m_checks; wxArrayInt m_checks;

72
include/wx/osx/cocoa/private.h
View File

@@ -200,74 +200,74 @@ public :
virtual ~wxNonOwnedWindowCocoaImpl(); virtual ~wxNonOwnedWindowCocoaImpl();
virtual void WillBeDestroyed() ; virtual void WillBeDestroyed() wxOVERRIDE;
void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size, void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
long style, long extraStyle, const wxString& name ) ; long style, long extraStyle, const wxString& name ) wxOVERRIDE;
void Create( wxWindow* parent, WXWindow nativeWindow ); void Create( wxWindow* parent, WXWindow nativeWindow );
WXWindow GetWXWindow() const; WXWindow GetWXWindow() const wxOVERRIDE;
void Raise(); void Raise() wxOVERRIDE;
void Lower(); void Lower() wxOVERRIDE;
bool Show(bool show); bool Show(bool show) wxOVERRIDE;
virtual bool ShowWithEffect(bool show, virtual bool ShowWithEffect(bool show,
wxShowEffect effect, wxShowEffect effect,
unsigned timeout); unsigned timeout) wxOVERRIDE;
void Update(); void Update() wxOVERRIDE;
bool SetTransparent(wxByte alpha); bool SetTransparent(wxByte alpha) wxOVERRIDE;
bool SetBackgroundColour(const wxColour& col ); bool SetBackgroundColour(const wxColour& col ) wxOVERRIDE;
void SetExtraStyle( long exStyle ); void SetExtraStyle( long exStyle ) wxOVERRIDE;
void SetWindowStyleFlag( long style ); void SetWindowStyleFlag( long style ) wxOVERRIDE;
bool SetBackgroundStyle(wxBackgroundStyle style); bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE;
bool CanSetTransparent(); bool CanSetTransparent() wxOVERRIDE;
void MoveWindow(int x, int y, int width, int height); void MoveWindow(int x, int y, int width, int height) wxOVERRIDE;
void GetPosition( int &x, int &y ) const; void GetPosition( int &x, int &y ) const wxOVERRIDE;
void GetSize( int &width, int &height ) const; void GetSize( int &width, int &height ) const wxOVERRIDE;
void GetContentArea( int &left , int &top , int &width , int &height ) const; void GetContentArea( int &left , int &top , int &width , int &height ) const wxOVERRIDE;
bool SetShape(const wxRegion& region); bool SetShape(const wxRegion& region) wxOVERRIDE;
virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ; virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) wxOVERRIDE;
virtual bool EnableCloseButton(bool enable) wxOVERRIDE; virtual bool EnableCloseButton(bool enable) wxOVERRIDE;
virtual bool EnableMaximizeButton(bool enable) wxOVERRIDE; virtual bool EnableMaximizeButton(bool enable) wxOVERRIDE;
virtual bool EnableMinimizeButton(bool enable) wxOVERRIDE; virtual bool EnableMinimizeButton(bool enable) wxOVERRIDE;
virtual bool IsMaximized() const; virtual bool IsMaximized() const wxOVERRIDE;
virtual bool IsIconized() const; virtual bool IsIconized() const wxOVERRIDE;
virtual void Iconize( bool iconize ); virtual void Iconize( bool iconize ) wxOVERRIDE;
virtual void Maximize(bool maximize); virtual void Maximize(bool maximize) wxOVERRIDE;
virtual bool IsFullScreen() const; virtual bool IsFullScreen() const wxOVERRIDE;
bool EnableFullScreenView(bool enable) wxOVERRIDE; bool EnableFullScreenView(bool enable) wxOVERRIDE;
virtual bool ShowFullScreen(bool show, long style); virtual bool ShowFullScreen(bool show, long style) wxOVERRIDE;
virtual void ShowWithoutActivating(); virtual void ShowWithoutActivating() wxOVERRIDE;
virtual void RequestUserAttention(int flags); virtual void RequestUserAttention(int flags) wxOVERRIDE;
virtual void ScreenToWindow( int *x, int *y ); virtual void ScreenToWindow( int *x, int *y ) wxOVERRIDE;
virtual void WindowToScreen( int *x, int *y ); virtual void WindowToScreen( int *x, int *y ) wxOVERRIDE;
virtual bool IsActive(); virtual bool IsActive() wxOVERRIDE;
virtual void SetModified(bool modified); virtual void SetModified(bool modified) wxOVERRIDE;
virtual bool IsModified() const; virtual bool IsModified() const wxOVERRIDE;
virtual void SetRepresentedFilename(const wxString& filename); virtual void SetRepresentedFilename(const wxString& filename) wxOVERRIDE;
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
CGWindowLevel GetWindowLevel() const { return m_macWindowLevel; } CGWindowLevel GetWindowLevel() const wxOVERRIDE { return m_macWindowLevel; }
void RestoreWindowLevel(); void RestoreWindowLevel() wxOVERRIDE;
static WX_NSResponder GetNextFirstResponder() ; static WX_NSResponder GetNextFirstResponder() ;
static WX_NSResponder GetFormerFirstResponder() ; static WX_NSResponder GetFormerFirstResponder() ;

64
include/wx/osx/dataview.h
View File

@@ -155,39 +155,39 @@ public:
} }
// inherited methods from wxDataViewCtrlBase: // inherited methods from wxDataViewCtrlBase:
virtual bool AssociateModel(wxDataViewModel* model); virtual bool AssociateModel(wxDataViewModel* model) wxOVERRIDE;
virtual bool AppendColumn (wxDataViewColumn* columnPtr); virtual bool AppendColumn (wxDataViewColumn* columnPtr) wxOVERRIDE;
virtual bool ClearColumns (); virtual bool ClearColumns () wxOVERRIDE;
virtual bool DeleteColumn (wxDataViewColumn* columnPtr); virtual bool DeleteColumn (wxDataViewColumn* columnPtr) wxOVERRIDE;
virtual wxDataViewColumn* GetColumn (unsigned int pos) const; virtual wxDataViewColumn* GetColumn (unsigned int pos) const wxOVERRIDE;
virtual unsigned int GetColumnCount () const; virtual unsigned int GetColumnCount () const wxOVERRIDE;
virtual int GetColumnPosition(const wxDataViewColumn* columnPtr) const; virtual int GetColumnPosition(const wxDataViewColumn* columnPtr) const wxOVERRIDE;
virtual wxDataViewColumn* GetSortingColumn () const; virtual wxDataViewColumn* GetSortingColumn () const wxOVERRIDE;
virtual bool InsertColumn (unsigned int pos, wxDataViewColumn *col); virtual bool InsertColumn (unsigned int pos, wxDataViewColumn *col) wxOVERRIDE;
virtual bool PrependColumn (wxDataViewColumn* columnPtr); virtual bool PrependColumn (wxDataViewColumn* columnPtr) wxOVERRIDE;
virtual void Collapse( const wxDataViewItem& item); virtual void Collapse( const wxDataViewItem& item) wxOVERRIDE;
virtual void EnsureVisible(const wxDataViewItem& item, const wxDataViewColumn* columnPtr=NULL); virtual void EnsureVisible(const wxDataViewItem& item, const wxDataViewColumn* columnPtr=NULL) wxOVERRIDE;
virtual void Expand(const wxDataViewItem& item); virtual void Expand(const wxDataViewItem& item) wxOVERRIDE;
virtual bool IsExpanded(const wxDataViewItem & item) const; virtual bool IsExpanded(const wxDataViewItem & item) const wxOVERRIDE;
virtual unsigned int GetCount() const; virtual unsigned int GetCount() const;
virtual wxRect GetItemRect(const wxDataViewItem& item, virtual wxRect GetItemRect(const wxDataViewItem& item,
const wxDataViewColumn* columnPtr = NULL) const; const wxDataViewColumn* columnPtr = NULL) const wxOVERRIDE;
virtual int GetSelectedItemsCount() const; virtual int GetSelectedItemsCount() const wxOVERRIDE;
virtual int GetSelections(wxDataViewItemArray& sel) const; virtual int GetSelections(wxDataViewItemArray& sel) const wxOVERRIDE;
virtual void HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const; virtual void HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const wxOVERRIDE;
virtual bool IsSelected(const wxDataViewItem& item) const; virtual bool IsSelected(const wxDataViewItem& item) const wxOVERRIDE;
virtual void SelectAll(); virtual void SelectAll() wxOVERRIDE;
virtual void Select(const wxDataViewItem& item); virtual void Select(const wxDataViewItem& item) wxOVERRIDE;
virtual void SetSelections(const wxDataViewItemArray& sel); virtual void SetSelections(const wxDataViewItemArray& sel) wxOVERRIDE;
virtual void Unselect(const wxDataViewItem& item); virtual void Unselect(const wxDataViewItem& item) wxOVERRIDE;
virtual void UnselectAll(); virtual void UnselectAll() wxOVERRIDE;
// //
// implementation // implementation
@@ -201,7 +201,7 @@ public:
// finishes editing of custom items; if no custom item is currently edited the method does nothing // finishes editing of custom items; if no custom item is currently edited the method does nothing
void FinishCustomItemEditing(); void FinishCustomItemEditing();
virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column); virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column) wxOVERRIDE;
// returns the n-th pointer to a column; // returns the n-th pointer to a column;
// this method is different from GetColumn(unsigned int pos) because here 'n' is not a position in the control but the n-th // this method is different from GetColumn(unsigned int pos) because here 'n' is not a position in the control but the n-th
@@ -256,9 +256,9 @@ public:
m_Deleting = deleting; m_Deleting = deleting;
} }
virtual wxDataViewColumn *GetCurrentColumn() const; virtual wxDataViewColumn *GetCurrentColumn() const wxOVERRIDE;
virtual wxVisualAttributes GetDefaultAttributes() const virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
{ {
return GetClassDefaultAttributes(GetWindowVariant()); return GetClassDefaultAttributes(GetWindowVariant());
} }
@@ -268,10 +268,10 @@ public:
protected: protected:
// inherited methods from wxDataViewCtrlBase // inherited methods from wxDataViewCtrlBase
virtual void DoSetExpanderColumn(); virtual void DoSetExpanderColumn() wxOVERRIDE;
virtual void DoSetIndent(); virtual void DoSetIndent() wxOVERRIDE;
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
// event handling // event handling
void OnSize(wxSizeEvent &event); void OnSize(wxSizeEvent &event);
@@ -281,8 +281,8 @@ private:
// initializing of local variables: // initializing of local variables:
void Init(); void Init();
virtual wxDataViewItem DoGetCurrentItem() const; virtual wxDataViewItem DoGetCurrentItem() const wxOVERRIDE;
virtual void DoSetCurrentItem(const wxDataViewItem& item); virtual void DoSetCurrentItem(const wxDataViewItem& item) wxOVERRIDE;
// //
// variables // variables

16
include/wx/osx/dvrenderer.h
View File

@@ -31,31 +31,31 @@ public:
// inherited methods from wxDataViewRendererBase // inherited methods from wxDataViewRendererBase
// --------------------------------------------- // ---------------------------------------------
virtual int GetAlignment() const virtual int GetAlignment() const wxOVERRIDE
{ {
return m_alignment; return m_alignment;
} }
virtual wxDataViewCellMode GetMode() const virtual wxDataViewCellMode GetMode() const wxOVERRIDE
{ {
return m_mode; return m_mode;
} }
virtual bool GetValue(wxVariant& value) const virtual bool GetValue(wxVariant& value) const wxOVERRIDE
{ {
value = m_value; value = m_value;
return true; return true;
} }
// NB: in Carbon this is always identical to the header alignment // NB: in Carbon this is always identical to the header alignment
virtual void SetAlignment(int align); virtual void SetAlignment(int align) wxOVERRIDE;
virtual void SetMode(wxDataViewCellMode mode); virtual void SetMode(wxDataViewCellMode mode) wxOVERRIDE;
virtual bool SetValue(const wxVariant& newValue) virtual bool SetValue(const wxVariant& newValue) wxOVERRIDE
{ {
m_value = newValue; m_value = newValue;
return true; return true;
} }
virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE); virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) wxOVERRIDE;
virtual wxEllipsizeMode GetEllipsizeMode() const; virtual wxEllipsizeMode GetEllipsizeMode() const wxOVERRIDE;
// implementation // implementation
// -------------- // --------------

26
include/wx/osx/frame.h
View File

@@ -48,10 +48,10 @@ public:
// get the origin of the client area (which may be different from (0, 0) // get the origin of the client area (which may be different from (0, 0)
// if the frame has a toolbar) in client coordinates // if the frame has a toolbar) in client coordinates
virtual wxPoint GetClientAreaOrigin() const; virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
// override some more virtuals // override some more virtuals
virtual bool Enable(bool enable = true) ; virtual bool Enable(bool enable = true) wxOVERRIDE;
// event handlers // event handlers
void OnActivate(wxActivateEvent& event); void OnActivate(wxActivateEvent& event);
@@ -61,9 +61,9 @@ public:
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
virtual wxToolBar* CreateToolBar(long style = -1, virtual wxToolBar* CreateToolBar(long style = -1,
wxWindowID id = -1, wxWindowID id = -1,
const wxString& name = wxToolBarNameStr); const wxString& name = wxToolBarNameStr) wxOVERRIDE;
virtual void SetToolBar(wxToolBar *toolbar); virtual void SetToolBar(wxToolBar *toolbar) wxOVERRIDE;
#endif // wxUSE_TOOLBAR #endif // wxUSE_TOOLBAR
// Status bar // Status bar
@@ -71,7 +71,7 @@ public:
virtual wxStatusBar* OnCreateStatusBar(int number = 1, virtual wxStatusBar* OnCreateStatusBar(int number = 1,
long style = wxSTB_DEFAULT_STYLE, long style = wxSTB_DEFAULT_STYLE,
wxWindowID id = 0, wxWindowID id = 0,
const wxString& name = wxStatusLineNameStr); const wxString& name = wxStatusLineNameStr) wxOVERRIDE;
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
// called by wxWindow whenever it gets focus // called by wxWindow whenever it gets focus
@@ -81,32 +81,32 @@ public:
void PositionBars(); void PositionBars();
// internal response to size events // internal response to size events
virtual void MacOnInternalSize() { PositionBars(); } virtual void MacOnInternalSize() wxOVERRIDE { PositionBars(); }
protected: protected:
// common part of all ctors // common part of all ctors
void Init(); void Init();
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
virtual void PositionToolBar(); virtual void PositionToolBar() wxOVERRIDE;
#endif #endif
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
virtual void PositionStatusBar(); virtual void PositionStatusBar() wxOVERRIDE;
#endif #endif
// override base class virtuals // override base class virtuals
virtual void DoGetClientSize(int *width, int *height) const; virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
virtual void DoSetClientSize(int width, int height); virtual void DoSetClientSize(int width, int height) wxOVERRIDE;
#if wxUSE_MENUS #if wxUSE_MENUS
virtual void DetachMenuBar(); virtual void DetachMenuBar() wxOVERRIDE;
virtual void AttachMenuBar(wxMenuBar *menubar); virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE;
#endif #endif
// the last focused child: we restore focus to it on activation // the last focused child: we restore focus to it on activation
wxWindow *m_winLastFocused; wxWindow *m_winLastFocused;
virtual bool MacIsChildOfClientArea( const wxWindow* child ) const ; virtual bool MacIsChildOfClientArea( const wxWindow* child ) const wxOVERRIDE;
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
wxDECLARE_DYNAMIC_CLASS(wxFrame); wxDECLARE_DYNAMIC_CLASS(wxFrame);

2
include/wx/osx/glcanvas.h
View File

@@ -73,7 +73,7 @@ public:
virtual ~wxGLCanvas(); virtual ~wxGLCanvas();
// implement wxGLCanvasBase methods // implement wxGLCanvasBase methods
virtual bool SwapBuffers(); virtual bool SwapBuffers() wxOVERRIDE;
// Mac-specific functions // Mac-specific functions

38
include/wx/osx/listbox.h
View File

@@ -91,24 +91,24 @@ public:
virtual ~wxListBox(); virtual ~wxListBox();
// implement base class pure virtuals // implement base class pure virtuals
virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL); virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL) wxOVERRIDE;
virtual unsigned int GetCount() const; virtual unsigned int GetCount() const wxOVERRIDE;
virtual wxString GetString(unsigned int n) const; virtual wxString GetString(unsigned int n) const wxOVERRIDE;
virtual void SetString(unsigned int n, const wxString& s); virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
virtual int FindString(const wxString& s, bool bCase = false) const; virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE;
// data callbacks // data callbacks
virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );
virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value ); virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );
virtual bool IsSelected(int n) const; virtual bool IsSelected(int n) const wxOVERRIDE;
virtual int GetSelection() const; virtual int GetSelection() const wxOVERRIDE;
virtual int GetSelections(wxArrayInt& aSelections) const; virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE;
virtual void EnsureVisible(int n); virtual void EnsureVisible(int n) wxOVERRIDE;
virtual wxVisualAttributes GetDefaultAttributes() const virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
{ {
return GetClassDefaultAttributes(GetWindowVariant()); return GetClassDefaultAttributes(GetWindowVariant());
} }
@@ -127,27 +127,27 @@ protected:
// at a certain line - which cannot be predetermined for sorted list data // at a certain line - which cannot be predetermined for sorted list data
virtual void OnItemInserted(unsigned int pos); virtual void OnItemInserted(unsigned int pos);
virtual void DoClear(); virtual void DoClear() wxOVERRIDE;
virtual void DoDeleteOneItem(unsigned int n); virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
// from wxItemContainer // from wxItemContainer
virtual int DoInsertItems(const wxArrayStringsAdapter& items, virtual int DoInsertItems(const wxArrayStringsAdapter& items,
unsigned int pos, unsigned int pos,
void **clientData, wxClientDataType type); void **clientData, wxClientDataType type) wxOVERRIDE;
virtual void DoSetItemClientData(unsigned int n, void* clientData); virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE;
virtual void* DoGetItemClientData(unsigned int n) const; virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE;
// from wxListBoxBase // from wxListBoxBase
virtual void DoSetSelection(int n, bool select); virtual void DoSetSelection(int n, bool select) wxOVERRIDE;
virtual void DoSetFirstItem(int n); virtual void DoSetFirstItem(int n) wxOVERRIDE;
virtual int DoListHitTest(const wxPoint& point) const; virtual int DoListHitTest(const wxPoint& point) const wxOVERRIDE;
// free memory (common part of Clear() and dtor) // free memory (common part of Clear() and dtor)
// prevent collision with some BSD definitions of macro Free() // prevent collision with some BSD definitions of macro Free()
void FreeData(); void FreeData();
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
bool m_blockEvents; bool m_blockEvents;

16
include/wx/osx/mdi.h
View File

@@ -43,29 +43,29 @@ public:
static bool IsTDI() { return false; } static bool IsTDI() { return false; }
virtual void AddChild(wxWindowBase *child); virtual void AddChild(wxWindowBase *child) wxOVERRIDE;
virtual void RemoveChild(wxWindowBase *child); virtual void RemoveChild(wxWindowBase *child) wxOVERRIDE;
virtual void ActivateNext() { /* TODO */ } virtual void ActivateNext() wxOVERRIDE { /* TODO */ }
virtual void ActivatePrevious() { /* TODO */ } virtual void ActivatePrevious() wxOVERRIDE { /* TODO */ }
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
// Mac-specific implementation from now on // Mac-specific implementation from now on
// --------------------------------------- // ---------------------------------------
// Mac OS activate event // Mac OS activate event
virtual void MacActivate(long timestamp, bool activating); virtual void MacActivate(long timestamp, bool activating) wxOVERRIDE;
// wxWidgets activate event // wxWidgets activate event
void OnActivate(wxActivateEvent& event); void OnActivate(wxActivateEvent& event);
void OnSysColourChanged(wxSysColourChangedEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event);
void SetMenuBar(wxMenuBar *menu_bar); void SetMenuBar(wxMenuBar *menu_bar) wxOVERRIDE;
// Get rect to be used to center top-level children // Get rect to be used to center top-level children
virtual void GetRectForTopLevelChildren(int *x, int *y, int *w, int *h); virtual void GetRectForTopLevelChildren(int *x, int *y, int *w, int *h) wxOVERRIDE;
protected: protected:
// common part of all ctors // common part of all ctors

40
include/wx/osx/notebook.h
View File

@@ -57,44 +57,44 @@ public:
// set the currently selected page, return the index of the previously // set the currently selected page, return the index of the previously
// selected one (or wxNOT_FOUND on error) // selected one (or wxNOT_FOUND on error)
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); } int SetSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage, SetSelection_SendEvent); }
// changes selected page without sending events // changes selected page without sending events
int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); } int ChangeSelection(size_t nPage) wxOVERRIDE { return DoSetSelection(nPage); }
// set/get the title of a page // set/get the title of a page
bool SetPageText(size_t nPage, const wxString& strText); bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE;
wxString GetPageText(size_t nPage) const; wxString GetPageText(size_t nPage) const wxOVERRIDE;
// sets/returns item's image index in the current image list // sets/returns item's image index in the current image list
int GetPageImage(size_t nPage) const; int GetPageImage(size_t nPage) const wxOVERRIDE;
bool SetPageImage(size_t nPage, int nImage); bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE;
// control the appearance of the notebook pages // control the appearance of the notebook pages
// set the size (the same for all pages) // set the size (the same for all pages)
virtual void SetPageSize(const wxSize& size); virtual void SetPageSize(const wxSize& size) wxOVERRIDE;
// set the padding between tabs (in pixels) // set the padding between tabs (in pixels)
virtual void SetPadding(const wxSize& padding); virtual void SetPadding(const wxSize& padding) wxOVERRIDE;
// sets the size of the tabs (assumes all tabs are the same size) // sets the size of the tabs (assumes all tabs are the same size)
virtual void SetTabSize(const wxSize& sz); virtual void SetTabSize(const wxSize& sz) wxOVERRIDE;
// hit test // hit test
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE;
// calculate size for wxNotebookSizer // calculate size for wxNotebookSizer
wxSize CalcSizeFromPage(const wxSize& sizePage) const; wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE;
wxRect GetPageRect() const ; wxRect GetPageRect() const wxOVERRIDE;
// operations // operations
// ---------- // ----------
// remove all pages // remove all pages
bool DeleteAllPages(); bool DeleteAllPages() wxOVERRIDE;
// the same as AddPage(), but adds it at the specified position // the same as AddPage(), but adds it at the specified position
bool InsertPage(size_t nPage, bool InsertPage(size_t nPage,
wxNotebookPage *pPage, wxNotebookPage *pPage,
const wxString& strText, const wxString& strText,
bool bSelect = false, bool bSelect = false,
int imageId = NO_IMAGE); int imageId = NO_IMAGE) wxOVERRIDE;
// callbacks // callbacks
// --------- // ---------
@@ -106,20 +106,20 @@ public:
// -------------- // --------------
#if wxUSE_CONSTRAINTS #if wxUSE_CONSTRAINTS
virtual void SetConstraintSizes(bool recurse = true); virtual void SetConstraintSizes(bool recurse = true) wxOVERRIDE;
virtual bool DoPhase(int nPhase); virtual bool DoPhase(int nPhase) wxOVERRIDE;
#endif #endif
// base class virtuals // base class virtuals
// ------------------- // -------------------
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event) wxOVERRIDE;
// osx specific event handling common for all osx-ports // osx specific event handling common for all osx-ports
virtual bool OSXHandleClicked( double timestampsec ); virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE;
protected: protected:
virtual wxNotebookPage *DoRemovePage(size_t page) ; virtual wxNotebookPage *DoRemovePage(size_t page) wxOVERRIDE;
// common part of all ctors // common part of all ctors
void Init(); void Init();
@@ -127,7 +127,7 @@ protected:
void ChangePage(int nOldSel, int nSel); // change pages void ChangePage(int nOldSel, int nSel); // change pages
void MacSetupTabs(); void MacSetupTabs();
int DoSetSelection(size_t nPage, int flags = 0); int DoSetSelection(size_t nPage, int flags = 0) wxOVERRIDE;
// the icon indices // the icon indices
wxArrayInt m_images; wxArrayInt m_images;

38
include/wx/osx/radiobox.h
View File

@@ -54,32 +54,32 @@ public:
const wxString& name = wxRadioBoxNameStr); const wxString& name = wxRadioBoxNameStr);
// Enabling // Enabling
virtual bool Enable(bool enable = true); virtual bool Enable(bool enable = true) wxOVERRIDE;
virtual bool Enable(unsigned int item, bool enable = true); virtual bool Enable(unsigned int item, bool enable = true) wxOVERRIDE;
virtual bool IsItemEnabled(unsigned int item) const; virtual bool IsItemEnabled(unsigned int item) const wxOVERRIDE;
// Showing // Showing
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
virtual bool Show(unsigned int item, bool show = true); virtual bool Show(unsigned int item, bool show = true) wxOVERRIDE;
virtual bool IsItemShown(unsigned int item) const; virtual bool IsItemShown(unsigned int item) const wxOVERRIDE;
// Specific functions (in wxWidgets2 reference) // Specific functions (in wxWidgets2 reference)
virtual void SetSelection(int item); virtual void SetSelection(int item) wxOVERRIDE;
virtual int GetSelection() const; virtual int GetSelection() const wxOVERRIDE;
virtual unsigned int GetCount() const { return m_noItems; } virtual unsigned int GetCount() const wxOVERRIDE { return m_noItems; }
virtual wxString GetString(unsigned int item) const; virtual wxString GetString(unsigned int item) const wxOVERRIDE;
virtual void SetString(unsigned int item, const wxString& label); virtual void SetString(unsigned int item, const wxString& label) wxOVERRIDE;
virtual wxString GetLabel() const; virtual wxString GetLabel() const wxOVERRIDE;
virtual void SetLabel(const wxString& label) ; virtual void SetLabel(const wxString& label) wxOVERRIDE;
// protect native font of box // protect native font of box
virtual bool SetFont( const wxFont &font ); virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
// Other external functions // Other external functions
void Command(wxCommandEvent& event); void Command(wxCommandEvent& event) wxOVERRIDE;
void SetFocus(); void SetFocus() wxOVERRIDE;
// Other variable access functions // Other variable access functions
int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; } int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
@@ -89,7 +89,7 @@ public:
protected: protected:
// resolve ambiguity in base classes // resolve ambiguity in base classes
virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); } virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxRadioBoxBase::GetDefaultBorder(); }
wxRadioButton *m_radioButtonCycle; wxRadioButton *m_radioButtonCycle;
@@ -97,10 +97,10 @@ protected:
int m_noRowsOrCols; int m_noRowsOrCols;
// Internal functions // Internal functions
virtual wxSize DoGetBestSize() const ; virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual void DoSetSize(int x, int y, virtual void DoSetSize(int x, int y,
int width, int height, int width, int height,
int sizeFlags = wxSIZE_AUTO); int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };

20
include/wx/osx/scrolbar.h
View File

@@ -36,14 +36,14 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxScrollBarNameStr); const wxString& name = wxScrollBarNameStr);
virtual int GetThumbPosition() const ; virtual int GetThumbPosition() const wxOVERRIDE;
virtual int GetThumbSize() const { return m_viewSize; } virtual int GetThumbSize() const wxOVERRIDE { return m_viewSize; }
virtual int GetPageSize() const { return m_pageSize; } virtual int GetPageSize() const wxOVERRIDE { return m_pageSize; }
virtual int GetRange() const { return m_objectSize; } virtual int GetRange() const wxOVERRIDE { return m_objectSize; }
virtual void SetThumbPosition(int viewStart); virtual void SetThumbPosition(int viewStart) wxOVERRIDE;
virtual void SetScrollbar(int position, int thumbSize, int range, virtual void SetScrollbar(int position, int thumbSize, int range,
int pageSize, bool refresh = true); int pageSize, bool refresh = true) wxOVERRIDE;
// needed for RTTI // needed for RTTI
void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; } void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; }
@@ -51,11 +51,11 @@ public:
void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; } void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; }
// implementation only from now on // implementation only from now on
void Command(wxCommandEvent& event); void Command(wxCommandEvent& event) wxOVERRIDE;
virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; virtual void TriggerScrollEvent( wxEventType scrollEvent ) wxOVERRIDE;
virtual bool OSXHandleClicked( double timestampsec ); virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE;
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
int m_pageSize; int m_pageSize;
int m_viewSize; int m_viewSize;

54
include/wx/osx/slider.h
View File

@@ -43,53 +43,53 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr); const wxString& name = wxSliderNameStr);
virtual int GetValue() const ; virtual int GetValue() const wxOVERRIDE;
virtual void SetValue(int); virtual void SetValue(int) wxOVERRIDE;
void SetRange(int minValue, int maxValue); void SetRange(int minValue, int maxValue) wxOVERRIDE;
int GetMin() const { return m_rangeMin; } int GetMin() const wxOVERRIDE { return m_rangeMin; }
int GetMax() const { return m_rangeMax; } int GetMax() const wxOVERRIDE { return m_rangeMax; }
void SetMin(int minValue) { SetRange(minValue, m_rangeMax); } void SetMin(int minValue) { SetRange(minValue, m_rangeMax); }
void SetMax(int maxValue) { SetRange(m_rangeMin, maxValue); } void SetMax(int maxValue) { SetRange(m_rangeMin, maxValue); }
// For trackbars only // For trackbars only
int GetTickFreq() const { return m_tickFreq; } int GetTickFreq() const wxOVERRIDE { return m_tickFreq; }
void SetPageSize(int pageSize); void SetPageSize(int pageSize) wxOVERRIDE;
int GetPageSize() const ; int GetPageSize() const wxOVERRIDE;
void ClearSel() ; void ClearSel() wxOVERRIDE;
void ClearTicks() ; void ClearTicks() wxOVERRIDE;
void SetLineSize(int lineSize); void SetLineSize(int lineSize) wxOVERRIDE;
int GetLineSize() const ; int GetLineSize() const wxOVERRIDE;
int GetSelEnd() const ; int GetSelEnd() const wxOVERRIDE;
int GetSelStart() const ; int GetSelStart() const wxOVERRIDE;
void SetSelection(int minPos, int maxPos); void SetSelection(int minPos, int maxPos) wxOVERRIDE;
void SetThumbLength(int len) ; void SetThumbLength(int len) wxOVERRIDE;
int GetThumbLength() const ; int GetThumbLength() const wxOVERRIDE;
void SetTick(int tickPos) ; void SetTick(int tickPos) wxOVERRIDE;
void Command(wxCommandEvent& event); void Command(wxCommandEvent& event) wxOVERRIDE;
// osx specific event handling common for all osx-ports // osx specific event handling common for all osx-ports
virtual bool OSXHandleClicked( double timestampsec ); virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE;
virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; virtual void TriggerScrollEvent( wxEventType scrollEvent ) wxOVERRIDE;
protected: protected:
// Platform-specific implementation of SetTickFreq // Platform-specific implementation of SetTickFreq
virtual void DoSetTickFreq(int freq); virtual void DoSetTickFreq(int freq) wxOVERRIDE;
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags); virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags) wxOVERRIDE;
virtual void DoMoveWindow(int x, int y, int w, int h); virtual void DoMoveWindow(int x, int y, int w, int h) wxOVERRIDE;
// set min/max size of the slider // set min/max size of the slider
virtual void DoSetSizeHints( int minW, int minH, virtual void DoSetSizeHints( int minW, int minH,
int maxW, int maxH, int maxW, int maxH,
int incW, int incH); int incW, int incH) wxOVERRIDE;
// Common processing to invert slider values based on wxSL_INVERSE // Common processing to invert slider values based on wxSL_INVERSE
virtual int ValueInvertOrNot(int value) const; virtual int ValueInvertOrNot(int value) const wxOVERRIDE;
wxStaticText* m_macMinimumStatic ; wxStaticText* m_macMinimumStatic ;
wxStaticText* m_macMaximumStatic ; wxStaticText* m_macMaximumStatic ;

14
include/wx/osx/srchctrl.h
View File

@@ -42,17 +42,17 @@ public:
#if wxUSE_MENUS #if wxUSE_MENUS
// get/set search button menu // get/set search button menu
// -------------------------- // --------------------------
virtual void SetMenu( wxMenu* menu ); virtual void SetMenu( wxMenu* menu ) wxOVERRIDE;
virtual wxMenu* GetMenu(); virtual wxMenu* GetMenu() wxOVERRIDE;
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
// get/set search options // get/set search options
// ---------------------- // ----------------------
virtual void ShowSearchButton( bool show ); virtual void ShowSearchButton( bool show ) wxOVERRIDE;
virtual bool IsSearchButtonVisible() const; virtual bool IsSearchButtonVisible() const wxOVERRIDE;
virtual void ShowCancelButton( bool show ); virtual void ShowCancelButton( bool show ) wxOVERRIDE;
virtual bool IsCancelButtonVisible() const; virtual bool IsCancelButtonVisible() const wxOVERRIDE;
// TODO: In 2.9 these should probably be virtual, and declared in the base class... // TODO: In 2.9 these should probably be virtual, and declared in the base class...
void SetDescriptiveText(const wxString& text); void SetDescriptiveText(const wxString& text);
@@ -65,7 +65,7 @@ public:
protected: protected:
wxSize DoGetBestSize() const; wxSize DoGetBestSize() const wxOVERRIDE;
void Init(); void Init();

8
include/wx/osx/statusbr.h
View File

@@ -27,13 +27,13 @@ public:
const wxString& name = wxStatusBarNameStr); const wxString& name = wxStatusBarNameStr);
// Implementation // Implementation
virtual void MacHiliteChanged(); virtual void MacHiliteChanged() wxOVERRIDE;
void OnPaint(wxPaintEvent& event); void OnPaint(wxPaintEvent& event);
protected: protected:
virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight); virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight) wxOVERRIDE;
virtual void DrawField(wxDC& dc, int i, int textHeight); virtual void DrawField(wxDC& dc, int i, int textHeight) wxOVERRIDE;
virtual void DoUpdateStatusText(int number = 0); virtual void DoUpdateStatusText(int number = 0) wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxStatusBarMac); wxDECLARE_DYNAMIC_CLASS(wxStatusBarMac);
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();

46
include/wx/osx/textctrl.h
View File

@@ -60,46 +60,46 @@ public:
// accessors // accessors
// --------- // ---------
virtual int GetLineLength(long lineNo) const; virtual int GetLineLength(long lineNo) const wxOVERRIDE;
virtual wxString GetLineText(long lineNo) const; virtual wxString GetLineText(long lineNo) const wxOVERRIDE;
virtual int GetNumberOfLines() const; virtual int GetNumberOfLines() const wxOVERRIDE;
virtual bool IsModified() const; virtual bool IsModified() const wxOVERRIDE;
// operations // operations
// ---------- // ----------
// sets/clears the dirty flag // sets/clears the dirty flag
virtual void MarkDirty(); virtual void MarkDirty() wxOVERRIDE;
virtual void DiscardEdits(); virtual void DiscardEdits() wxOVERRIDE;
// text control under some platforms supports the text styles: these // text control under some platforms supports the text styles: these
// methods apply the given text style to the given selection or to // methods apply the given text style to the given selection or to
// set/get the style which will be used for all appended text // set/get the style which will be used for all appended text
virtual bool SetFont( const wxFont &font ); virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
virtual bool GetStyle(long position, wxTextAttr& style); virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE;
virtual bool SetStyle(long start, long end, const wxTextAttr& style); virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE;
virtual bool SetDefaultStyle(const wxTextAttr& style); virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE;
// translate between the position (which is just an index into the textctrl // translate between the position (which is just an index into the textctrl
// considering all its contents as a single strings) and (x, y) coordinates // considering all its contents as a single strings) and (x, y) coordinates
// which represent column and line. // which represent column and line.
virtual long XYToPosition(long x, long y) const; virtual long XYToPosition(long x, long y) const wxOVERRIDE;
virtual bool PositionToXY(long pos, long *x, long *y) const; virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE;
virtual void ShowPosition(long pos); virtual void ShowPosition(long pos) wxOVERRIDE;
// overrides so that we can send text updated events // overrides so that we can send text updated events
virtual void Copy(); virtual void Copy() wxOVERRIDE;
virtual void Cut(); virtual void Cut() wxOVERRIDE;
virtual void Paste(); virtual void Paste() wxOVERRIDE;
// Implementation // Implementation
// -------------- // --------------
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event) wxOVERRIDE;
virtual bool AcceptsFocus() const; virtual bool AcceptsFocus() const wxOVERRIDE;
// callbacks // callbacks
void OnDropFiles(wxDropFilesEvent& event); void OnDropFiles(wxDropFilesEvent& event);
@@ -124,22 +124,22 @@ public:
void OnContextMenu(wxContextMenuEvent& event); void OnContextMenu(wxContextMenuEvent& event);
virtual bool MacSetupCursor( const wxPoint& pt ); virtual bool MacSetupCursor( const wxPoint& pt ) wxOVERRIDE;
virtual void MacVisibilityChanged(); virtual void MacVisibilityChanged() wxOVERRIDE;
virtual void MacSuperChangedPosition(); virtual void MacSuperChangedPosition() wxOVERRIDE;
virtual void MacCheckSpelling(bool check); virtual void MacCheckSpelling(bool check);
protected: protected:
// common part of all ctors // common part of all ctors
void Init(); void Init();
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
// flag is set to true when the user edits the controls contents // flag is set to true when the user edits the controls contents
bool m_dirty; bool m_dirty;
virtual void EnableTextChangedEvents(bool WXUNUSED(enable)) virtual void EnableTextChangedEvents(bool WXUNUSED(enable)) wxOVERRIDE
{ {
// nothing to do here as the events are never generated when we change // nothing to do here as the events are never generated when we change
// the controls value programmatically anyhow // the controls value programmatically anyhow

48
include/wx/osx/toolbar.h
View File

@@ -40,34 +40,34 @@ public:
long style = wxTB_DEFAULT_STYLE, long style = wxTB_DEFAULT_STYLE,
const wxString& name = wxToolBarNameStr); const wxString& name = wxToolBarNameStr);
virtual void SetWindowStyleFlag(long style); virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
virtual bool Destroy(); virtual bool Destroy() wxOVERRIDE;
// override/implement base class virtuals // override/implement base class virtuals
virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE;
#ifndef __WXOSX_IPHONE__ #ifndef __WXOSX_IPHONE__
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
virtual bool IsShown() const; virtual bool IsShown() const wxOVERRIDE;
#endif #endif
virtual bool Realize(); virtual bool Realize() wxOVERRIDE;
virtual void SetToolBitmapSize(const wxSize& size); virtual void SetToolBitmapSize(const wxSize& size) wxOVERRIDE;
virtual wxSize GetToolSize() const; virtual wxSize GetToolSize() const wxOVERRIDE;
virtual void SetRows(int nRows); virtual void SetRows(int nRows) wxOVERRIDE;
virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap); virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE;
virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap); virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE;
#ifndef __WXOSX_IPHONE__ #ifndef __WXOSX_IPHONE__
// Add all the buttons // Add all the buttons
virtual wxString MacGetToolTipString( wxPoint &where ) ; virtual wxString MacGetToolTipString( wxPoint &where ) wxOVERRIDE;
void OnPaint(wxPaintEvent& event) ; void OnPaint(wxPaintEvent& event) ;
void OnMouse(wxMouseEvent& event) ; void OnMouse(wxMouseEvent& event) ;
virtual void MacSuperChangedPosition() ; virtual void MacSuperChangedPosition() wxOVERRIDE;
#endif #endif
#if wxOSX_USE_NATIVE_TOOLBAR #if wxOSX_USE_NATIVE_TOOLBAR
@@ -88,9 +88,9 @@ public:
wxItemKind kind = wxITEM_NORMAL, wxItemKind kind = wxITEM_NORMAL,
wxObject *clientData = NULL, wxObject *clientData = NULL,
const wxString& shortHelp = wxEmptyString, const wxString& shortHelp = wxEmptyString,
const wxString& longHelp = wxEmptyString); const wxString& longHelp = wxEmptyString) wxOVERRIDE;
virtual wxToolBarToolBase *CreateTool(wxControl *control, virtual wxToolBarToolBase *CreateTool(wxControl *control,
const wxString& label); const wxString& label) wxOVERRIDE;
protected: protected:
// common part of all ctors // common part of all ctors
@@ -98,21 +98,21 @@ protected:
void DoLayout(); void DoLayout();
void DoSetSize(int x, int y, int width, int height, int sizeFlags); void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE;
#ifndef __WXOSX_IPHONE__ #ifndef __WXOSX_IPHONE__
virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
#endif #endif
#ifdef __WXOSX_COCOA__ #ifdef __WXOSX_COCOA__
virtual void DoGetPosition(int*x, int *y) const; virtual void DoGetPosition(int*x, int *y) const wxOVERRIDE;
#endif #endif
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable); virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE;
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
#if wxOSX_USE_NATIVE_TOOLBAR #if wxOSX_USE_NATIVE_TOOLBAR

38
include/wx/osx/toplevel.h
View File

@@ -46,33 +46,33 @@ public:
bool Create(wxWindow *parent, WXWindow nativeWindow); bool Create(wxWindow *parent, WXWindow nativeWindow);
virtual bool Destroy(); virtual bool Destroy() wxOVERRIDE;
virtual wxPoint GetClientAreaOrigin() const; virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
// Attracts the users attention to this window if the application is // Attracts the users attention to this window if the application is
// inactive (should be called when a background event occurs) // inactive (should be called when a background event occurs)
virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) wxOVERRIDE;
// implement base class pure virtuals // implement base class pure virtuals
virtual void Maximize(bool maximize = true); virtual void Maximize(bool maximize = true) wxOVERRIDE;
virtual bool IsMaximized() const; virtual bool IsMaximized() const wxOVERRIDE;
virtual void Iconize(bool iconize = true); virtual void Iconize(bool iconize = true) wxOVERRIDE;
virtual bool IsIconized() const; virtual bool IsIconized() const wxOVERRIDE;
virtual void Restore(); virtual void Restore() wxOVERRIDE;
virtual bool IsActive(); virtual bool IsActive() wxOVERRIDE;
virtual void ShowWithoutActivating(); virtual void ShowWithoutActivating() wxOVERRIDE;
bool EnableFullScreenView(bool enable = true) wxOVERRIDE; bool EnableFullScreenView(bool enable = true) wxOVERRIDE;
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) ; virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE;
virtual bool IsFullScreen() const ; virtual bool IsFullScreen() const wxOVERRIDE;
// implementation from now on // implementation from now on
// -------------------------- // --------------------------
virtual void SetTitle( const wxString& title); virtual void SetTitle( const wxString& title) wxOVERRIDE;
virtual wxString GetTitle() const; virtual wxString GetTitle() const wxOVERRIDE;
// EnableCloseButton(false) used to disable the "Close" // EnableCloseButton(false) used to disable the "Close"
// button on the title bar // button on the title bar
@@ -80,13 +80,13 @@ public:
virtual bool EnableMaximizeButton(bool enable = true) wxOVERRIDE; virtual bool EnableMaximizeButton(bool enable = true) wxOVERRIDE;
virtual bool EnableMinimizeButton(bool enable = true) wxOVERRIDE; virtual bool EnableMinimizeButton(bool enable = true) wxOVERRIDE;
virtual void SetLabel(const wxString& label) { SetTitle( label ); } virtual void SetLabel(const wxString& label) wxOVERRIDE { SetTitle( label ); }
virtual wxString GetLabel() const { return GetTitle(); } virtual wxString GetLabel() const wxOVERRIDE { return GetTitle(); }
virtual void OSXSetModified(bool modified); virtual void OSXSetModified(bool modified) wxOVERRIDE;
virtual bool OSXIsModified() const; virtual bool OSXIsModified() const wxOVERRIDE;
virtual void SetRepresentedFilename(const wxString& filename); virtual void SetRepresentedFilename(const wxString& filename) wxOVERRIDE;
// do *not* call this to iconize the frame, this is a private function! // do *not* call this to iconize the frame, this is a private function!
void OSXSetIconizeState(bool iconic); void OSXSetIconizeState(bool iconic);

100
include/wx/osx/webview_webkit.h
View File

@@ -45,47 +45,47 @@ public:
const wxString& strURL = wxWebViewDefaultURLStr, const wxString& strURL = wxWebViewDefaultURLStr,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxWebViewNameStr); const wxString& name = wxWebViewNameStr) wxOVERRIDE;
virtual ~wxWebViewWebKit(); virtual ~wxWebViewWebKit();
virtual bool CanGoBack() const; virtual bool CanGoBack() const wxOVERRIDE;
virtual bool CanGoForward() const; virtual bool CanGoForward() const wxOVERRIDE;
virtual void GoBack(); virtual void GoBack() wxOVERRIDE;
virtual void GoForward(); virtual void GoForward() wxOVERRIDE;
virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT); virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) wxOVERRIDE;
virtual void Stop(); virtual void Stop() wxOVERRIDE;
virtual wxString GetPageSource() const; virtual wxString GetPageSource() const wxOVERRIDE;
virtual wxString GetPageText() const; virtual wxString GetPageText() const wxOVERRIDE;
virtual void Print(); virtual void Print() wxOVERRIDE;
virtual void LoadURL(const wxString& url); virtual void LoadURL(const wxString& url) wxOVERRIDE;
virtual wxString GetCurrentURL() const; virtual wxString GetCurrentURL() const wxOVERRIDE;
virtual wxString GetCurrentTitle() const; virtual wxString GetCurrentTitle() const wxOVERRIDE;
virtual wxWebViewZoom GetZoom() const; virtual wxWebViewZoom GetZoom() const wxOVERRIDE;
virtual void SetZoom(wxWebViewZoom zoom); virtual void SetZoom(wxWebViewZoom zoom) wxOVERRIDE;
virtual void SetZoomType(wxWebViewZoomType zoomType); virtual void SetZoomType(wxWebViewZoomType zoomType) wxOVERRIDE;
virtual wxWebViewZoomType GetZoomType() const; virtual wxWebViewZoomType GetZoomType() const wxOVERRIDE;
virtual bool CanSetZoomType(wxWebViewZoomType type) const; virtual bool CanSetZoomType(wxWebViewZoomType type) const wxOVERRIDE;
virtual bool IsBusy() const { return m_busy; } virtual bool IsBusy() const wxOVERRIDE { return m_busy; }
//History functions //History functions
virtual void ClearHistory(); virtual void ClearHistory() wxOVERRIDE;
virtual void EnableHistory(bool enable = true); virtual void EnableHistory(bool enable = true) wxOVERRIDE;
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory(); virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory() wxOVERRIDE;
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory(); virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory() wxOVERRIDE;
virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item); virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item) wxOVERRIDE;
//Undo / redo functionality //Undo / redo functionality
virtual bool CanUndo() const; virtual bool CanUndo() const wxOVERRIDE;
virtual bool CanRedo() const; virtual bool CanRedo() const wxOVERRIDE;
virtual void Undo(); virtual void Undo() wxOVERRIDE;
virtual void Redo(); virtual void Redo() wxOVERRIDE;
//Find function //Find function
virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) wxOVERRIDE
{ {
wxUnusedVar(text); wxUnusedVar(text);
wxUnusedVar(flags); wxUnusedVar(flags);
@@ -93,31 +93,31 @@ public:
} }
//Clipboard functions //Clipboard functions
virtual bool CanCut() const { return true; } virtual bool CanCut() const wxOVERRIDE { return true; }
virtual bool CanCopy() const { return true; } virtual bool CanCopy() const wxOVERRIDE { return true; }
virtual bool CanPaste() const { return true; } virtual bool CanPaste() const wxOVERRIDE { return true; }
virtual void Cut(); virtual void Cut() wxOVERRIDE;
virtual void Copy(); virtual void Copy() wxOVERRIDE;
virtual void Paste(); virtual void Paste() wxOVERRIDE;
//Editing functions //Editing functions
virtual void SetEditable(bool enable = true); virtual void SetEditable(bool enable = true) wxOVERRIDE;
virtual bool IsEditable() const; virtual bool IsEditable() const wxOVERRIDE;
//Selection //Selection
virtual void DeleteSelection(); virtual void DeleteSelection() wxOVERRIDE;
virtual bool HasSelection() const; virtual bool HasSelection() const wxOVERRIDE;
virtual void SelectAll(); virtual void SelectAll() wxOVERRIDE;
virtual wxString GetSelectedText() const; virtual wxString GetSelectedText() const wxOVERRIDE;
virtual wxString GetSelectedSource() const; virtual wxString GetSelectedSource() const wxOVERRIDE;
virtual void ClearSelection(); virtual void ClearSelection() wxOVERRIDE;
void RunScript(const wxString& javascript); void RunScript(const wxString& javascript) wxOVERRIDE;
//Virtual Filesystem Support //Virtual Filesystem Support
virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler); virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler) wxOVERRIDE;
virtual void* GetNativeBackend() const { return m_webView; } virtual void* GetNativeBackend() const wxOVERRIDE { return m_webView; }
// ---- methods not from the parent (common) interface // ---- methods not from the parent (common) interface
bool CanGetPageSource() const; bool CanGetPageSource() const;
@@ -134,9 +134,9 @@ public:
void SetWebkitZoom(float zoom); void SetWebkitZoom(float zoom);
// don't hide base class virtuals // don't hide base class virtuals
virtual void SetScrollPos( int orient, int pos, bool refresh = true ) virtual void SetScrollPos( int orient, int pos, bool refresh = true ) wxOVERRIDE
{ return wxControl::SetScrollPos(orient, pos, refresh); } { return wxControl::SetScrollPos(orient, pos, refresh); }
virtual int GetScrollPos( int orient ) const virtual int GetScrollPos( int orient ) const wxOVERRIDE
{ return wxControl::GetScrollPos(orient); } { return wxControl::GetScrollPos(orient); }
//we need to resize the webview when the control size changes //we need to resize the webview when the control size changes
@@ -148,10 +148,10 @@ public:
bool m_nextNavigationIsNewWindow; bool m_nextNavigationIsNewWindow;
protected: protected:
virtual void DoSetPage(const wxString& html, const wxString& baseUrl); virtual void DoSetPage(const wxString& html, const wxString& baseUrl) wxOVERRIDE;
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
void MacVisibilityChanged(); void MacVisibilityChanged() wxOVERRIDE;
private: private:
wxWindow *m_parent; wxWindow *m_parent;

126
include/wx/osx/window.h
View File

@@ -54,81 +54,81 @@ public:
long style = 0, long style = 0,
const wxString& name = wxPanelNameStr ); const wxString& name = wxPanelNameStr );
virtual void SendSizeEvent(int flags = 0); virtual void SendSizeEvent(int flags = 0) wxOVERRIDE;
// implement base class pure virtuals // implement base class pure virtuals
virtual void SetLabel( const wxString& label ); virtual void SetLabel( const wxString& label ) wxOVERRIDE;
virtual wxString GetLabel() const; virtual wxString GetLabel() const wxOVERRIDE;
virtual void Raise(); virtual void Raise() wxOVERRIDE;
virtual void Lower(); virtual void Lower() wxOVERRIDE;
virtual bool Show( bool show = true ); virtual bool Show( bool show = true ) wxOVERRIDE;
virtual bool ShowWithEffect(wxShowEffect effect, virtual bool ShowWithEffect(wxShowEffect effect,
unsigned timeout = 0) unsigned timeout = 0) wxOVERRIDE
{ {
return OSXShowWithEffect(true, effect, timeout); return OSXShowWithEffect(true, effect, timeout);
} }
virtual bool HideWithEffect(wxShowEffect effect, virtual bool HideWithEffect(wxShowEffect effect,
unsigned timeout = 0) unsigned timeout = 0) wxOVERRIDE
{ {
return OSXShowWithEffect(false, effect, timeout); return OSXShowWithEffect(false, effect, timeout);
} }
virtual bool IsShownOnScreen() const; virtual bool IsShownOnScreen() const wxOVERRIDE;
virtual void SetFocus(); virtual void SetFocus() wxOVERRIDE;
virtual void WarpPointer( int x, int y ); virtual void WarpPointer( int x, int y ) wxOVERRIDE;
virtual void Refresh( bool eraseBackground = true, virtual void Refresh( bool eraseBackground = true,
const wxRect *rect = NULL ); const wxRect *rect = NULL ) wxOVERRIDE;
virtual void Update() ; virtual void Update() wxOVERRIDE;
virtual void ClearBackground(); virtual void ClearBackground() wxOVERRIDE;
virtual bool SetCursor( const wxCursor &cursor ); virtual bool SetCursor( const wxCursor &cursor ) wxOVERRIDE;
virtual bool SetFont( const wxFont &font ); virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
virtual bool SetBackgroundColour( const wxColour &colour ); virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE;
virtual bool SetForegroundColour( const wxColour &colour ); virtual bool SetForegroundColour( const wxColour &colour ) wxOVERRIDE;
virtual bool SetBackgroundStyle(wxBackgroundStyle style); virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE;
virtual int GetCharHeight() const; virtual int GetCharHeight() const wxOVERRIDE;
virtual int GetCharWidth() const; virtual int GetCharWidth() const wxOVERRIDE;
public: public:
virtual void SetScrollbar( int orient, int pos, int thumbVisible, virtual void SetScrollbar( int orient, int pos, int thumbVisible,
int range, bool refresh = true ); int range, bool refresh = true ) wxOVERRIDE;
virtual void SetScrollPos( int orient, int pos, bool refresh = true ); virtual void SetScrollPos( int orient, int pos, bool refresh = true ) wxOVERRIDE;
virtual int GetScrollPos( int orient ) const; virtual int GetScrollPos( int orient ) const wxOVERRIDE;
virtual int GetScrollThumb( int orient ) const; virtual int GetScrollThumb( int orient ) const wxOVERRIDE;
virtual int GetScrollRange( int orient ) const; virtual int GetScrollRange( int orient ) const wxOVERRIDE;
virtual void ScrollWindow( int dx, int dy, virtual void ScrollWindow( int dx, int dy,
const wxRect* rect = NULL ); const wxRect* rect = NULL ) wxOVERRIDE;
virtual void AlwaysShowScrollbars(bool horz = true, bool vert = true); virtual void AlwaysShowScrollbars(bool horz = true, bool vert = true) wxOVERRIDE;
virtual bool IsScrollbarAlwaysShown(int orient) const virtual bool IsScrollbarAlwaysShown(int orient) const wxOVERRIDE
{ {
return orient == wxHORIZONTAL ? m_hScrollBarAlwaysShown return orient == wxHORIZONTAL ? m_hScrollBarAlwaysShown
: m_vScrollBarAlwaysShown; : m_vScrollBarAlwaysShown;
} }
virtual bool Reparent( wxWindowBase *newParent ); virtual bool Reparent( wxWindowBase *newParent ) wxOVERRIDE;
#if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON #if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON
// hot keys (system wide accelerators) // hot keys (system wide accelerators)
// ----------------------------------- // -----------------------------------
virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode); virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) wxOVERRIDE;
virtual bool UnregisterHotKey(int hotkeyId); virtual bool UnregisterHotKey(int hotkeyId) wxOVERRIDE;
#endif // wxUSE_HOTKEY #endif // wxUSE_HOTKEY
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
virtual void SetDropTarget( wxDropTarget *dropTarget ); virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE;
#endif #endif
// Accept files for dragging // Accept files for dragging
virtual void DragAcceptFiles( bool accept ); virtual void DragAcceptFiles( bool accept ) wxOVERRIDE;
// implementation from now on // implementation from now on
// -------------------------- // --------------------------
@@ -144,11 +144,11 @@ public:
// simple accessors // simple accessors
// ---------------- // ----------------
virtual WXWidget GetHandle() const; virtual WXWidget GetHandle() const wxOVERRIDE;
virtual bool SetTransparent(wxByte alpha); virtual bool SetTransparent(wxByte alpha) wxOVERRIDE;
virtual bool CanSetTransparent(); virtual bool CanSetTransparent() wxOVERRIDE;
virtual wxByte GetTransparent() const ; virtual wxByte GetTransparent() const;
// event handlers // event handlers
// -------------- // --------------
@@ -157,17 +157,17 @@ public:
void MacOnScroll( wxScrollEvent&event ); void MacOnScroll( wxScrollEvent&event );
virtual bool AcceptsFocus() const; virtual bool AcceptsFocus() const wxOVERRIDE;
virtual bool IsDoubleBuffered() const { return true; } virtual bool IsDoubleBuffered() const wxOVERRIDE { return true; }
public: public:
static long MacRemoveBordersFromStyle( long style ) ; static long MacRemoveBordersFromStyle( long style );
public: public:
// For implementation purposes: // For implementation purposes:
// sometimes decorations make the client area smaller // sometimes decorations make the client area smaller
virtual wxPoint GetClientAreaOrigin() const; virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
wxWindowMac *FindItem(long id) const; wxWindowMac *FindItem(long id) const;
wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const; wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
@@ -175,7 +175,7 @@ public:
virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;
// this should not be overridden in classes above wxWindowMac // this should not be overridden in classes above wxWindowMac
// because it is called from its destructor via DeleteChildren // because it is called from its destructor via DeleteChildren
virtual void RemoveChild( wxWindowBase *child ); virtual void RemoveChild( wxWindowBase *child ) wxOVERRIDE;
virtual bool MacDoRedraw( long time ) ; virtual bool MacDoRedraw( long time ) ;
virtual void MacPaintChildrenBorders(); virtual void MacPaintChildrenBorders();
@@ -236,7 +236,7 @@ public:
virtual bool MacClipGrandChildren() const { return false ; } virtual bool MacClipGrandChildren() const { return false ; }
bool MacIsWindowScrollbar( const wxWindow* sb ) const bool MacIsWindowScrollbar( const wxWindow* sb ) const
{ return ((wxWindow*)m_hScrollBar == sb || (wxWindow*)m_vScrollBar == sb) ; } { return ((wxWindow*)m_hScrollBar == sb || (wxWindow*)m_vScrollBar == sb) ; }
virtual bool IsClientAreaChild(const wxWindow *child) const virtual bool IsClientAreaChild(const wxWindow *child) const wxOVERRIDE
{ {
return !MacIsWindowScrollbar(child) && !((wxWindow*)m_growBox==child) && return !MacIsWindowScrollbar(child) && !((wxWindow*)m_growBox==child) &&
wxWindowBase::IsClientAreaChild(child); wxWindowBase::IsClientAreaChild(child);
@@ -291,7 +291,7 @@ public:
bool IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; } bool IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; }
double GetContentScaleFactor() const ; double GetContentScaleFactor() const wxOVERRIDE;
// internal response to size events // internal response to size events
virtual void MacOnInternalSize() {} virtual void MacOnInternalSize() {}
@@ -346,40 +346,40 @@ protected:
int *x, int *y, int *x, int *y,
int *descent = NULL, int *descent = NULL,
int *externalLeading = NULL, int *externalLeading = NULL,
const wxFont *theFont = NULL ) const; const wxFont *theFont = NULL ) const wxOVERRIDE;
virtual void DoEnable( bool enable ); virtual void DoEnable( bool enable ) wxOVERRIDE;
#if wxUSE_MENUS #if wxUSE_MENUS
virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) wxOVERRIDE;
#endif #endif
virtual void DoFreeze(); virtual void DoFreeze() wxOVERRIDE;
virtual void DoThaw(); virtual void DoThaw() wxOVERRIDE;
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual wxSize DoGetSizeFromClientSize( const wxSize & size ) const; virtual wxSize DoGetSizeFromClientSize( const wxSize & size ) const;
virtual void DoClientToScreen( int *x, int *y ) const; virtual void DoClientToScreen( int *x, int *y ) const wxOVERRIDE;
virtual void DoScreenToClient( int *x, int *y ) const; virtual void DoScreenToClient( int *x, int *y ) const wxOVERRIDE;
virtual void DoGetPosition( int *x, int *y ) const; virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE;
virtual void DoGetSize( int *width, int *height ) const; virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
virtual void DoGetClientSize( int *width, int *height ) const; virtual void DoGetClientSize( int *width, int *height ) const wxOVERRIDE;
virtual void DoSetSize(int x, int y, virtual void DoSetSize(int x, int y,
int width, int height, int width, int height,
int sizeFlags = wxSIZE_AUTO); int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
virtual void DoSetClientSize(int width, int height); virtual void DoSetClientSize(int width, int height) wxOVERRIDE;
virtual void DoCaptureMouse(); virtual void DoCaptureMouse() wxOVERRIDE;
virtual void DoReleaseMouse(); virtual void DoReleaseMouse() wxOVERRIDE;
// move the window to the specified location and resize it: this is called // move the window to the specified location and resize it: this is called
// from both DoSetSize() and DoSetClientSize() and would usually just call // from both DoSetSize() and DoSetClientSize() and would usually just call
// ::MoveWindow() except for composite controls which will want to arrange // ::MoveWindow() except for composite controls which will want to arrange
// themselves inside the given rectangle // themselves inside the given rectangle
virtual void DoMoveWindow( int x, int y, int width, int height ); virtual void DoMoveWindow( int x, int y, int width, int height ) wxOVERRIDE;
virtual void DoSetWindowVariant( wxWindowVariant variant ); virtual void DoSetWindowVariant( wxWindowVariant variant ) wxOVERRIDE;
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
virtual void DoSetToolTip( wxToolTip *tip ); virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE;
#endif #endif
// common part of Show/HideWithEffect() // common part of Show/HideWithEffect()

2
include/wx/preferences.h
View File

@@ -81,7 +81,7 @@ public:
virtual wxString GetName() const wxOVERRIDE; virtual wxString GetName() const wxOVERRIDE;
#ifdef __WXOSX_COCOA__ #ifdef __WXOSX_COCOA__
virtual wxBitmap GetLargeIcon() const; virtual wxBitmap GetLargeIcon() const wxOVERRIDE;
#endif #endif
private: private:

84
include/wx/stc/stc.h
View File

@@ -2794,14 +2794,14 @@ public:
int GetStyleAt(int pos) const; int GetStyleAt(int pos) const;
// Redoes the next action on the undo history. // Redoes the next action on the undo history.
void Redo(); void Redo() wxOVERRIDE;
// Choose between collecting actions into the undo // Choose between collecting actions into the undo
// history and discarding them. // history and discarding them.
void SetUndoCollection(bool collectUndo); void SetUndoCollection(bool collectUndo);
// Select all the text in the document. // Select all the text in the document.
void SelectAll(); void SelectAll() wxOVERRIDE;
// Remember the current position in the undo history as the position // Remember the current position in the undo history as the position
// at which the document was saved. // at which the document was saved.
@@ -2811,7 +2811,7 @@ public:
wxMemoryBuffer GetStyledText(int startPos, int endPos); wxMemoryBuffer GetStyledText(int startPos, int endPos);
// Are there any redoable actions in the undo history? // Are there any redoable actions in the undo history?
bool CanRedo() const; bool CanRedo() const wxOVERRIDE;
// Retrieve the line number at which a particular marker is located. // Retrieve the line number at which a particular marker is located.
int MarkerLineFromHandle(int handle); int MarkerLineFromHandle(int handle);
@@ -3462,28 +3462,28 @@ public:
void SetReadOnly(bool readOnly); void SetReadOnly(bool readOnly);
// Will a paste succeed? // Will a paste succeed?
bool CanPaste() const; bool CanPaste() const wxOVERRIDE;
// Are there any undoable actions in the undo history? // Are there any undoable actions in the undo history?
bool CanUndo() const; bool CanUndo() const wxOVERRIDE;
// Delete the undo history. // Delete the undo history.
void EmptyUndoBuffer(); void EmptyUndoBuffer();
// Undo one action in the undo history. // Undo one action in the undo history.
void Undo(); void Undo() wxOVERRIDE;
// Cut the selection to the clipboard. // Cut the selection to the clipboard.
void Cut(); void Cut() wxOVERRIDE;
// Copy the selection to the clipboard. // Copy the selection to the clipboard.
void Copy(); void Copy() wxOVERRIDE;
// Paste the contents of the clipboard into the document replacing the selection. // Paste the contents of the clipboard into the document replacing the selection.
void Paste(); void Paste() wxOVERRIDE;
// Clear the selection. // Clear the selection.
void Clear(); void Clear() wxOVERRIDE;
// Replace the contents of the document with the argument text. // Replace the contents of the document with the argument text.
void SetText(const wxString& text); void SetText(const wxString& text);
@@ -3751,7 +3751,7 @@ public:
bool GetUseVerticalScrollBar() const; bool GetUseVerticalScrollBar() const;
// Append a string to the end of the document without changing the selection. // Append a string to the end of the document without changing the selection.
void AppendText(const wxString& text); void AppendText(const wxString& text) wxOVERRIDE;
// Is drawing done in two phases with backgrounds drawn before foregrounds? // Is drawing done in two phases with backgrounds drawn before foregrounds?
bool GetTwoPhaseDraw() const; bool GetTwoPhaseDraw() const;
@@ -4957,16 +4957,16 @@ public:
// implement wxTextEntryBase pure virtual methods // implement wxTextEntryBase pure virtual methods
// ---------------------------------------------- // ----------------------------------------------
virtual void WriteText(const wxString& text) virtual void WriteText(const wxString& text) wxOVERRIDE
{ {
ReplaceSelection(text); ReplaceSelection(text);
} }
virtual void Remove(long from, long to) virtual void Remove(long from, long to) wxOVERRIDE
{ {
Replace(from, to, ""); Replace(from, to, "");
} }
virtual void Replace(long from, long to, const wxString& text) virtual void Replace(long from, long to, const wxString& text) wxOVERRIDE
{ {
SetTargetStart((int)from); SetTargetStart((int)from);
SetTargetEnd((int)to); SetTargetEnd((int)to);
@@ -4988,14 +4988,14 @@ public:
*/ */
virtual void SetInsertionPoint(long pos) virtual void SetInsertionPoint(long pos) wxOVERRIDE
{ {
SetCurrentPos(int(pos == -1 ? GetLastPosition() : pos)); SetCurrentPos(int(pos == -1 ? GetLastPosition() : pos));
} }
virtual long GetInsertionPoint() const { return GetCurrentPos(); } virtual long GetInsertionPoint() const wxOVERRIDE { return GetCurrentPos(); }
virtual long GetLastPosition() const { return GetTextLength(); } virtual long GetLastPosition() const wxOVERRIDE { return GetTextLength(); }
virtual void SetSelection(long from, long to) virtual void SetSelection(long from, long to) wxOVERRIDE
{ {
if ( from == -1 && to == -1 ) if ( from == -1 && to == -1 )
{ {
@@ -5008,7 +5008,7 @@ public:
} }
} }
virtual void SelectNone() virtual void SelectNone() wxOVERRIDE
{ {
ClearSelections(); ClearSelections();
} }
@@ -5016,7 +5016,7 @@ public:
#ifdef SWIG #ifdef SWIG
void GetSelection(long* OUTPUT, long* OUTPUT) const; void GetSelection(long* OUTPUT, long* OUTPUT) const;
#else #else
virtual void GetSelection(long *from, long *to) const virtual void GetSelection(long *from, long *to) const wxOVERRIDE
{ {
if ( from ) if ( from )
*from = GetSelectionStart(); *from = GetSelectionStart();
@@ -5036,14 +5036,14 @@ public:
} }
#endif #endif
virtual bool IsEditable() const { return !GetReadOnly(); } virtual bool IsEditable() const wxOVERRIDE { return !GetReadOnly(); }
virtual void SetEditable(bool editable) { SetReadOnly(!editable); } virtual void SetEditable(bool editable) wxOVERRIDE { SetReadOnly(!editable); }
// implement wxTextAreaBase pure virtual methods // implement wxTextAreaBase pure virtual methods
// --------------------------------------------- // ---------------------------------------------
virtual int GetLineLength(long lineNo) const { return static_cast<int>(GetLineText(lineNo).length()); } virtual int GetLineLength(long lineNo) const wxOVERRIDE { return static_cast<int>(GetLineText(lineNo).length()); }
virtual wxString GetLineText(long lineNo) const virtual wxString GetLineText(long lineNo) const wxOVERRIDE
{ {
wxString text = GetLine(static_cast<int>(lineNo)); wxString text = GetLine(static_cast<int>(lineNo));
size_t lastNewLine = text.find_last_not_of(wxS("\r\n")); size_t lastNewLine = text.find_last_not_of(wxS("\r\n"));
@@ -5054,42 +5054,42 @@ public:
text.clear(); text.clear();
return text; return text;
} }
virtual int GetNumberOfLines() const { return GetLineCount(); } virtual int GetNumberOfLines() const wxOVERRIDE { return GetLineCount(); }
virtual bool IsModified() const { return GetModify(); } virtual bool IsModified() const wxOVERRIDE { return GetModify(); }
virtual void MarkDirty() { wxFAIL_MSG("not implemented"); } virtual void MarkDirty() wxOVERRIDE { wxFAIL_MSG("not implemented"); }
virtual void DiscardEdits() { SetSavePoint(); } virtual void DiscardEdits() wxOVERRIDE { SetSavePoint(); }
virtual bool SetStyle(long WXUNUSED(start), long WXUNUSED(end), virtual bool SetStyle(long WXUNUSED(start), long WXUNUSED(end),
const wxTextAttr& WXUNUSED(style)) const wxTextAttr& WXUNUSED(style)) wxOVERRIDE
{ {
wxFAIL_MSG("not implemented"); wxFAIL_MSG("not implemented");
return false; return false;
} }
virtual bool GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style)) virtual bool GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style)) wxOVERRIDE
{ {
wxFAIL_MSG("not implemented"); wxFAIL_MSG("not implemented");
return false; return false;
} }
virtual bool SetDefaultStyle(const wxTextAttr& WXUNUSED(style)) virtual bool SetDefaultStyle(const wxTextAttr& WXUNUSED(style)) wxOVERRIDE
{ {
wxFAIL_MSG("not implemented"); wxFAIL_MSG("not implemented");
return false; return false;
} }
virtual long XYToPosition(long x, long y) const virtual long XYToPosition(long x, long y) const wxOVERRIDE
{ {
long pos = PositionFromLine((int)y); long pos = PositionFromLine((int)y);
pos += x; pos += x;
return pos; return pos;
} }
virtual bool PositionToXY(long pos, long *x, long *y) const virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE
{ {
int l = LineFromPosition((int)pos); int l = LineFromPosition((int)pos);
if ( l == -1 ) if ( l == -1 )
@@ -5104,11 +5104,11 @@ public:
return true; return true;
} }
virtual void ShowPosition(long pos) { GotoPos((int)pos); } virtual void ShowPosition(long pos) wxOVERRIDE { GotoPos((int)pos); }
using wxWindow::HitTest; using wxWindow::HitTest;
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE
{ {
const long l = PositionFromPoint(pt); const long l = PositionFromPoint(pt);
if ( l == -1 ) if ( l == -1 )
@@ -5123,7 +5123,7 @@ public:
// just unhide it // just unhide it
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
wxTextCoord *col, wxTextCoord *col,
wxTextCoord *row) const wxTextCoord *row) const wxOVERRIDE
{ {
return wxTextAreaBase::HitTest(pt, col, row); return wxTextAreaBase::HitTest(pt, col, row);
} }
@@ -5131,13 +5131,13 @@ public:
static wxVersionInfo GetLibraryVersionInfo(); static wxVersionInfo GetLibraryVersionInfo();
protected: protected:
virtual void DoSetValue(const wxString& value, int flags); virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE;
virtual wxString DoGetValue() const { return GetText(); } virtual wxString DoGetValue() const wxOVERRIDE { return GetText(); }
virtual wxWindow *GetEditableWindow() { return this; } virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }
#ifndef SWIG #ifndef SWIG
virtual bool DoLoadFile(const wxString& file, int fileType); virtual bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE;
virtual bool DoSaveFile(const wxString& file, int fileType); virtual bool DoSaveFile(const wxString& file, int fileType) wxOVERRIDE;
// Event handlers // Event handlers
void OnPaint(wxPaintEvent& evt); void OnPaint(wxPaintEvent& evt);
@@ -5161,7 +5161,7 @@ protected:
void OnListBox(wxCommandEvent& evt); void OnListBox(wxCommandEvent& evt);
void OnIdle(wxIdleEvent& evt); void OnIdle(wxIdleEvent& evt);
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
// Turn notifications from Scintilla into events // Turn notifications from Scintilla into events
void NotifyChange(); void NotifyChange();

4
include/wx/unix/apptrait.h
View File

@@ -59,7 +59,7 @@ public:
#endif #endif
#if defined(__WXMAC__) && wxUSE_STDPATHS #if defined(__WXMAC__) && wxUSE_STDPATHS
virtual wxStandardPaths& GetStandardPaths(); virtual wxStandardPaths& GetStandardPaths() wxOVERRIDE;
#endif #endif
virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const wxOVERRIDE; virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const wxOVERRIDE;
@@ -76,7 +76,7 @@ public:
#if wxUSE_SOCKETS #if wxUSE_SOCKETS
#ifdef wxHAS_GUI_SOCKET_MANAGER #ifdef wxHAS_GUI_SOCKET_MANAGER
virtual wxSocketManager *GetSocketManager(); virtual wxSocketManager *GetSocketManager() wxOVERRIDE;
#endif #endif
#ifdef wxHAS_GUI_FDIOMANAGER #ifdef wxHAS_GUI_FDIOMANAGER

6
include/wx/vscroll.h
View File

@@ -727,7 +727,7 @@ public:
#ifdef __WXMAC__ #ifdef __WXMAC__
protected: protected:
virtual void UpdateMacScrollWindow() { Update(); } virtual void UpdateMacScrollWindow() wxOVERRIDE { Update(); }
#endif // __WXMAC__ #endif // __WXMAC__
private: private:
@@ -794,7 +794,7 @@ public:
#ifdef __WXMAC__ #ifdef __WXMAC__
protected: protected:
virtual void UpdateMacScrollWindow() { Update(); } virtual void UpdateMacScrollWindow() wxOVERRIDE { Update(); }
#endif // __WXMAC__ #endif // __WXMAC__
private: private:
@@ -859,7 +859,7 @@ public:
#ifdef __WXMAC__ #ifdef __WXMAC__
protected: protected:
virtual void UpdateMacScrollWindow() { Update(); } virtual void UpdateMacScrollWindow() wxOVERRIDE { Update(); }
#endif // __WXMAC__ #endif // __WXMAC__
private: private:

6
src/osx/carbon/renderer.cpp
View File

@@ -104,9 +104,9 @@ public:
virtual void DrawCollapseButton(wxWindow *win, virtual void DrawCollapseButton(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0); int flags = 0) wxOVERRIDE;
virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc); virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) wxOVERRIDE;
virtual void DrawItemSelectionRect(wxWindow *win, virtual void DrawItemSelectionRect(wxWindow *win,
wxDC& dc, wxDC& dc,
@@ -136,7 +136,7 @@ public:
const wxRect& rect, const wxRect& rect,
int value, int value,
int max, int max,
int flags = 0); int flags = 0) wxOVERRIDE;
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE; virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE;

2
src/osx/cocoa/datetimectrl.mm
View File

@@ -128,7 +128,7 @@ public:
} }
} }
virtual void Enable(bool enable = true) virtual void Enable(bool enable = true) wxOVERRIDE
{ {
wxNSDatePicker* const nsdatePicker = View(); wxNSDatePicker* const nsdatePicker = View();