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

More use of wxOVERRIDE

Browse Source
This commit is contained in:
Paul Cornett
2019-04-05 11:08:53 -07:00
parent 794c1374b8
commit 9511ab08f1
116 changed files with 874 additions and 873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/generic/private/textmeasure.h
View File

@@ -27,11 +27,11 @@ protected:
wxCoord *width, wxCoord *width,
wxCoord *height, wxCoord *height,
wxCoord *descent = NULL, wxCoord *descent = NULL,
wxCoord *externalLeading = NULL); wxCoord *externalLeading = NULL) wxOVERRIDE;
virtual bool DoGetPartialTextExtents(const wxString& text, virtual bool DoGetPartialTextExtents(const wxString& text,
wxArrayInt& widths, wxArrayInt& widths,
double scaleX); double scaleX) wxOVERRIDE;
wxDECLARE_NO_COPY_CLASS(wxTextMeasure); wxDECLARE_NO_COPY_CLASS(wxTextMeasure);
}; };

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

@@ -128,13 +128,13 @@ public:
virtual ~wxBitmap() {} virtual ~wxBitmap() {}
wxImage ConvertToImage() const; wxImage ConvertToImage() const wxOVERRIDE;
// get the given part of bitmap // get the given part of bitmap
wxBitmap GetSubBitmap( const wxRect& rect ) const; wxBitmap GetSubBitmap( const wxRect& rect ) const wxOVERRIDE;
virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE;
virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE
{ return Create(sz.GetWidth(), sz.GetHeight(), depth); } { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1); virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
@@ -146,7 +146,7 @@ public:
bool Create(int width, int height, const wxDC& dc); bool Create(int width, int height, const wxDC& dc);
// Create a bitmap with a scale factor, width and height are multiplied with that factor // Create a bitmap with a scale factor, width and height are multiplied with that factor
bool CreateScaled(int logwidth, int logheight, int depth, double logicalScale); bool CreateScaled(int logwidth, int logheight, int depth, double logicalScale) wxOVERRIDE;
// virtual bool Create( WXHICON icon) ; // virtual bool Create( WXHICON icon) ;
virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
@@ -159,28 +159,28 @@ public:
{ return (wxBitmapRefData *)m_refData; } { return (wxBitmapRefData *)m_refData; }
// copies the contents and mask of the given (colour) icon to the bitmap // copies the contents and mask of the given (colour) icon to the bitmap
virtual bool CopyFromIcon(const wxIcon& icon); virtual bool CopyFromIcon(const wxIcon& icon) wxOVERRIDE;
int GetWidth() const; int GetWidth() const wxOVERRIDE;
int GetHeight() const; int GetHeight() const wxOVERRIDE;
int GetDepth() const; int GetDepth() const wxOVERRIDE;
#if WXWIN_COMPATIBILITY_3_0 #if WXWIN_COMPATIBILITY_3_0
wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies") wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies")
void SetWidth(int width); void SetWidth(int width) wxOVERRIDE;
wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies") wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies")
void SetHeight(int height); void SetHeight(int height) wxOVERRIDE;
wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies") wxDEPRECATED_MSG("this value is determined during creation, this method could lead to inconsistencies")
void SetDepth(int depth); void SetDepth(int depth) wxOVERRIDE;
#endif #endif
#if wxUSE_PALETTE #if wxUSE_PALETTE
wxPalette* GetPalette() const; wxPalette* GetPalette() const wxOVERRIDE;
void SetPalette(const wxPalette& palette); void SetPalette(const wxPalette& palette) wxOVERRIDE;
#endif // wxUSE_PALETTE #endif // wxUSE_PALETTE
wxMask *GetMask() const; wxMask *GetMask() const wxOVERRIDE;
void SetMask(wxMask *mask) ; void SetMask(wxMask *mask) wxOVERRIDE;
static void InitStandardHandlers(); static void InitStandardHandlers();
@@ -233,14 +233,14 @@ public:
void EndRawAccess(); void EndRawAccess();
#endif #endif
double GetScaleFactor() const; double GetScaleFactor() const wxOVERRIDE;
void SetSelectedInto(wxDC *dc); void SetSelectedInto(wxDC *dc);
wxDC *GetSelectedInto() const; wxDC *GetSelectedInto() const;
protected: protected:
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
}; };
#endif // _WX_BITMAP_H_ #endif // _WX_BITMAP_H_

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

@@ -39,7 +39,7 @@ public:
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxBitmapButton); wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
}; };

18
include/wx/osx/brush.h
View File

@@ -26,17 +26,17 @@ public:
wxBrush(const wxBitmap& stipple); wxBrush(const wxBitmap& stipple);
virtual ~wxBrush(); virtual ~wxBrush();
virtual void SetColour(const wxColour& col) ; virtual void SetColour(const wxColour& col) wxOVERRIDE;
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ; virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE;
virtual void SetStyle(wxBrushStyle style) ; virtual void SetStyle(wxBrushStyle style) wxOVERRIDE;
virtual void SetStipple(const wxBitmap& stipple) ; virtual void SetStipple(const wxBitmap& stipple) wxOVERRIDE;
bool operator==(const wxBrush& brush) const; bool operator==(const wxBrush& brush) const;
bool operator!=(const wxBrush& brush) const { return !(*this == brush); } bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
wxColour GetColour() const; wxColour GetColour() const wxOVERRIDE;
wxBrushStyle GetStyle() const ; wxBrushStyle GetStyle() const wxOVERRIDE;
wxBitmap *GetStipple() const ; wxBitmap *GetStipple() const wxOVERRIDE;
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
@@ -46,8 +46,8 @@ public:
void SetStyle(int style) { SetStyle((wxBrushStyle)style); } void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
protected: protected:
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS(wxBrush); wxDECLARE_DYNAMIC_CLASS(wxBrush);

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

@@ -40,13 +40,13 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr); const wxString& name = wxButtonNameStr);
virtual void SetLabel(const wxString& label); virtual void SetLabel(const wxString& label) wxOVERRIDE;
virtual wxWindow *SetDefault(); virtual wxWindow *SetDefault() wxOVERRIDE;
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;
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
void OSXUpdateAfterLabelChange(const wxString& label); void OSXUpdateAfterLabelChange(const wxString& label);

14
include/wx/osx/carbon/private/print.h
View File

@@ -23,13 +23,13 @@ public:
wxOSXPrintData(); wxOSXPrintData();
virtual ~wxOSXPrintData(); virtual ~wxOSXPrintData();
virtual bool TransferTo( wxPrintData &data ); virtual bool TransferTo( wxPrintData &data ) wxOVERRIDE;
virtual bool TransferFrom( const wxPrintData &data ); virtual bool TransferFrom( const wxPrintData &data ) wxOVERRIDE;
virtual bool IsOk() const ; virtual bool IsOk() const wxOVERRIDE;
virtual void TransferFrom( const wxPageSetupDialogData * ); virtual void TransferFrom( const wxPageSetupDialogData * ) wxOVERRIDE;
virtual void TransferTo( wxPageSetupDialogData * ); virtual void TransferTo( wxPageSetupDialogData * ) wxOVERRIDE;
virtual void TransferFrom( const wxPrintDialogData * ); virtual void TransferFrom( const wxPrintDialogData * );
virtual void TransferTo( wxPrintDialogData * ); virtual void TransferTo( wxPrintDialogData * );
@@ -69,8 +69,8 @@ public:
WX_NSPrintInfo GetNSPrintInfo() { return m_macPrintInfo; } WX_NSPrintInfo GetNSPrintInfo() { return m_macPrintInfo; }
protected: protected:
virtual void UpdateFromPMState(); virtual void UpdateFromPMState() wxOVERRIDE;
virtual void UpdateToPMState(); virtual void UpdateToPMState() wxOVERRIDE;
WX_NSPrintInfo m_macPrintInfo; WX_NSPrintInfo m_macPrintInfo;
private: private:

22
include/wx/osx/carbon/region.h
View File

@@ -37,24 +37,24 @@ public:
virtual ~wxRegion(); virtual ~wxRegion();
// wxRegionBase methods // wxRegionBase methods
virtual void Clear(); virtual void Clear() wxOVERRIDE;
virtual bool IsEmpty() const; virtual bool IsEmpty() const wxOVERRIDE;
// Internal // Internal
WXHRGN GetWXHRGN() const ; WXHRGN GetWXHRGN() const ;
protected: protected:
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
virtual bool DoIsEqual(const wxRegion& region) const; virtual bool DoIsEqual(const wxRegion& region) const wxOVERRIDE;
virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const wxOVERRIDE;
virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const; virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const wxOVERRIDE;
virtual wxRegionContain DoContainsRect(const wxRect& rect) const; virtual wxRegionContain DoContainsRect(const wxRect& rect) const wxOVERRIDE;
virtual bool DoOffset(wxCoord x, wxCoord y); virtual bool DoOffset(wxCoord x, wxCoord y) wxOVERRIDE;
virtual bool DoCombine(const wxRegion& region, wxRegionOp op); virtual bool DoCombine(const wxRegion& region, wxRegionOp op) wxOVERRIDE;
virtual bool DoUnionWithRect(const wxRect& rect); virtual bool DoUnionWithRect(const wxRect& rect) wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS(wxRegion); wxDECLARE_DYNAMIC_CLASS(wxRegion);

18
include/wx/osx/checkbox.h
View File

@@ -30,17 +30,17 @@ public:
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr); const wxString& name = wxCheckBoxNameStr);
virtual void SetValue(bool); virtual void SetValue(bool) wxOVERRIDE;
virtual bool GetValue() const; virtual bool GetValue() const wxOVERRIDE;
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:
void DoSet3StateValue(wxCheckBoxState val); void DoSet3StateValue(wxCheckBoxState val) wxOVERRIDE;
virtual wxCheckBoxState DoGet3StateValue() const; virtual wxCheckBoxState DoGet3StateValue() const wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxCheckBox); wxDECLARE_DYNAMIC_CLASS(wxCheckBox);
}; };
@@ -70,10 +70,10 @@ public:
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr); const wxString& name = wxCheckBoxNameStr);
virtual void SetValue(bool); virtual void SetValue(bool) wxOVERRIDE;
virtual bool GetValue() const; virtual bool GetValue() const wxOVERRIDE;
virtual void SetLabel(const wxBitmap *bitmap); virtual void SetLabel(const wxBitmap *bitmap);
virtual void SetLabel( const wxString & WXUNUSED(name) ) {} virtual void SetLabel( const wxString & WXUNUSED(name) ) wxOVERRIDE {}
wxDECLARE_DYNAMIC_CLASS(wxBitmapCheckBox); wxDECLARE_DYNAMIC_CLASS(wxBitmapCheckBox);
}; };

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

@@ -66,28 +66,28 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr); const wxString& name = wxChoiceNameStr);
virtual unsigned int GetCount() const ; virtual unsigned int GetCount() const wxOVERRIDE;
virtual int GetSelection() const ; virtual int GetSelection() const wxOVERRIDE;
virtual void SetSelection(int n); virtual void SetSelection(int n) wxOVERRIDE;
virtual int FindString(const wxString& s, bool bCase = false) const; virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE;
virtual wxString GetString(unsigned int n) const ; virtual wxString GetString(unsigned int n) const wxOVERRIDE;
virtual void SetString(unsigned int pos, const wxString& s); virtual void SetString(unsigned int pos, const wxString& s) 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 void DoDeleteOneItem(unsigned int n); virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
virtual void DoClear(); virtual void DoClear() wxOVERRIDE;
virtual wxSize DoGetBestSize() const ; virtual wxSize DoGetBestSize() const wxOVERRIDE;
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;
wxArrayString m_strings; wxArrayString m_strings;
wxChoiceDataArray m_datas ; wxChoiceDataArray m_datas ;

18
include/wx/osx/clipbrd.h
View File

@@ -26,33 +26,33 @@ public:
virtual ~wxClipboard(); virtual ~wxClipboard();
// open the clipboard before SetData() and GetData() // open the clipboard before SetData() and GetData()
virtual bool Open(); virtual bool Open() wxOVERRIDE;
// close the clipboard after SetData() and GetData() // close the clipboard after SetData() and GetData()
virtual void Close(); virtual void Close() wxOVERRIDE;
// query whether the clipboard is opened // query whether the clipboard is opened
virtual bool IsOpened() const; virtual bool IsOpened() const wxOVERRIDE;
// set the clipboard data. all other formats will be deleted. // set the clipboard data. all other formats will be deleted.
virtual bool SetData( wxDataObject *data ); virtual bool SetData( wxDataObject *data ) wxOVERRIDE;
// add to the clipboard data. // add to the clipboard data.
virtual bool AddData( wxDataObject *data ); virtual bool AddData( wxDataObject *data ) wxOVERRIDE;
// ask if data in correct format is available // ask if data in correct format is available
virtual bool IsSupported( const wxDataFormat& format ); virtual bool IsSupported( const wxDataFormat& format ) wxOVERRIDE;
// fill data with data on the clipboard (if available) // fill data with data on the clipboard (if available)
virtual bool GetData( wxDataObject& data ); virtual bool GetData( wxDataObject& data ) wxOVERRIDE;
// clears wxTheClipboard and the system's clipboard if possible // clears wxTheClipboard and the system's clipboard if possible
virtual void Clear(); virtual void Clear() wxOVERRIDE;
// flushes the clipboard: this means that the data which is currently on // flushes the clipboard: this means that the data which is currently on
// clipboard will stay available even after the application exits (possibly // clipboard will stay available even after the application exits (possibly
// eating memory), otherwise the clipboard will be emptied on exit // eating memory), otherwise the clipboard will be emptied on exit
virtual bool Flush(); virtual bool Flush() wxOVERRIDE;
private: private:
wxDataObject *m_data; wxDataObject *m_data;

10
include/wx/osx/cocoa/evtloop.h
View File

@@ -20,18 +20,18 @@ public:
void EndModalSession(); void EndModalSession();
virtual void WakeUp(); virtual void WakeUp() wxOVERRIDE;
void OSXUseLowLevelWakeup(bool useIt) void OSXUseLowLevelWakeup(bool useIt)
{ m_osxLowLevelWakeUp = useIt ; } { m_osxLowLevelWakeUp = useIt ; }
protected: protected:
virtual int DoDispatchTimeout(unsigned long timeout); virtual int DoDispatchTimeout(unsigned long timeout) wxOVERRIDE;
virtual void OSXDoRun(); virtual void OSXDoRun() wxOVERRIDE;
virtual void OSXDoStop(); virtual void OSXDoStop() wxOVERRIDE;
virtual CFRunLoopRef CFGetCurrentRunLoop() const; virtual CFRunLoopRef CFGetCurrentRunLoop() const wxOVERRIDE;
void* m_modalSession; void* m_modalSession;

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

@@ -56,8 +56,8 @@ public :
void Init(); void Init();
virtual bool IsVisible() const ; virtual bool IsVisible() const wxOVERRIDE;
virtual void SetVisibility(bool); virtual void SetVisibility(bool) wxOVERRIDE;
// we provide a static function which can be reused from // we provide a static function which can be reused from
// wxNonOwnedWindowCocoaImpl too // wxNonOwnedWindowCocoaImpl too
@@ -68,70 +68,70 @@ public :
virtual bool ShowWithEffect(bool show, virtual bool ShowWithEffect(bool show,
wxShowEffect effect, wxShowEffect effect,
unsigned timeout); unsigned timeout) wxOVERRIDE;
virtual void Raise(); virtual void Raise() wxOVERRIDE;
virtual void Lower(); virtual void Lower() wxOVERRIDE;
virtual void ScrollRect( const wxRect *rect, int dx, int dy ); virtual void ScrollRect( const wxRect *rect, int dx, int dy ) wxOVERRIDE;
virtual WXWidget GetWXWidget() const { return m_osxView; } virtual WXWidget GetWXWidget() const wxOVERRIDE { return m_osxView; }
virtual void SetBackgroundColour(const wxColour&); virtual void SetBackgroundColour(const wxColour&) wxOVERRIDE;
virtual bool SetBackgroundStyle(wxBackgroundStyle style); virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE;
virtual void GetContentArea( int &left , int &top , int &width , int &height ) const; virtual void GetContentArea( int &left, int &top, int &width, int &height ) const wxOVERRIDE;
virtual void Move(int x, int y, int width, int height); virtual void Move(int x, int y, int width, int height) wxOVERRIDE;
virtual void GetPosition( int &x, int &y ) const; virtual void GetPosition( int &x, int &y ) const wxOVERRIDE;
virtual void GetSize( int &width, int &height ) const; virtual void GetSize( int &width, int &height ) const wxOVERRIDE;
virtual void SetControlSize( wxWindowVariant variant ); virtual void SetControlSize( wxWindowVariant variant ) wxOVERRIDE;
virtual void SetNeedsDisplay( const wxRect* where = NULL ); virtual void SetNeedsDisplay( const wxRect* where = NULL ) wxOVERRIDE;
virtual bool GetNeedsDisplay() const; virtual bool GetNeedsDisplay() const wxOVERRIDE;
virtual void SetDrawingEnabled(bool enabled); virtual void SetDrawingEnabled(bool enabled) wxOVERRIDE;
virtual bool CanFocus() const; virtual bool CanFocus() const wxOVERRIDE;
// return true if successful // return true if successful
virtual bool SetFocus(); virtual bool SetFocus() wxOVERRIDE;
virtual bool HasFocus() const; virtual bool HasFocus() const wxOVERRIDE;
void RemoveFromParent(); void RemoveFromParent() wxOVERRIDE;
void Embed( wxWidgetImpl *parent ); void Embed( wxWidgetImpl *parent ) wxOVERRIDE;
void SetDefaultButton( bool isDefault ); void SetDefaultButton( bool isDefault ) wxOVERRIDE;
void PerformClick(); void PerformClick() wxOVERRIDE;
virtual void SetLabel(const wxString& title, wxFontEncoding encoding); virtual void SetLabel(const wxString& title, wxFontEncoding encoding) wxOVERRIDE;
void SetCursor( const wxCursor & cursor ); void SetCursor( const wxCursor & cursor ) wxOVERRIDE;
void CaptureMouse(); void CaptureMouse() wxOVERRIDE;
void ReleaseMouse(); void ReleaseMouse() wxOVERRIDE;
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
void SetDropTarget(wxDropTarget* target); void SetDropTarget(wxDropTarget* target) wxOVERRIDE;
#endif #endif
wxInt32 GetValue() const; wxInt32 GetValue() const wxOVERRIDE;
void SetValue( wxInt32 v ); void SetValue( wxInt32 v ) wxOVERRIDE;
wxBitmap GetBitmap() const; wxBitmap GetBitmap() const wxOVERRIDE;
void SetBitmap( const wxBitmap& bitmap ); void SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE;
void SetBitmapPosition( wxDirection dir ); void SetBitmapPosition( wxDirection dir ) wxOVERRIDE;
void SetupTabs( const wxNotebook &notebook ); void SetupTabs( const wxNotebook &notebook ) wxOVERRIDE;
void GetBestRect( wxRect *r ) const; void GetBestRect( wxRect *r ) const wxOVERRIDE;
bool IsEnabled() const; bool IsEnabled() const wxOVERRIDE;
void Enable( bool enable ); void Enable( bool enable ) wxOVERRIDE;
bool ButtonClickDidStateChange() { return true ;} bool ButtonClickDidStateChange() wxOVERRIDE { return true; }
void SetMinimum( wxInt32 v ); void SetMinimum( wxInt32 v ) wxOVERRIDE;
void SetMaximum( wxInt32 v ); void SetMaximum( wxInt32 v ) wxOVERRIDE;
wxInt32 GetMinimum() const; wxInt32 GetMinimum() const wxOVERRIDE;
wxInt32 GetMaximum() const; wxInt32 GetMaximum() const wxOVERRIDE;
void PulseGauge(); void PulseGauge() wxOVERRIDE;
void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ); void SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) wxOVERRIDE;
void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ); void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle, bool ignoreBlack = true ) wxOVERRIDE;
void SetToolTip( wxToolTip* tooltip ); void SetToolTip( wxToolTip* tooltip ) wxOVERRIDE;
void InstallEventHandler( WXWidget control = NULL ); void InstallEventHandler( WXWidget control = NULL ) wxOVERRIDE;
bool EnableTouchEvents(int eventsMask); bool EnableTouchEvents(int eventsMask) wxOVERRIDE;
virtual bool ShouldHandleKeyNavigation(const wxKeyEvent &event) const; virtual bool ShouldHandleKeyNavigation(const wxKeyEvent &event) const;
bool DoHandleKeyNavigation(const wxKeyEvent &event); bool DoHandleKeyNavigation(const wxKeyEvent &event);
@@ -162,7 +162,7 @@ public :
virtual bool IsFlipped() const { return m_isFlipped; } virtual bool IsFlipped() const { return m_isFlipped; }
#endif #endif
virtual double GetContentScaleFactor() const; virtual double GetContentScaleFactor() const wxOVERRIDE;
// cocoa thunk connected calls // cocoa thunk connected calls
@@ -242,7 +242,7 @@ public :
void GetPosition( int &x, int &y ) const wxOVERRIDE; void GetPosition( int &x, int &y ) const wxOVERRIDE;
void GetSize( int &width, int &height ) const wxOVERRIDE; void GetSize( int &width, int &height ) const wxOVERRIDE;
void GetContentArea( int &left , int &top , int &width , int &height ) const wxOVERRIDE; void GetContentArea( int &left, int &top, int &width, int &height ) const wxOVERRIDE;
bool SetShape(const wxRegion& region) wxOVERRIDE; bool SetShape(const wxRegion& region) wxOVERRIDE;
virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) wxOVERRIDE; virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) wxOVERRIDE;
@@ -304,13 +304,13 @@ class wxButtonCocoaImpl : public wxWidgetCocoaImpl, public wxButtonImpl
{ {
public: public:
wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v); wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v);
virtual void SetBitmap(const wxBitmap& bitmap); virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE;
#if wxUSE_MARKUP #if wxUSE_MARKUP
virtual void SetLabelMarkup(const wxString& markup); virtual void SetLabelMarkup(const wxString& markup) wxOVERRIDE;
#endif // wxUSE_MARKUP #endif // wxUSE_MARKUP
void SetPressedBitmap( const wxBitmap& bitmap ); void SetPressedBitmap( const wxBitmap& bitmap ) wxOVERRIDE;
void GetLayoutInset(int &left , int &top , int &right, int &bottom) const; void GetLayoutInset(int &left, int &top, int &right, int &bottom) const wxOVERRIDE;
void SetAcceleratorFromLabel(const wxString& label); void SetAcceleratorFromLabel(const wxString& label);
NSButton *GetNSButton() const; NSButton *GetNSButton() const;

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

@@ -27,7 +27,7 @@ public:
bool Create(wxWindow *parent, wxColourData *data = NULL); bool Create(wxWindow *parent, wxColourData *data = NULL);
int ShowModal(); int ShowModal() wxOVERRIDE;
wxColourData& GetColourData() { return m_colourData; } wxColourData& GetColourData() { return m_colourData; }
protected: protected:

42
include/wx/osx/combobox.h
View File

@@ -82,53 +82,53 @@ class WXDLLIMPEXP_CORE wxComboBox :
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr); const wxString& name = wxComboBoxNameStr);
virtual int GetSelection() const; virtual int GetSelection() const wxOVERRIDE;
virtual void GetSelection(long *from, long *to) const; virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
virtual void SetSelection(int n); virtual void SetSelection(int n) wxOVERRIDE;
virtual void SetSelection(long from, long to); virtual void SetSelection(long from, long to) wxOVERRIDE;
virtual int FindString(const wxString& s, bool bCase = false) const; virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE;
virtual wxString GetString(unsigned int n) const; virtual wxString GetString(unsigned int n) const wxOVERRIDE;
virtual wxString GetStringSelection() const; virtual wxString GetStringSelection() const wxOVERRIDE;
virtual void SetString(unsigned int n, const wxString& s); virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
virtual unsigned int GetCount() const; virtual unsigned int GetCount() const wxOVERRIDE;
virtual void SetValue(const wxString& value); virtual void SetValue(const wxString& value) wxOVERRIDE;
// these methods are provided by wxTextEntry for the native impl. // these methods are provided by wxTextEntry for the native impl.
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
virtual void Popup(); virtual void Popup() wxOVERRIDE;
virtual void Dismiss(); virtual void Dismiss() wxOVERRIDE;
#endif // wxOSX_USE_COCOA #endif // wxOSX_USE_COCOA
// 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;
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
wxComboWidgetImpl* GetComboPeer() const; wxComboWidgetImpl* GetComboPeer() const;
#endif #endif
protected: protected:
// List functions // List functions
virtual void DoDeleteOneItem(unsigned int n); virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
virtual void DoClear(); virtual void DoClear() wxOVERRIDE;
// wxTextEntry functions // wxTextEntry functions
virtual wxWindow *GetEditableWindow() { return this; } virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }
// override the base class virtuals involved in geometry calculations // override the base class virtuals involved in geometry calculations
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
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;
virtual void EnableTextChangedEvents(bool enable); virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE;
// the subcontrols // the subcontrols
wxComboBoxText* m_text; wxComboBoxText* m_text;

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

@@ -36,7 +36,7 @@ public:
const wxString& name = wxControlNameStr); const wxString& name = wxControlNameStr);
// Simulates an event // Simulates an event
virtual void Command(wxCommandEvent& event) { ProcessCommand(event); } virtual void Command(wxCommandEvent& event) wxOVERRIDE { ProcessCommand(event); }
// implementation from now on // implementation from now on
// -------------------------- // --------------------------

14
include/wx/osx/core/evtloop.h
View File

@@ -25,22 +25,22 @@ public:
// sets the "should exit" flag and wakes up the loop so that it terminates // sets the "should exit" flag and wakes up the loop so that it terminates
// soon // soon
virtual void ScheduleExit(int rc = 0); virtual void ScheduleExit(int rc = 0) wxOVERRIDE;
// return true if any events are available // return true if any events are available
virtual bool Pending() const; virtual bool Pending() const wxOVERRIDE;
// dispatch a single event, return false if we should exit from the loop // dispatch a single event, return false if we should exit from the loop
virtual bool Dispatch(); virtual bool Dispatch() wxOVERRIDE;
// same as Dispatch() but doesn't wait for longer than the specified (in // same as Dispatch() but doesn't wait for longer than the specified (in
// ms) timeout, return true if an event was processed, false if we should // ms) timeout, return true if an event was processed, false if we should
// exit the loop or -1 if timeout expired // exit the loop or -1 if timeout expired
virtual int DispatchTimeout(unsigned long timeout); virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE;
// implement this to wake up the loop: usually done by posting a dummy event // implement this to wake up the loop: usually done by posting a dummy event
// to it (can be called from non main thread) // to it (can be called from non main thread)
virtual void WakeUp(); virtual void WakeUp() wxOVERRIDE;
bool ShouldProcessIdleEvents() const { return m_processIdleEvents ; } bool ShouldProcessIdleEvents() const { return m_processIdleEvents ; }
@@ -53,13 +53,13 @@ public:
protected: protected:
// enters a loop calling OnNextIteration(), Pending() and Dispatch() and // enters a loop calling OnNextIteration(), Pending() and Dispatch() and
// terminating when Exit() is called // terminating when Exit() is called
virtual int DoRun(); virtual int DoRun() wxOVERRIDE;
// may be overridden to perform some action at the start of each new event // may be overridden to perform some action at the start of each new event
// loop iteration // loop iteration
virtual void OnNextIteration() {} virtual void OnNextIteration() {}
virtual void DoYieldFor(long eventsToProcess); virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE;
void CommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity); void CommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity);
void DefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity); void DefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity);

2
include/wx/osx/core/hid.h
View File

@@ -104,7 +104,7 @@ public:
static int GetCount(); static int GetCount();
bool Create(int nDev = 1); bool Create(int nDev = 1);
void AddCookie(CFTypeRef Data, int i); void AddCookie(CFTypeRef Data, int i);
virtual void BuildCookies(CFArrayRef Array); virtual void BuildCookies(CFArrayRef Array) wxOVERRIDE;
void DoBuildCookies(CFArrayRef Array); void DoBuildCookies(CFArrayRef Array);
}; };

2
include/wx/osx/core/private/strconv_cf.h
View File

@@ -323,7 +323,7 @@ public:
virtual size_t ToWChar(wchar_t * dst, size_t dstSize, const char * src, size_t srcSize = wxNO_LEN) const; virtual size_t ToWChar(wchar_t * dst, size_t dstSize, const char * src, size_t srcSize = wxNO_LEN) const;
virtual size_t FromWChar(char *dst, size_t dstSize, const wchar_t *src, size_t srcSize = wxNO_LEN) const; virtual size_t FromWChar(char *dst, size_t dstSize, const wchar_t *src, size_t srcSize = wxNO_LEN) const;
virtual wxMBConv *Clone() const { return new wxMBConv_cf(*this); } virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConv_cf(*this); }
bool IsOk() const bool IsOk() const
{ {

6
include/wx/osx/core/private/timer.h
View File

@@ -20,10 +20,10 @@ public:
wxOSXTimerImpl(wxTimer *timer); wxOSXTimerImpl(wxTimer *timer);
virtual ~wxOSXTimerImpl(); virtual ~wxOSXTimerImpl();
virtual bool Start(int milliseconds = -1, bool one_shot = false); virtual bool Start(int milliseconds = -1, bool one_shot = false) wxOVERRIDE;
virtual void Stop(); virtual void Stop() wxOVERRIDE;
virtual bool IsRunning() const; virtual bool IsRunning() const wxOVERRIDE;
private: private:
wxOSXTimerInfo *m_info; wxOSXTimerInfo *m_info;

4
include/wx/osx/cursor.h
View File

@@ -36,8 +36,8 @@ public:
WXHCURSOR GetHCURSOR() const; WXHCURSOR GetHCURSOR() const;
protected: protected:
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
private: private:
void InitFromStock(wxStockCursor); void InitFromStock(wxStockCursor);

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

@@ -26,24 +26,24 @@ public:
virtual ~wxBitmapDataObject(); virtual ~wxBitmapDataObject();
// override base class virtual to update PNG data too // override base class virtual to update PNG data too
virtual void SetBitmap(const wxBitmap& bitmap); virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE;
// implement base class pure virtuals // implement base class pure virtuals
// ---------------------------------- // ----------------------------------
virtual size_t GetDataSize() const ; virtual size_t GetDataSize() const wxOVERRIDE;
virtual bool GetDataHere(void *buf) const ; virtual bool GetDataHere(void *buf) const wxOVERRIDE;
virtual bool SetData(size_t len, const void *buf); virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
// Must provide overloads to avoid hiding them (and warnings about it) // Must provide overloads to avoid hiding them (and warnings about it)
virtual size_t GetDataSize(const wxDataFormat&) const virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE
{ {
return GetDataSize(); return GetDataSize();
} }
virtual bool GetDataHere(const wxDataFormat&, void *buf) const virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE
{ {
return GetDataHere(buf); return GetDataHere(buf);
} }
virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE
{ {
return SetData(len, buf); return SetData(len, buf);
} }
@@ -68,19 +68,19 @@ public:
void AddFile( const wxString &filename ); void AddFile( const wxString &filename );
virtual size_t GetDataSize() const; virtual size_t GetDataSize() const wxOVERRIDE;
virtual bool GetDataHere(void *buf) const; virtual bool GetDataHere(void *buf) const wxOVERRIDE;
virtual bool SetData(size_t len, const void *buf); virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
// Must provide overloads to avoid hiding them (and warnings about it) // Must provide overloads to avoid hiding them (and warnings about it)
virtual size_t GetDataSize(const wxDataFormat&) const virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE
{ {
return GetDataSize(); return GetDataSize();
} }
virtual bool GetDataHere(const wxDataFormat&, void *buf) const virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE
{ {
return GetDataHere(buf); return GetDataHere(buf);
} }
virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE
{ {
return SetData(len, buf); return SetData(len, buf);
} }

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

@@ -42,29 +42,29 @@ public:
virtual ~wxDataViewColumn(); virtual ~wxDataViewColumn();
// implement wxHeaderColumnBase pure virtual methods // implement wxHeaderColumnBase pure virtual methods
virtual wxAlignment GetAlignment() const { return m_alignment; } virtual wxAlignment GetAlignment() const wxOVERRIDE { return m_alignment; }
virtual int GetFlags() const { return m_flags; } virtual int GetFlags() const wxOVERRIDE { return m_flags; }
virtual int GetMaxWidth() const { return m_maxWidth; } virtual int GetMaxWidth() const { return m_maxWidth; }
virtual int GetMinWidth() const { return m_minWidth; } virtual int GetMinWidth() const wxOVERRIDE { return m_minWidth; }
virtual wxString GetTitle() const { return m_title; } virtual wxString GetTitle() const wxOVERRIDE { return m_title; }
virtual int GetWidth() const; virtual int GetWidth() const wxOVERRIDE;
virtual bool IsSortOrderAscending() const { return m_ascending; } virtual bool IsSortOrderAscending() const wxOVERRIDE { return m_ascending; }
virtual bool IsSortKey() const; virtual bool IsSortKey() const wxOVERRIDE;
virtual bool IsHidden() const; virtual bool IsHidden() const wxOVERRIDE;
virtual void SetAlignment (wxAlignment align); virtual void SetAlignment (wxAlignment align) wxOVERRIDE;
virtual void SetBitmap (wxBitmap const& bitmap); virtual void SetBitmap (wxBitmap const& bitmap) wxOVERRIDE;
virtual void SetFlags (int flags) { m_flags = flags; /*SetIndividualFlags(flags); */ } virtual void SetFlags (int flags) wxOVERRIDE { m_flags = flags; /*SetIndividualFlags(flags); */ }
virtual void SetHidden (bool hidden); virtual void SetHidden (bool hidden) wxOVERRIDE;
virtual void SetMaxWidth (int maxWidth); virtual void SetMaxWidth (int maxWidth);
virtual void SetMinWidth (int minWidth); virtual void SetMinWidth (int minWidth) wxOVERRIDE;
virtual void SetReorderable(bool reorderable); virtual void SetReorderable(bool reorderable) wxOVERRIDE;
virtual void SetResizeable (bool resizable); virtual void SetResizeable (bool resizable) wxOVERRIDE;
virtual void UnsetAsSortKey(); virtual void UnsetAsSortKey() wxOVERRIDE;
virtual void SetSortable (bool sortable); virtual void SetSortable (bool sortable) wxOVERRIDE;
virtual void SetSortOrder (bool ascending); virtual void SetSortOrder (bool ascending) wxOVERRIDE;
virtual void SetTitle (wxString const& title); virtual void SetTitle (wxString const& title) wxOVERRIDE;
virtual void SetWidth (int width); virtual void SetWidth (int width) wxOVERRIDE;
// implementation only // implementation only
wxDataViewColumnNativeData* GetNativeData() const wxDataViewColumnNativeData* GetNativeData() const

6
include/wx/osx/datectrl.h
View File

@@ -42,10 +42,10 @@ public:
const wxString& name = wxDatePickerCtrlNameStr); const wxString& name = wxDatePickerCtrlNameStr);
// Implement the base class pure virtuals. // Implement the base class pure virtuals.
virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2); virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) wxOVERRIDE;
virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const; virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const wxOVERRIDE;
virtual void OSXGenerateEvent(const wxDateTime& dt); virtual void OSXGenerateEvent(const wxDateTime& dt) wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl);

4
include/wx/osx/datetimectrl.h
View File

@@ -20,8 +20,8 @@ class WXDLLIMPEXP_ADV wxDateTimePickerCtrl : public wxDateTimePickerCtrlBase
{ {
public: public:
// Implement the base class pure virtuals. // Implement the base class pure virtuals.
virtual void SetValue(const wxDateTime& dt); virtual void SetValue(const wxDateTime& dt) wxOVERRIDE;
virtual wxDateTime GetValue() const; virtual wxDateTime GetValue() const wxOVERRIDE;
// Implementation only. // Implementation only.
virtual void OSXGenerateEvent(const wxDateTime& dt) = 0; virtual void OSXGenerateEvent(const wxDateTime& dt) = 0;

4
include/wx/osx/dcclient.h
View File

@@ -28,8 +28,8 @@ public:
wxWindowDCImpl( wxDC *owner, wxWindow *window ); wxWindowDCImpl( wxDC *owner, wxWindow *window );
virtual ~wxWindowDCImpl(); virtual ~wxWindowDCImpl();
virtual void DoGetSize( int *width, int *height ) const; virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE;
protected: protected:
bool m_release; bool m_release;

10
include/wx/osx/dcmemory.h
View File

@@ -22,14 +22,14 @@ public:
virtual ~wxMemoryDCImpl(); virtual ~wxMemoryDCImpl();
virtual void DoGetSize( int *width, int *height ) const; virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE
{ return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); } { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
virtual void DoSelect(const wxBitmap& bitmap); virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE;
virtual const wxBitmap& GetSelectedBitmap() const virtual const wxBitmap& GetSelectedBitmap() const wxOVERRIDE
{ return m_selected; } { return m_selected; }
virtual wxBitmap& GetSelectedBitmap() virtual wxBitmap& GetSelectedBitmap() wxOVERRIDE
{ return m_selected; } { return m_selected; }
private: private:

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

@@ -25,18 +25,18 @@ public:
wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printdata ); wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printdata );
virtual ~wxPrinterDCImpl(); virtual ~wxPrinterDCImpl();
virtual bool StartDoc( const wxString& WXUNUSED(message) ) ; virtual bool StartDoc( const wxString& WXUNUSED(message) ) wxOVERRIDE;
virtual void EndDoc(void) ; virtual void EndDoc(void) wxOVERRIDE;
virtual void StartPage(void) ; virtual void StartPage(void) wxOVERRIDE;
virtual void EndPage(void) ; virtual void EndPage(void) wxOVERRIDE;
wxRect GetPaperRect() const; wxRect GetPaperRect() const wxOVERRIDE;
wxPrintData& GetPrintData() { return m_printData; } wxPrintData& GetPrintData() { return m_printData; }
virtual wxSize GetPPI() const; virtual wxSize GetPPI() const wxOVERRIDE;
protected: protected:
virtual void DoGetSize( int *width, int *height ) const; virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
wxPrintData m_printData ; wxPrintData m_printData ;
wxNativePrinterDC* m_nativePrinterDC ; wxNativePrinterDC* m_nativePrinterDC ;

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

@@ -20,7 +20,7 @@ public:
wxScreenDCImpl( wxDC *owner ); wxScreenDCImpl( wxDC *owner );
virtual ~wxScreenDCImpl(); virtual ~wxScreenDCImpl();
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE;
private: private:
void* m_overlayWindow; void* m_overlayWindow;

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

@@ -46,18 +46,18 @@ public:
virtual ~wxDialog(); virtual ~wxDialog();
// virtual bool Destroy(); // virtual bool Destroy();
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
// return true if we're showing the dialog modally // return true if we're showing the dialog modally
virtual bool IsModal() const; virtual bool IsModal() const wxOVERRIDE;
// show the dialog modally and return the value passed to EndModal() // show the dialog modally and return the value passed to EndModal()
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
virtual void ShowWindowModal(); virtual void ShowWindowModal() wxOVERRIDE;
// may be called to terminate the dialog with the given return code // may be called to terminate the dialog with the given return code
virtual void EndModal(int retCode); virtual void EndModal(int retCode) wxOVERRIDE;
static bool OSXHasModalDialogsOpen(); static bool OSXHasModalDialogsOpen();
void OSXBeginModalDialog(); void OSXBeginModalDialog();
@@ -71,7 +71,7 @@ public:
// implementation // implementation
// -------------- // --------------
wxDialogModality GetModality() const; wxDialogModality GetModality() const wxOVERRIDE;
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
virtual void ModalFinishedCallback(void* WXUNUSED(panel), int WXUNUSED(returnCode)) {} virtual void ModalFinishedCallback(void* WXUNUSED(panel), int WXUNUSED(returnCode)) {}
@@ -85,7 +85,7 @@ protected:
void EndWindowModal(); void EndWindowModal();
// mac also takes command-period as cancel // mac also takes command-period as cancel
virtual bool IsEscapeKey(const wxKeyEvent& event); virtual bool IsEscapeKey(const wxKeyEvent& event) wxOVERRIDE;
wxDialogModality m_modality; wxDialogModality m_modality;

6
include/wx/osx/dirdlg.h
View File

@@ -45,11 +45,11 @@ public:
~wxDirDialog(); ~wxDirDialog();
#endif #endif
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
virtual void ShowWindowModal(); virtual void ShowWindowModal() wxOVERRIDE;
virtual void ModalFinishedCallback(void* panel, int returnCode); virtual void ModalFinishedCallback(void* panel, int returnCode) wxOVERRIDE;
#endif #endif
private: private:

10
include/wx/osx/dnd.h
View File

@@ -50,10 +50,10 @@ class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase
wxDropTarget(wxDataObject *dataObject = NULL ); wxDropTarget(wxDataObject *dataObject = NULL );
virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def); virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE;
virtual bool OnDrop(wxCoord x, wxCoord y); virtual bool OnDrop(wxCoord x, wxCoord y) wxOVERRIDE;
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE;
virtual bool GetData(); virtual bool GetData() wxOVERRIDE;
// NOTE: This is needed by the generic wxDataViewCtrl, not sure how to implement. // NOTE: This is needed by the generic wxDataViewCtrl, not sure how to implement.
virtual wxDataFormat GetMatchingPair(); virtual wxDataFormat GetMatchingPair();
@@ -90,7 +90,7 @@ public:
// do it (call this in response to a mouse button press, for example) // do it (call this in response to a mouse button press, for example)
// params: if bAllowMove is false, data can be only copied // params: if bAllowMove is false, data can be only copied
virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) wxOVERRIDE;
wxWindow* GetWindow() { return m_window ; } wxWindow* GetWindow() { return m_window ; }
void SetCurrentDragPasteboard( void* dragpasteboard ) { m_currentDragPasteboard = dragpasteboard ; } void SetCurrentDragPasteboard( void* dragpasteboard ) { m_currentDragPasteboard = dragpasteboard ; }

30
include/wx/osx/dvrenderers.h
View File

@@ -29,9 +29,9 @@ public:
// implementation only // implementation only
// ------------------- // -------------------
virtual bool MacRender(); virtual bool MacRender() wxOVERRIDE;
virtual wxDC* GetDC(); // creates a device context and keeps it virtual wxDC* GetDC() wxOVERRIDE; // creates a device context and keeps it
void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer
private: private:
@@ -82,11 +82,11 @@ public:
void EnableMarkup(bool enable = true); void EnableMarkup(bool enable = true);
#endif // wxUSE_MARKUP && Cocoa #endif // wxUSE_MARKUP && Cocoa
virtual bool MacRender(); virtual bool MacRender() wxOVERRIDE;
virtual void OSXOnCellChanged(NSObject *value, virtual void OSXOnCellChanged(NSObject *value,
const wxDataViewItem& item, const wxDataViewItem& item,
unsigned col); unsigned col) wxOVERRIDE;
private: private:
#if wxUSE_MARKUP && wxOSX_USE_COCOA #if wxUSE_MARKUP && wxOSX_USE_COCOA
@@ -110,7 +110,7 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT); int align = wxDVR_DEFAULT_ALIGNMENT);
virtual bool MacRender(); virtual bool MacRender() wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer);
@@ -128,14 +128,14 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
int alignment = wxDVR_DEFAULT_ALIGNMENT ); int alignment = wxDVR_DEFAULT_ALIGNMENT );
virtual bool MacRender(); virtual bool MacRender() wxOVERRIDE;
wxString GetChoice(size_t index) const { return m_choices[index]; } wxString GetChoice(size_t index) const { return m_choices[index]; }
const wxArrayString& GetChoices() const { return m_choices; } const wxArrayString& GetChoices() const { return m_choices; }
virtual void OSXOnCellChanged(NSObject *value, virtual void OSXOnCellChanged(NSObject *value,
const wxDataViewItem& item, const wxDataViewItem& item,
unsigned col); unsigned col) wxOVERRIDE;
private: private:
wxArrayString m_choices; wxArrayString m_choices;
@@ -174,11 +174,11 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT); int align = wxDVR_DEFAULT_ALIGNMENT);
virtual bool MacRender(); virtual bool MacRender() wxOVERRIDE;
virtual void OSXOnCellChanged(NSObject *value, virtual void OSXOnCellChanged(NSObject *value,
const wxDataViewItem& item, const wxDataViewItem& item,
unsigned col); unsigned col) wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer);
@@ -200,11 +200,11 @@ public:
void ShowAsRadio(); void ShowAsRadio();
virtual bool MacRender(); virtual bool MacRender() wxOVERRIDE;
virtual void OSXOnCellChanged(NSObject *value, virtual void OSXOnCellChanged(NSObject *value,
const wxDataViewItem& item, const wxDataViewItem& item,
unsigned col); unsigned col) wxOVERRIDE;
private: private:
void DoInitButtonCell(int buttonType); void DoInitButtonCell(int buttonType);
@@ -226,11 +226,11 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT); int align = wxDVR_DEFAULT_ALIGNMENT);
virtual bool MacRender(); virtual bool MacRender() wxOVERRIDE;
virtual void OSXOnCellChanged(NSObject *value, virtual void OSXOnCellChanged(NSObject *value,
const wxDataViewItem& item, const wxDataViewItem& item,
unsigned col); unsigned col) wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer);
@@ -249,11 +249,11 @@ public:
wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
int align = wxDVR_DEFAULT_ALIGNMENT); int align = wxDVR_DEFAULT_ALIGNMENT);
virtual bool MacRender(); virtual bool MacRender() wxOVERRIDE;
virtual void OSXOnCellChanged(NSObject *value, virtual void OSXOnCellChanged(NSObject *value,
const wxDataViewItem& item, const wxDataViewItem& item,
unsigned col); unsigned col) wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer);

6
include/wx/osx/evtloop.h
View File

@@ -26,11 +26,11 @@ public:
#ifdef __WXOSX_COCOA__ #ifdef __WXOSX_COCOA__
// skip wxGUIEventLoop to avoid missing Enter/Exit notifications // skip wxGUIEventLoop to avoid missing Enter/Exit notifications
virtual int Run() { return wxCFEventLoop::Run(); } virtual int Run() wxOVERRIDE { return wxCFEventLoop::Run(); }
#endif #endif
protected: protected:
virtual void OSXDoRun(); virtual void OSXDoRun() wxOVERRIDE;
virtual void OSXDoStop(); virtual void OSXDoStop() wxOVERRIDE;
// (in case) the modal window for this event loop // (in case) the modal window for this event loop
wxNonOwnedWindow* m_modalWindow; wxNonOwnedWindow* m_modalWindow;

12
include/wx/osx/filedlg.h
View File

@@ -60,17 +60,17 @@ public:
~wxFileDialog(); ~wxFileDialog();
#endif #endif
virtual void GetPaths(wxArrayString& paths) const { paths = m_paths; } virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE { paths = m_paths; }
virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; } virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE { files = m_fileNames ; }
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
virtual void ShowWindowModal(); virtual void ShowWindowModal() wxOVERRIDE;
virtual void ModalFinishedCallback(void* panel, int resultCode); virtual void ModalFinishedCallback(void* panel, int resultCode) wxOVERRIDE;
#endif #endif
virtual bool SupportsExtraControl() const; virtual bool SupportsExtraControl() const wxOVERRIDE;
// implementation only // implementation only

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

@@ -41,7 +41,7 @@ public:
bool Create(wxWindow *parent); bool Create(wxWindow *parent);
bool Create(wxWindow *parent, const wxFontData& data); bool Create(wxWindow *parent, const wxFontData& data);
int ShowModal(); int ShowModal() wxOVERRIDE;
wxFontData& GetFontData() { return m_fontData; } wxFontData& GetFontData() { return m_fontData; }
protected: protected:

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

@@ -39,11 +39,11 @@ class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
const wxString& name = wxGaugeNameStr); const wxString& name = wxGaugeNameStr);
// set gauge range/value // set gauge range/value
virtual void SetRange(int range); virtual void SetRange(int range) wxOVERRIDE;
virtual void SetValue(int pos); virtual void SetValue(int pos) wxOVERRIDE;
virtual int GetValue() const ; virtual int GetValue() const wxOVERRIDE;
void Pulse(); void Pulse() wxOVERRIDE;
protected: protected:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge);

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

@@ -43,7 +43,7 @@ public:
const wxGLContextAttrs *ctxAttrs = NULL); const wxGLContextAttrs *ctxAttrs = NULL);
virtual ~wxGLContext(); virtual ~wxGLContext();
virtual bool SetCurrent(const wxGLCanvas& win) const; virtual bool SetCurrent(const wxGLCanvas& win) const wxOVERRIDE;
// Mac-specific // Mac-specific
WXGLContext GetWXGLContext() const { return m_glContext; } WXGLContext GetWXGLContext() const { return m_glContext; }

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

@@ -119,14 +119,14 @@ public:
virtual ~wxMDIChildFrame(); virtual ~wxMDIChildFrame();
// un-override the base class override // un-override the base class override
virtual bool IsTopLevel() const { return true; } virtual bool IsTopLevel() const wxOVERRIDE { return true; }
// implement MDI operations // implement MDI operations
virtual void Activate(); virtual void Activate() wxOVERRIDE;
// Mac OS activate event // Mac OS activate event
virtual void MacActivate(long timestamp, bool activating); virtual void MacActivate(long timestamp, bool activating) wxOVERRIDE;
protected: protected:
// common part of all ctors // common part of all ctors
@@ -142,10 +142,10 @@ public:
virtual ~wxMDIClientWindow(); virtual ~wxMDIClientWindow();
virtual bool CreateClient(wxMDIParentFrame *parent, virtual bool CreateClient(wxMDIParentFrame *parent,
long style = wxVSCROLL | wxHSCROLL); long style = wxVSCROLL | wxHSCROLL) wxOVERRIDE;
protected: protected:
virtual void DoGetClientSize(int *width, int *height) const; virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow); wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow);
}; };

37
include/wx/osx/menu.h
View File

@@ -34,9 +34,9 @@ public:
virtual ~wxMenu(); virtual ~wxMenu();
virtual void Break(); virtual void Break() wxOVERRIDE;
virtual void SetTitle(const wxString& title); virtual void SetTitle(const wxString& title) wxOVERRIDE;
bool ProcessCommand(wxCommandEvent& event); bool ProcessCommand(wxCommandEvent& event);
@@ -73,9 +73,9 @@ protected:
// that are expected in the app menu // that are expected in the app menu
void DoRearrange() ; void DoRearrange() ;
virtual wxMenuItem* DoAppend(wxMenuItem *item); virtual wxMenuItem* DoAppend(wxMenuItem *item) wxOVERRIDE;
virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item) wxOVERRIDE;
virtual wxMenuItem* DoRemove(wxMenuItem *item); virtual wxMenuItem* DoRemove(wxMenuItem *item) wxOVERRIDE;
private: private:
// common part of all ctors // common part of all ctors
@@ -125,16 +125,16 @@ public:
virtual ~wxMenuBar(); virtual ~wxMenuBar();
// menubar construction // menubar construction
virtual bool Append( wxMenu *menu, const wxString &title ); virtual bool Append( wxMenu *menu, const wxString &title ) wxOVERRIDE;
virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title); virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE;
virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title); virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE;
virtual wxMenu *Remove(size_t pos); virtual wxMenu *Remove(size_t pos) wxOVERRIDE;
virtual void EnableTop( size_t pos, bool flag ); virtual void EnableTop( size_t pos, bool flag ) wxOVERRIDE;
virtual bool IsEnabledTop(size_t pos) const; virtual bool IsEnabledTop(size_t pos) const wxOVERRIDE;
virtual void SetMenuLabel( size_t pos, const wxString& label ); virtual void SetMenuLabel( size_t pos, const wxString& label ) wxOVERRIDE;
virtual wxString GetMenuLabel( size_t pos ) const; virtual wxString GetMenuLabel( size_t pos ) const wxOVERRIDE;
virtual bool Enable( bool enable = true ); virtual bool Enable( bool enable = true ) wxOVERRIDE;
// for virtual function hiding // for virtual function hiding
virtual void Enable( int itemid, bool enable ) virtual void Enable( int itemid, bool enable )
{ {
@@ -142,6 +142,7 @@ public:
} }
// implementation from now on // implementation from now on
// returns TRUE if we're attached to a frame // returns TRUE if we're attached to a frame
bool IsAttached() const { return m_menuBarFrame != NULL; } bool IsAttached() const { return m_menuBarFrame != NULL; }
// get the frame we live in // get the frame we live in
@@ -149,7 +150,7 @@ public:
// if the menubar is modified, the display is not updated automatically, // if the menubar is modified, the display is not updated automatically,
// call this function to update it (m_menuBarFrame should be !NULL) // call this function to update it (m_menuBarFrame should be !NULL)
void Refresh(bool eraseBackground = true, const wxRect *rect = NULL); void Refresh(bool eraseBackground = true, const wxRect *rect = NULL) wxOVERRIDE;
#if wxABI_VERSION >= 30001 #if wxABI_VERSION >= 30001
wxMenu *OSXGetAppleMenu() const { return m_appleMenu; } wxMenu *OSXGetAppleMenu() const { return m_appleMenu; }
@@ -167,9 +168,9 @@ public:
static WXHMENU MacGetWindowMenuHMenu() { return s_macWindowMenuHandle ; } static WXHMENU MacGetWindowMenuHMenu() { return s_macWindowMenuHandle ; }
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;
protected: protected:
// common part of all ctors // common part of all ctors

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

@@ -37,7 +37,7 @@ public:
virtual ~wxMenuItem(); virtual ~wxMenuItem();
// override base class virtuals // override base class virtuals
virtual void SetItemLabel(const wxString& strName); virtual void SetItemLabel(const wxString& strName) wxOVERRIDE;
virtual void Enable(bool bDoEnable = true); virtual void Enable(bool bDoEnable = true);
virtual void Check(bool bDoCheck = true); virtual void Check(bool bDoCheck = true);

18
include/wx/osx/metafile.h
View File

@@ -56,8 +56,8 @@ public:
WXHMETAFILE GetHMETAFILE() const ; WXHMETAFILE GetHMETAFILE() const ;
void SetHMETAFILE(WXHMETAFILE mf) ; void SetHMETAFILE(WXHMETAFILE mf) ;
protected: protected:
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxMetafile); wxDECLARE_DYNAMIC_CLASS(wxMetafile);
}; };
@@ -81,7 +81,7 @@ public:
void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; } void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; }
protected: protected:
virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
wxMetafile* m_metaFile; wxMetafile* m_metaFile;
@@ -149,17 +149,17 @@ public:
{ return m_metafile; } { return m_metafile; }
// implement base class pure virtuals // implement base class pure virtuals
virtual size_t GetDataSize() const; virtual size_t GetDataSize() const wxOVERRIDE;
virtual bool GetDataHere(void *buf) const; virtual bool GetDataHere(void *buf) const wxOVERRIDE;
virtual bool SetData(size_t len, const void *buf); virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE
{ return GetDataSize(); } { return GetDataSize(); }
virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
void *buf) const void *buf) const wxOVERRIDE
{ return GetDataHere(buf); } { return GetDataHere(buf); }
virtual bool SetData(const wxDataFormat& WXUNUSED(format), virtual bool SetData(const wxDataFormat& WXUNUSED(format),
size_t len, const void *buf) size_t len, const void *buf) wxOVERRIDE
{ return SetData(len, buf); } { return SetData(len, buf); }
protected: protected:
wxMetafile m_metafile; wxMetafile m_metafile;

6
include/wx/osx/msgdlg.h
View File

@@ -25,11 +25,11 @@ public:
~wxMessageDialog(); ~wxMessageDialog();
#endif #endif
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
virtual void ShowWindowModal(); virtual void ShowWindowModal() wxOVERRIDE;
virtual void ModalFinishedCallback(void* panel, int resultCode); virtual void ModalFinishedCallback(void* panel, int resultCode) wxOVERRIDE;
#endif #endif
protected: protected:

42
include/wx/osx/nonownedwnd.h
View File

@@ -63,16 +63,16 @@ public:
virtual void SubclassWin(WXWindow nativeWindow); virtual void SubclassWin(WXWindow nativeWindow);
virtual void UnsubclassWin(); virtual void UnsubclassWin();
virtual wxPoint GetClientAreaOrigin() const; virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
// implement base class pure virtuals // implement base class pure virtuals
virtual bool SetTransparent(wxByte alpha); virtual bool SetTransparent(wxByte alpha) wxOVERRIDE;
virtual bool CanSetTransparent(); virtual bool CanSetTransparent() wxOVERRIDE;
virtual bool SetBackgroundStyle(wxBackgroundStyle style); virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE;
virtual void Update(); virtual void Update() wxOVERRIDE;
WXWindow GetWXWindow() const ; WXWindow GetWXWindow() const ;
static wxNonOwnedWindow* GetFromWXWindow( WXWindow win ); static wxNonOwnedWindow* GetFromWXWindow( WXWindow win );
@@ -90,21 +90,21 @@ public:
static void MacDelayedDeactivation(long timestamp); static void MacDelayedDeactivation(long timestamp);
virtual void MacActivate( long timestamp , bool inIsActivating ) ; virtual void MacActivate( long timestamp , bool inIsActivating ) ;
virtual void SetWindowStyleFlag(long flags); virtual void SetWindowStyleFlag(long flags) 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 void SetExtraStyle(long exStyle) ; virtual void SetExtraStyle(long exStyle) wxOVERRIDE;
virtual bool SetBackgroundColour( const wxColour &colour ); virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE;
wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; } wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; }
#if wxOSX_USE_COCOA_OR_IPHONE #if wxOSX_USE_COCOA_OR_IPHONE
// override the base class method to return an NSWindow instead of NSView // override the base class method to return an NSWindow instead of NSView
virtual void *OSXGetViewOrWindow() const; virtual void *OSXGetViewOrWindow() const wxOVERRIDE;
#endif // Cocoa #endif // Cocoa
// osx specific event handling common for all osx-ports // osx specific event handling common for all osx-ports
@@ -120,25 +120,25 @@ public:
void WindowWasPainted(); void WindowWasPainted();
virtual bool Destroy(); virtual bool Destroy() wxOVERRIDE;
protected: protected:
// common part of all ctors // common part of all ctors
void Init(); void Init();
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 DoMoveWindow(int x, int y, int width, int height); virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
virtual void DoGetClientSize(int *width, int *height) const; virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
virtual bool OSXShowWithEffect(bool show, virtual bool OSXShowWithEffect(bool show,
wxShowEffect effect, wxShowEffect effect,
unsigned timeout); unsigned timeout) wxOVERRIDE;
virtual bool DoClearShape(); virtual bool DoClearShape() wxOVERRIDE;
virtual bool DoSetRegionShape(const wxRegion& region); virtual bool DoSetRegionShape(const wxRegion& region) wxOVERRIDE;
#if wxUSE_GRAPHICS_CONTEXT #if wxUSE_GRAPHICS_CONTEXT
virtual bool DoSetPathShape(const wxGraphicsPath& path); virtual bool DoSetPathShape(const wxGraphicsPath& path) wxOVERRIDE;
#endif // wxUSE_GRAPHICS_CONTEXT #endif // wxUSE_GRAPHICS_CONTEXT
virtual void WillBeDestroyed(); virtual void WillBeDestroyed();

6
include/wx/osx/palette.h
View File

@@ -27,11 +27,11 @@ public:
int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const; int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const; bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
virtual int GetColoursCount() const; virtual int GetColoursCount() const wxOVERRIDE;
protected: protected:
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS(wxPalette); wxDECLARE_DYNAMIC_CLASS(wxPalette);

34
include/wx/osx/pen.h
View File

@@ -32,25 +32,25 @@ public:
bool operator!=(const wxPen& pen) const { return !(*this == pen); } bool operator!=(const wxPen& pen) const { return !(*this == pen); }
// Override in order to recreate the pen // Override in order to recreate the pen
void SetColour(const wxColour& col) ; void SetColour(const wxColour& col) wxOVERRIDE;
void SetColour(unsigned char r, unsigned char g, unsigned char b) ; void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE;
void SetWidth(int width) ; void SetWidth(int width) wxOVERRIDE;
void SetStyle(wxPenStyle style) ; void SetStyle(wxPenStyle style) wxOVERRIDE;
void SetStipple(const wxBitmap& stipple) ; void SetStipple(const wxBitmap& stipple) wxOVERRIDE;
void SetDashes(int nb_dashes, const wxDash *dash) ; void SetDashes(int nb_dashes, const wxDash *dash) wxOVERRIDE;
void SetJoin(wxPenJoin join) ; void SetJoin(wxPenJoin join) wxOVERRIDE;
void SetCap(wxPenCap cap) ; void SetCap(wxPenCap cap) wxOVERRIDE;
wxColour GetColour() const ; wxColour GetColour() const wxOVERRIDE;
int GetWidth() const; int GetWidth() const wxOVERRIDE;
wxPenStyle GetStyle() const; wxPenStyle GetStyle() const wxOVERRIDE;
wxPenJoin GetJoin() const; wxPenJoin GetJoin() const wxOVERRIDE;
wxPenCap GetCap() const; wxPenCap GetCap() const wxOVERRIDE;
int GetDashes(wxDash **ptr) const; int GetDashes(wxDash **ptr) const wxOVERRIDE;
int GetDashCount() const; int GetDashCount() const;
wxBitmap *GetStipple() const ; wxBitmap *GetStipple() const wxOVERRIDE;
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
@@ -65,8 +65,8 @@ public:
bool RealizeResource(); bool RealizeResource();
protected: protected:
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
private: private:
void Unshare(); void Unshare();

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

@@ -26,7 +26,7 @@ public:
bool Create(wxWindow *parent, int flags = wxBORDER_NONE); bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow);
}; };

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

@@ -33,11 +33,11 @@ public:
virtual ~wxMacPrintDialog(); virtual ~wxMacPrintDialog();
bool Create(wxWindow *parent, wxPrintDialogData* data = NULL); bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
virtual wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; } virtual wxPrintDialogData& GetPrintDialogData() wxOVERRIDE { return m_printDialogData; }
virtual wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); } virtual wxPrintData& GetPrintData() wxOVERRIDE { return m_printDialogData.GetPrintData(); }
virtual wxDC *GetPrintDC(); virtual wxDC *GetPrintDC() wxOVERRIDE;
private: private:
wxPrintDialogData m_printDialogData; wxPrintDialogData m_printDialogData;
@@ -60,10 +60,10 @@ public:
wxMacPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL); wxMacPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
virtual ~wxMacPageSetupDialog(); virtual ~wxMacPageSetupDialog();
virtual wxPageSetupDialogData& GetPageSetupDialogData(); virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE;
bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL); bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL);
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
private: private:
wxPageSetupDialogData m_pageSetupData; wxPageSetupDialogData m_pageSetupData;
@@ -86,7 +86,7 @@ class WXDLLIMPEXP_CORE wxMacPageMarginsDialog : public wxDialog
public: public:
wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupDialogData* data); wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupDialogData* data);
bool TransferToWindow(); bool TransferToWindow();
bool TransferDataFromWindow(); bool TransferDataFromWindow() wxOVERRIDE;
virtual wxPageSetupDialogData& GetPageSetupDialogData() { return *m_pageSetupDialogData; } virtual wxPageSetupDialogData& GetPageSetupDialogData() { return *m_pageSetupDialogData; }

10
include/wx/osx/printmac.h
View File

@@ -27,9 +27,9 @@ public:
virtual bool Print(wxWindow *parent, virtual bool Print(wxWindow *parent,
wxPrintout *printout, wxPrintout *printout,
bool prompt = true); bool prompt = true) wxOVERRIDE;
virtual wxDC* PrintDialog(wxWindow *parent); virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE;
virtual bool Setup(wxWindow *parent); virtual bool Setup(wxWindow *parent) wxOVERRIDE;
}; };
@@ -51,8 +51,8 @@ public:
wxPrintData *data); wxPrintData *data);
virtual ~wxMacPrintPreview(); virtual ~wxMacPrintPreview();
virtual bool Print(bool interactive); virtual bool Print(bool interactive) wxOVERRIDE;
virtual void DetermineScaling(); virtual void DetermineScaling() wxOVERRIDE;
}; };
#endif #endif

4
include/wx/osx/radiobut.h
View File

@@ -40,14 +40,14 @@ public:
// implementation // implementation
void Command(wxCommandEvent& event); void Command(wxCommandEvent& event) wxOVERRIDE;
wxRadioButton *AddInCycle(wxRadioButton *cycle); wxRadioButton *AddInCycle(wxRadioButton *cycle);
void RemoveFromCycle(); void RemoveFromCycle();
wxRadioButton *NextInCycle() {return m_cycle;} wxRadioButton *NextInCycle() {return m_cycle;}
// 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:
wxRadioButton *m_cycle; wxRadioButton *m_cycle;

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

@@ -64,7 +64,7 @@ public:
static void SoundStopped(const wxSoundData* data); static void SoundStopped(const wxSoundData* data);
protected: protected:
bool DoPlay(unsigned flags) const; bool DoPlay(unsigned flags) const wxOVERRIDE;
void Init(); void Init();
private: private:

12
include/wx/osx/spinbutt.h
View File

@@ -51,22 +51,22 @@ public:
// accessors // accessors
virtual void SetRange(int minVal, int maxVal); virtual void SetRange(int minVal, int maxVal) wxOVERRIDE;
virtual int GetValue() const ; virtual int GetValue() const wxOVERRIDE;
virtual void SetValue(int val); virtual void SetValue(int val) wxOVERRIDE;
// implementation // implementation
virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; virtual void TriggerScrollEvent( wxEventType scrollEvent ) 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:
void SendThumbTrackEvent() ; void SendThumbTrackEvent() ;
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS(wxSpinButton); wxDECLARE_DYNAMIC_CLASS(wxSpinButton);

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

@@ -34,15 +34,15 @@ public:
long style = 0, long style = 0,
const wxString& name = wxStaticBoxNameStr); const wxString& name = wxStaticBoxNameStr);
virtual void Command(wxCommandEvent& WXUNUSED(event)) {} virtual void Command(wxCommandEvent& WXUNUSED(event)) wxOVERRIDE {}
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {} virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}
virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE;
virtual bool AcceptsFocus() const { return false; } virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
// protect native font of box // protect native font of box
virtual bool SetFont( const wxFont &font ); virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
}; };
#endif #endif

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

@@ -34,20 +34,20 @@ public:
const wxString& name = wxStaticTextNameStr); const wxString& name = wxStaticTextNameStr);
// accessors // accessors
void SetLabel( const wxString &str ) ; void SetLabel( const wxString &str ) wxOVERRIDE;
bool SetFont( const wxFont &font ); bool SetFont( const wxFont &font ) wxOVERRIDE;
virtual bool AcceptsFocus() const { return false; } virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
protected : protected :
virtual wxString DoGetLabel() const; virtual wxString DoGetLabel() const wxOVERRIDE;
virtual void DoSetLabel(const wxString& str); virtual void DoSetLabel(const wxString& str) wxOVERRIDE;
virtual wxSize DoGetBestSize() const ; virtual wxSize DoGetBestSize() const wxOVERRIDE;
#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
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText);

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

@@ -34,58 +34,58 @@ public:
wxTextEntry(); wxTextEntry();
virtual ~wxTextEntry(); virtual ~wxTextEntry();
virtual bool IsEditable() const; virtual bool IsEditable() const wxOVERRIDE;
// If the return values from and to are the same, there is no selection. // If the return values from and to are the same, there is no selection.
virtual void GetSelection(long* from, long* to) const; virtual void GetSelection(long* from, long* to) const wxOVERRIDE;
// operations // operations
// ---------- // ----------
// editing // editing
virtual void Clear(); virtual void Clear() wxOVERRIDE;
virtual void Remove(long from, long to); virtual void Remove(long from, long to) wxOVERRIDE;
// set the max number of characters which may be entered // set the max number of characters which may be entered
// in a single line text control // in a single line text control
virtual void SetMaxLength(unsigned long len); virtual void SetMaxLength(unsigned long len) wxOVERRIDE;
virtual void ForceUpper(); virtual void ForceUpper() wxOVERRIDE;
// writing text inserts it at the current position; // writing text inserts it at the current position;
// appending always inserts it at the end // appending always inserts it at the end
virtual void WriteText(const wxString& text); virtual void WriteText(const wxString& text) wxOVERRIDE;
// Clipboard operations // Clipboard operations
virtual void Copy(); virtual void Copy() wxOVERRIDE;
virtual void Cut(); virtual void Cut() wxOVERRIDE;
virtual void Paste(); virtual void Paste() wxOVERRIDE;
virtual bool CanCopy() const; virtual bool CanCopy() const wxOVERRIDE;
virtual bool CanCut() const; virtual bool CanCut() const wxOVERRIDE;
virtual bool CanPaste() const; virtual bool CanPaste() const wxOVERRIDE;
// Undo/redo // Undo/redo
virtual void Undo(); virtual void Undo() wxOVERRIDE;
virtual void Redo(); virtual void Redo() wxOVERRIDE;
virtual bool CanUndo() const; virtual bool CanUndo() const wxOVERRIDE;
virtual bool CanRedo() const; virtual bool CanRedo() const wxOVERRIDE;
// Insertion point // Insertion point
virtual void SetInsertionPoint(long pos); virtual void SetInsertionPoint(long pos) wxOVERRIDE;
virtual void SetInsertionPointEnd(); virtual void SetInsertionPointEnd() wxOVERRIDE;
virtual long GetInsertionPoint() const; virtual long GetInsertionPoint() const wxOVERRIDE;
virtual wxTextPos GetLastPosition() const; virtual wxTextPos GetLastPosition() const;
virtual void SetSelection(long from, long to); virtual void SetSelection(long from, long to) wxOVERRIDE;
virtual void SetEditable(bool editable); virtual void SetEditable(bool editable) wxOVERRIDE;
virtual bool SendMaxLenEvent(); virtual bool SendMaxLenEvent();
// set the grayed out hint text // set the grayed out hint text
virtual bool SetHint(const wxString& hint); virtual bool SetHint(const wxString& hint) wxOVERRIDE;
virtual wxString GetHint() const; virtual wxString GetHint() const wxOVERRIDE;
// Implementation // Implementation
// -------------- // --------------
@@ -95,10 +95,10 @@ public:
protected: protected:
virtual wxString DoGetValue() const; virtual wxString DoGetValue() const wxOVERRIDE;
virtual bool DoAutoCompleteStrings(const wxArrayString& choices); virtual bool DoAutoCompleteStrings(const wxArrayString& choices) wxOVERRIDE;
virtual bool DoAutoCompleteCustom(wxTextCompleter *completer); virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) wxOVERRIDE;
// The object providing auto-completions or NULL if none. // The object providing auto-completions or NULL if none.
wxTextCompleter *m_completer; wxTextCompleter *m_completer;

10
include/wx/osx/tglbtn.h
View File

@@ -37,15 +37,15 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr); const wxString& name = wxCheckBoxNameStr);
virtual void SetValue(bool value); virtual void SetValue(bool value) wxOVERRIDE;
virtual bool GetValue() const ; virtual bool GetValue() const wxOVERRIDE;
virtual bool OSXHandleClicked( double timestampsec ); virtual bool OSXHandleClicked( double timestampsec ) wxOVERRIDE;
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event) wxOVERRIDE;
protected: protected:
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton);

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

@@ -41,7 +41,7 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxTimePickerCtrlNameStr); const wxString& name = wxTimePickerCtrlNameStr);
virtual void OSXGenerateEvent(const wxDateTime& dt); virtual void OSXGenerateEvent(const wxDateTime& dt) wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl);

4
include/wx/qt/accel.h
View File

@@ -52,8 +52,8 @@ public:
protected: protected:
// ref counting code // ref counting code
virtual wxObjectRefData *CreateRefData() const; virtual wxObjectRefData *CreateRefData() const wxOVERRIDE;
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable); wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable);

4
include/wx/qt/anybutton.h
View File

@@ -23,9 +23,9 @@ public:
// implementation // implementation
// -------------- // --------------
virtual void SetLabel( const wxString &label ); virtual void SetLabel( const wxString &label ) wxOVERRIDE;
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
// implementation only // implementation only
void QtUpdateState(); void QtUpdateState();

2
include/wx/qt/app.h
View File

@@ -18,7 +18,7 @@ public:
wxApp(); wxApp();
~wxApp(); ~wxApp();
virtual bool Initialize(int& argc, wxChar **argv); virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE;
private: private:
wxScopedPtr<QApplication> m_qtApplication; wxScopedPtr<QApplication> m_qtApplication;

38
include/wx/qt/bitmap.h
View File

@@ -36,34 +36,34 @@ public:
static void InitStandardHandlers(); static void InitStandardHandlers();
virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE;
virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH); virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE;
virtual bool Create(int width, int height, const wxDC& WXUNUSED(dc)); virtual bool Create(int width, int height, const wxDC& WXUNUSED(dc));
virtual int GetHeight() const; virtual int GetHeight() const wxOVERRIDE;
virtual int GetWidth() const; virtual int GetWidth() const wxOVERRIDE;
virtual int GetDepth() const; virtual int GetDepth() const wxOVERRIDE;
#if wxUSE_IMAGE #if wxUSE_IMAGE
virtual wxImage ConvertToImage() const; virtual wxImage ConvertToImage() const wxOVERRIDE;
#endif // wxUSE_IMAGE #endif // wxUSE_IMAGE
virtual wxMask *GetMask() const; virtual wxMask *GetMask() const wxOVERRIDE;
virtual void SetMask(wxMask *mask); virtual void SetMask(wxMask *mask) wxOVERRIDE;
virtual wxBitmap GetSubBitmap(const wxRect& rect) const; virtual wxBitmap GetSubBitmap(const wxRect& rect) const wxOVERRIDE;
virtual bool SaveFile(const wxString &name, wxBitmapType type, virtual bool SaveFile(const wxString &name, wxBitmapType type,
const wxPalette *palette = NULL) const; const wxPalette *palette = NULL) const wxOVERRIDE;
virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE) wxOVERRIDE;
#if wxUSE_PALETTE #if wxUSE_PALETTE
virtual wxPalette *GetPalette() const; virtual wxPalette *GetPalette() const wxOVERRIDE;
virtual void SetPalette(const wxPalette& palette); virtual void SetPalette(const wxPalette& palette) wxOVERRIDE;
#endif // wxUSE_PALETTE #endif // wxUSE_PALETTE
// copies the contents and mask of the given (colour) icon to the bitmap // copies the contents and mask of the given (colour) icon to the bitmap
virtual bool CopyFromIcon(const wxIcon& icon); virtual bool CopyFromIcon(const wxIcon& icon) wxOVERRIDE;
// implementation: // implementation:
#if WXWIN_COMPATIBILITY_3_0 #if WXWIN_COMPATIBILITY_3_0
@@ -82,8 +82,8 @@ public:
QPixmap *GetHandle() const; QPixmap *GetHandle() const;
protected: protected:
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxBitmap); wxDECLARE_DYNAMIC_CLASS(wxBitmap);
}; };
@@ -114,10 +114,10 @@ public:
protected: protected:
// this function is called from Create() to free the existing mask data // this function is called from Create() to free the existing mask data
void FreeData(); void FreeData() wxOVERRIDE;
// by the public wrappers // by the public wrappers
bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour); bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour) wxOVERRIDE;
bool InitFromMonoBitmap(const wxBitmap& bitmap); bool InitFromMonoBitmap(const wxBitmap& bitmap) wxOVERRIDE;
wxBitmap GetBitmap() const; wxBitmap GetBitmap() const;

18
include/wx/qt/brush.h
View File

@@ -21,17 +21,17 @@ public:
wxBrush(const wxBitmap& stipple); wxBrush(const wxBitmap& stipple);
virtual void SetColour(const wxColour& col); virtual void SetColour(const wxColour& col) wxOVERRIDE;
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b); virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE;
virtual void SetStyle(wxBrushStyle style); virtual void SetStyle(wxBrushStyle style) wxOVERRIDE;
virtual void SetStipple(const wxBitmap& stipple); virtual void SetStipple(const wxBitmap& stipple) wxOVERRIDE;
bool operator==(const wxBrush& brush) const; bool operator==(const wxBrush& brush) const;
bool operator!=(const wxBrush& brush) const { return !(*this == brush); } bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
virtual wxColour GetColour() const; virtual wxColour GetColour() const wxOVERRIDE;
virtual wxBrushStyle GetStyle() const; virtual wxBrushStyle GetStyle() const wxOVERRIDE;
virtual wxBitmap *GetStipple() const; virtual wxBitmap *GetStipple() const wxOVERRIDE;
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants") wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxBrushStyle)style); } void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
@@ -39,8 +39,8 @@ public:
QBrush GetHandle() const; QBrush GetHandle() const;
protected: protected:
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS(wxBrush); wxDECLARE_DYNAMIC_CLASS(wxBrush);

2
include/wx/qt/button.h
View File

@@ -29,7 +29,7 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr); const wxString& name = wxButtonNameStr);
virtual wxWindow *SetDefault(); virtual wxWindow *SetDefault() wxOVERRIDE;
// implementation only // implementation only
virtual int GetEventType() const wxOVERRIDE { return wxEVT_BUTTON; } virtual int GetEventType() const wxOVERRIDE { return wxEVT_BUTTON; }

38
include/wx/qt/calctrl.h
View File

@@ -39,41 +39,41 @@ public:
long style = wxCAL_SHOW_HOLIDAYS, long style = wxCAL_SHOW_HOLIDAYS,
const wxString& name = wxCalendarNameStr); const wxString& name = wxCalendarNameStr);
virtual bool SetDate(const wxDateTime& date); virtual bool SetDate(const wxDateTime& date) wxOVERRIDE;
virtual wxDateTime GetDate() const; virtual wxDateTime GetDate() const wxOVERRIDE;
virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime,
const wxDateTime& upperdate = wxDefaultDateTime); const wxDateTime& upperdate = wxDefaultDateTime) wxOVERRIDE;
virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const; virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const wxOVERRIDE;
virtual bool EnableMonthChange(bool enable = true); virtual bool EnableMonthChange(bool enable = true) wxOVERRIDE;
virtual void Mark(size_t day, bool mark); virtual void Mark(size_t day, bool mark) wxOVERRIDE;
// holidays colours // holidays colours
virtual void SetHoliday(size_t day); virtual void SetHoliday(size_t day) wxOVERRIDE;
virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg); virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE;
virtual const wxColour& GetHolidayColourFg() const { return m_colHolidayFg; } virtual const wxColour& GetHolidayColourFg() const wxOVERRIDE { return m_colHolidayFg; }
virtual const wxColour& GetHolidayColourBg() const { return m_colHolidayBg; } virtual const wxColour& GetHolidayColourBg() const wxOVERRIDE { return m_colHolidayBg; }
// header colours // header colours
virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg); virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE;
virtual const wxColour& GetHeaderColourFg() const { return m_colHeaderFg; } virtual const wxColour& GetHeaderColourFg() const wxOVERRIDE { return m_colHeaderFg; }
virtual const wxColour& GetHeaderColourBg() const { return m_colHeaderBg; } virtual const wxColour& GetHeaderColourBg() const wxOVERRIDE { return m_colHeaderBg; }
// day attributes // day attributes
virtual wxCalendarDateAttr *GetAttr(size_t day) const; virtual wxCalendarDateAttr *GetAttr(size_t day) const wxOVERRIDE;
virtual void SetAttr(size_t day, wxCalendarDateAttr *attr); virtual void SetAttr(size_t day, wxCalendarDateAttr *attr) wxOVERRIDE;
virtual void ResetAttr(size_t day) { SetAttr(day, NULL); } virtual void ResetAttr(size_t day) wxOVERRIDE { SetAttr(day, NULL); }
virtual void SetWindowStyleFlag(long style); virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
using wxCalendarCtrlBase::GenerateAllChangeEvents; using wxCalendarCtrlBase::GenerateAllChangeEvents;
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
protected: protected:
virtual void RefreshHolidays(); virtual void RefreshHolidays() wxOVERRIDE;
private: private:
void Init(); void Init();

10
include/wx/qt/checkbox.h
View File

@@ -29,17 +29,17 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr ); const wxString& name = wxCheckBoxNameStr );
virtual void SetValue(bool value); virtual void SetValue(bool value) wxOVERRIDE;
virtual bool GetValue() const; virtual bool GetValue() const wxOVERRIDE;
virtual void SetLabel(const wxString& label) wxOVERRIDE; virtual void SetLabel(const wxString& label) wxOVERRIDE;
virtual wxString GetLabel() const wxOVERRIDE; virtual wxString GetLabel() const wxOVERRIDE;
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
protected: protected:
virtual void DoSet3StateValue(wxCheckBoxState state); virtual void DoSet3StateValue(wxCheckBoxState state) wxOVERRIDE;
virtual wxCheckBoxState DoGet3StateValue() const; virtual wxCheckBoxState DoGet3StateValue() const wxOVERRIDE;
private: private:
QCheckBox *m_qtCheckBox; QCheckBox *m_qtCheckBox;

6
include/wx/qt/checklst.h
View File

@@ -46,11 +46,11 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr); const wxString& name = wxListBoxNameStr);
virtual bool IsChecked(unsigned int item) const; virtual bool IsChecked(unsigned int item) const wxOVERRIDE;
virtual void Check(unsigned int item, bool check = true); virtual void Check(unsigned int item, bool check = true) wxOVERRIDE;
private: private:
virtual void Init(); //common construction virtual void Init() wxOVERRIDE; //common construction
wxDECLARE_DYNAMIC_CLASS(wxCheckListBox); wxDECLARE_DYNAMIC_CLASS(wxCheckListBox);
}; };

26
include/wx/qt/choice.h
View File

@@ -47,29 +47,29 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr ); const wxString& name = wxChoiceNameStr );
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const 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 void SetSelection(int n); virtual void SetSelection(int n) wxOVERRIDE;
virtual int GetSelection() const; virtual int GetSelection() const wxOVERRIDE;
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
protected: protected:
virtual int DoInsertItems(const wxArrayStringsAdapter & items, virtual int DoInsertItems(const wxArrayStringsAdapter & items,
unsigned int pos, unsigned int pos,
void **clientData, void **clientData,
wxClientDataType type); wxClientDataType type) wxOVERRIDE;
virtual int DoInsertOneItem(const wxString& item, unsigned int pos); virtual int DoInsertOneItem(const wxString& item, unsigned int pos) 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;
virtual void DoClear(); virtual void DoClear() wxOVERRIDE;
virtual void DoDeleteOneItem(unsigned int pos); virtual void DoDeleteOneItem(unsigned int pos) wxOVERRIDE;
void QtInitSort(QComboBox *combo); void QtInitSort(QComboBox *combo);

18
include/wx/qt/clipbrd.h
View File

@@ -18,16 +18,16 @@ public:
wxClipboard(); wxClipboard();
~wxClipboard(); ~wxClipboard();
virtual bool Open(); virtual bool Open() wxOVERRIDE;
virtual void Close(); virtual void Close() wxOVERRIDE;
virtual bool IsOpened() const; virtual bool IsOpened() const wxOVERRIDE;
virtual bool AddData( wxDataObject *data ); virtual bool AddData( wxDataObject *data ) wxOVERRIDE;
virtual bool SetData( wxDataObject *data ); virtual bool SetData( wxDataObject *data ) wxOVERRIDE;
virtual bool GetData( wxDataObject& data ); virtual bool GetData( wxDataObject& data ) wxOVERRIDE;
virtual void Clear(); virtual void Clear() wxOVERRIDE;
virtual bool IsSupported( const wxDataFormat& format ); virtual bool IsSupported( const wxDataFormat& format ) wxOVERRIDE;
virtual bool IsSupportedAsync(wxEvtHandler *sink); virtual bool IsSupportedAsync(wxEvtHandler *sink) wxOVERRIDE;
private: private:
friend class QtClipBoardSignalHandler; friend class QtClipBoardSignalHandler;

2
include/wx/qt/clrpicker.h
View File

@@ -42,7 +42,7 @@ public:
const wxString& name = wxColourPickerWidgetNameStr); const wxString& name = wxColourPickerWidgetNameStr);
protected: protected:
virtual void UpdateColour(); virtual void UpdateColour() wxOVERRIDE;
private: private:
}; };

12
include/wx/qt/colour.h
View File

@@ -18,12 +18,12 @@ public:
DEFINE_STD_WXCOLOUR_CONSTRUCTORS DEFINE_STD_WXCOLOUR_CONSTRUCTORS
wxColour(const QColor& color); wxColour(const QColor& color);
virtual bool IsOk() const { return m_valid; } virtual bool IsOk() const wxOVERRIDE { return m_valid; }
ChannelType Red() const { return m_red; } ChannelType Red() const wxOVERRIDE { return m_red; }
ChannelType Green() const { return m_green; } ChannelType Green() const wxOVERRIDE { return m_green; }
ChannelType Blue() const { return m_blue; } ChannelType Blue() const wxOVERRIDE { return m_blue; }
ChannelType Alpha() const { return m_alpha; } ChannelType Alpha() const wxOVERRIDE { return m_alpha; }
bool operator==(const wxColour& color) const; bool operator==(const wxColour& color) const;
bool operator!=(const wxColour& color) const; bool operator!=(const wxColour& color) const;
@@ -34,7 +34,7 @@ public:
protected: protected:
void Init(); void Init();
virtual void InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a); virtual void InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) wxOVERRIDE;
private: private:
ChannelType m_red, m_green, m_blue, m_alpha; ChannelType m_red, m_green, m_blue, m_alpha;

2
include/wx/qt/control.h
View File

@@ -24,7 +24,7 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxControlNameStr); const wxString& name = wxControlNameStr);
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
protected: protected:
bool QtCreateControl( wxWindow *parent, wxWindowID id, const wxPoint &pos, bool QtCreateControl( wxWindow *parent, wxWindowID id, const wxPoint &pos,

6
include/wx/qt/cursor.h
View File

@@ -27,7 +27,7 @@ public:
int hotSpotX = 0, int hotSpotY = 0); int hotSpotX = 0, int hotSpotY = 0);
#endif #endif
virtual wxPoint GetHotSpot() const; virtual wxPoint GetHotSpot() const wxOVERRIDE;
QCursor &GetHandle() const; QCursor &GetHandle() const;
protected: protected:
@@ -38,8 +38,8 @@ protected:
private: private:
void Init(); void Init();
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxCursor); wxDECLARE_DYNAMIC_CLASS(wxCursor);
}; };

78
include/wx/qt/dc.h
View File

@@ -19,73 +19,73 @@ public:
wxQtDCImpl( wxDC *owner ); wxQtDCImpl( wxDC *owner );
~wxQtDCImpl(); ~wxQtDCImpl();
virtual bool CanDrawBitmap() const; virtual bool CanDrawBitmap() const wxOVERRIDE;
virtual bool CanGetTextExtent() const; virtual bool CanGetTextExtent() const wxOVERRIDE;
virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
virtual void DoGetSizeMM(int* width, int* height) const; virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE;
virtual int GetDepth() const; virtual int GetDepth() const wxOVERRIDE;
virtual wxSize GetPPI() const; virtual wxSize GetPPI() const wxOVERRIDE;
virtual void SetFont(const wxFont& font); virtual void SetFont(const wxFont& font) wxOVERRIDE;
virtual void SetPen(const wxPen& pen); virtual void SetPen(const wxPen& pen) wxOVERRIDE;
virtual void SetBrush(const wxBrush& brush); virtual void SetBrush(const wxBrush& brush) wxOVERRIDE;
virtual void SetBackground(const wxBrush& brush); virtual void SetBackground(const wxBrush& brush) wxOVERRIDE;
virtual void SetBackgroundMode(int mode); virtual void SetBackgroundMode(int mode) wxOVERRIDE;
#if wxUSE_PALETTE #if wxUSE_PALETTE
virtual void SetPalette(const wxPalette& palette); virtual void SetPalette(const wxPalette& palette) wxOVERRIDE;
#endif // wxUSE_PALETTE #endif // wxUSE_PALETTE
virtual void SetLogicalFunction(wxRasterOperationMode function); virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE;
virtual wxCoord GetCharHeight() const; virtual wxCoord GetCharHeight() const wxOVERRIDE;
virtual wxCoord GetCharWidth() const; virtual wxCoord GetCharWidth() const wxOVERRIDE;
virtual void DoGetTextExtent(const wxString& string, virtual void DoGetTextExtent(const wxString& string,
wxCoord *x, wxCoord *y, wxCoord *x, wxCoord *y,
wxCoord *descent = NULL, wxCoord *descent = NULL,
wxCoord *externalLeading = NULL, wxCoord *externalLeading = NULL,
const wxFont *theFont = NULL) const; const wxFont *theFont = NULL) const wxOVERRIDE;
virtual void Clear(); virtual void Clear() wxOVERRIDE;
virtual void DoSetClippingRegion(wxCoord x, wxCoord y, virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
wxCoord width, wxCoord height); wxCoord width, wxCoord height) wxOVERRIDE;
virtual void DoSetDeviceClippingRegion(const wxRegion& region); virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE;
virtual void DestroyClippingRegion(); virtual void DestroyClippingRegion() wxOVERRIDE;
virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
wxFloodFillStyle style = wxFLOOD_SURFACE); wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE;
virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const; virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE;
virtual void DoDrawPoint(wxCoord x, wxCoord y); virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE;
virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE;
virtual void DoDrawArc(wxCoord x1, wxCoord y1, virtual void DoDrawArc(wxCoord x1, wxCoord y1,
wxCoord x2, wxCoord y2, wxCoord x2, wxCoord y2,
wxCoord xc, wxCoord yc); wxCoord xc, wxCoord yc) wxOVERRIDE;
virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
double sa, double ea); double sa, double ea) wxOVERRIDE;
virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
wxCoord width, wxCoord height, wxCoord width, wxCoord height,
double radius); double radius) wxOVERRIDE;
virtual void DoDrawEllipse(wxCoord x, wxCoord y, virtual void DoDrawEllipse(wxCoord x, wxCoord y,
wxCoord width, wxCoord height); wxCoord width, wxCoord height) wxOVERRIDE;
virtual void DoCrossHair(wxCoord x, wxCoord y); virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE;
virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y); virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE;
virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
bool useMask = false); bool useMask = false) wxOVERRIDE;
virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y); virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE;
virtual void DoDrawRotatedText(const wxString& text, virtual void DoDrawRotatedText(const wxString& text,
wxCoord x, wxCoord y, double angle); wxCoord x, wxCoord y, double angle) wxOVERRIDE;
virtual bool DoBlit(wxCoord xdest, wxCoord ydest, virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
wxCoord width, wxCoord height, wxCoord width, wxCoord height,
@@ -94,21 +94,21 @@ public:
wxRasterOperationMode rop = wxCOPY, wxRasterOperationMode rop = wxCOPY,
bool useMask = false, bool useMask = false,
wxCoord xsrcMask = wxDefaultCoord, wxCoord xsrcMask = wxDefaultCoord,
wxCoord ysrcMask = wxDefaultCoord); wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE;
virtual void DoDrawLines(int n, const wxPoint points[], virtual void DoDrawLines(int n, const wxPoint points[],
wxCoord xoffset, wxCoord yoffset ); wxCoord xoffset, wxCoord yoffset ) wxOVERRIDE;
virtual void DoDrawPolygon(int n, const wxPoint points[], virtual void DoDrawPolygon(int n, const wxPoint points[],
wxCoord xoffset, wxCoord yoffset, wxCoord xoffset, wxCoord yoffset,
wxPolygonFillMode fillStyle = wxODDEVEN_RULE); wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE;
// Use Qt transformations, as they automatically scale pen widths, text... // Use Qt transformations, as they automatically scale pen widths, text...
virtual void ComputeScaleAndOrigin(); virtual void ComputeScaleAndOrigin() wxOVERRIDE;
void QtPreparePainter(); void QtPreparePainter();
virtual void* GetHandle() const { return (void*) m_qtPainter; } virtual void* GetHandle() const wxOVERRIDE { return (void*) m_qtPainter; }
protected: protected:
virtual QPixmap *GetQPixmap() { return m_qtPixmap; } virtual QPixmap *GetQPixmap() { return m_qtPixmap; }

8
include/wx/qt/dcmemory.h
View File

@@ -18,11 +18,11 @@ public:
wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
~wxMemoryDCImpl(); ~wxMemoryDCImpl();
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE;
virtual void DoSelect(const wxBitmap& bitmap); virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE;
virtual const wxBitmap& GetSelectedBitmap() const; virtual const wxBitmap& GetSelectedBitmap() const wxOVERRIDE;
virtual wxBitmap& GetSelectedBitmap(); virtual wxBitmap& GetSelectedBitmap() wxOVERRIDE;
private: private:
wxBitmap m_selected; wxBitmap m_selected;

72
include/wx/qt/dcprint.h
View File

@@ -15,72 +15,72 @@ class WXDLLIMPEXP_CORE wxPrinterDCImpl : public wxDCImpl
public: public:
wxPrinterDCImpl( wxPrinterDC *, const wxPrintData & ); wxPrinterDCImpl( wxPrinterDC *, const wxPrintData & );
virtual bool CanDrawBitmap() const; virtual bool CanDrawBitmap() const wxOVERRIDE;
virtual bool CanGetTextExtent() const; virtual bool CanGetTextExtent() const wxOVERRIDE;
virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
virtual void DoGetSizeMM(int* width, int* height) const; virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE;
virtual int GetDepth() const; virtual int GetDepth() const wxOVERRIDE;
virtual wxSize GetPPI() const; virtual wxSize GetPPI() const wxOVERRIDE;
virtual void SetFont(const wxFont& font); virtual void SetFont(const wxFont& font) wxOVERRIDE;
virtual void SetPen(const wxPen& pen); virtual void SetPen(const wxPen& pen) wxOVERRIDE;
virtual void SetBrush(const wxBrush& brush); virtual void SetBrush(const wxBrush& brush) wxOVERRIDE;
virtual void SetBackground(const wxBrush& brush); virtual void SetBackground(const wxBrush& brush) wxOVERRIDE;
virtual void SetBackgroundMode(int mode); virtual void SetBackgroundMode(int mode) wxOVERRIDE;
#if wxUSE_PALETTE #if wxUSE_PALETTE
virtual void SetPalette(const wxPalette& palette); virtual void SetPalette(const wxPalette& palette) wxOVERRIDE;
#endif // wxUSE_PALETTE #endif // wxUSE_PALETTE
virtual void SetLogicalFunction(wxRasterOperationMode function); virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE;
virtual wxCoord GetCharHeight() const; virtual wxCoord GetCharHeight() const wxOVERRIDE;
virtual wxCoord GetCharWidth() const; virtual wxCoord GetCharWidth() const wxOVERRIDE;
virtual void DoGetTextExtent(const wxString& string, virtual void DoGetTextExtent(const wxString& string,
wxCoord *x, wxCoord *y, wxCoord *x, wxCoord *y,
wxCoord *descent = NULL, wxCoord *descent = NULL,
wxCoord *externalLeading = NULL, wxCoord *externalLeading = NULL,
const wxFont *theFont = NULL) const; const wxFont *theFont = NULL) const wxOVERRIDE;
virtual void Clear(); virtual void Clear() wxOVERRIDE;
virtual void DoSetClippingRegion(wxCoord x, wxCoord y, virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
wxCoord width, wxCoord height); wxCoord width, wxCoord height) wxOVERRIDE;
virtual void DoSetDeviceClippingRegion(const wxRegion& region); virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE;
virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
wxFloodFillStyle style = wxFLOOD_SURFACE); wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE;
virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const; virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE;
virtual void DoDrawPoint(wxCoord x, wxCoord y); virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE;
virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE;
virtual void DoDrawArc(wxCoord x1, wxCoord y1, virtual void DoDrawArc(wxCoord x1, wxCoord y1,
wxCoord x2, wxCoord y2, wxCoord x2, wxCoord y2,
wxCoord xc, wxCoord yc); wxCoord xc, wxCoord yc) wxOVERRIDE;
virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
double sa, double ea); double sa, double ea) wxOVERRIDE;
virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
wxCoord width, wxCoord height, wxCoord width, wxCoord height,
double radius); double radius) wxOVERRIDE;
virtual void DoDrawEllipse(wxCoord x, wxCoord y, virtual void DoDrawEllipse(wxCoord x, wxCoord y,
wxCoord width, wxCoord height); wxCoord width, wxCoord height) wxOVERRIDE;
virtual void DoCrossHair(wxCoord x, wxCoord y); virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE;
virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y); virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE;
virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
bool useMask = false); bool useMask = false) wxOVERRIDE;
virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y); virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE;
virtual void DoDrawRotatedText(const wxString& text, virtual void DoDrawRotatedText(const wxString& text,
wxCoord x, wxCoord y, double angle); wxCoord x, wxCoord y, double angle) wxOVERRIDE;
virtual bool DoBlit(wxCoord xdest, wxCoord ydest, virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
wxCoord width, wxCoord height, wxCoord width, wxCoord height,
@@ -89,14 +89,14 @@ public:
wxRasterOperationMode rop = wxCOPY, wxRasterOperationMode rop = wxCOPY,
bool useMask = false, bool useMask = false,
wxCoord xsrcMask = wxDefaultCoord, wxCoord xsrcMask = wxDefaultCoord,
wxCoord ysrcMask = wxDefaultCoord); wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE;
virtual void DoDrawLines(int n, const wxPoint points[], virtual void DoDrawLines(int n, const wxPoint points[],
wxCoord xoffset, wxCoord yoffset ); wxCoord xoffset, wxCoord yoffset ) wxOVERRIDE;
virtual void DoDrawPolygon(int n, const wxPoint points[], virtual void DoDrawPolygon(int n, const wxPoint points[],
wxCoord xoffset, wxCoord yoffset, wxCoord xoffset, wxCoord yoffset,
wxPolygonFillMode fillStyle = wxODDEVEN_RULE); wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE;
private: private:
wxDECLARE_CLASS(wxPrinterDCImpl); wxDECLARE_CLASS(wxPrinterDCImpl);

2
include/wx/qt/dnd.h
View File

@@ -46,7 +46,7 @@ public:
const wxCursor &move = wxNullCursor, const wxCursor &move = wxNullCursor,
const wxCursor &none = wxNullCursor); const wxCursor &none = wxNullCursor);
virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) wxOVERRIDE;
private: private:
wxWindow* m_parentWindow; wxWindow* m_parentWindow;

26
include/wx/qt/font.h
View File

@@ -53,33 +53,33 @@ public:
virtual int GetPointSize() const wxOVERRIDE; virtual int GetPointSize() const wxOVERRIDE;
virtual float GetFractionalPointSize() const wxOVERRIDE; virtual float GetFractionalPointSize() const wxOVERRIDE;
virtual wxSize GetPixelSize() const wxOVERRIDE; virtual wxSize GetPixelSize() const wxOVERRIDE;
virtual wxFontStyle GetStyle() const; virtual wxFontStyle GetStyle() const wxOVERRIDE;
virtual int GetNumericWeight() const wxOVERRIDE; virtual int GetNumericWeight() const wxOVERRIDE;
virtual bool GetUnderlined() const; virtual bool GetUnderlined() const wxOVERRIDE;
virtual wxString GetFaceName() const; virtual wxString GetFaceName() const wxOVERRIDE;
virtual wxFontEncoding GetEncoding() const; virtual wxFontEncoding GetEncoding() const wxOVERRIDE;
virtual const wxNativeFontInfo *GetNativeFontInfo() const; virtual const wxNativeFontInfo *GetNativeFontInfo() const wxOVERRIDE;
virtual bool GetStrikethrough() const wxOVERRIDE; virtual bool GetStrikethrough() const wxOVERRIDE;
// change the font characteristics // change the font characteristics
virtual void SetFractionalPointSize(float pointSize) wxOVERRIDE; virtual void SetFractionalPointSize(float pointSize) wxOVERRIDE;
virtual void SetPixelSize(const wxSize& pixelSize) wxOVERRIDE; virtual void SetPixelSize(const wxSize& pixelSize) wxOVERRIDE;
virtual void SetFamily( wxFontFamily family ); virtual void SetFamily( wxFontFamily family ) wxOVERRIDE;
virtual void SetStyle( wxFontStyle style ); virtual void SetStyle( wxFontStyle style ) wxOVERRIDE;
virtual void SetNumericWeight(int weight) wxOVERRIDE; virtual void SetNumericWeight(int weight) wxOVERRIDE;
virtual bool SetFaceName(const wxString& facename); virtual bool SetFaceName(const wxString& facename) wxOVERRIDE;
virtual void SetUnderlined( bool underlined ); virtual void SetUnderlined( bool underlined ) wxOVERRIDE;
virtual void SetStrikethrough(bool strikethrough) wxOVERRIDE; virtual void SetStrikethrough(bool strikethrough) wxOVERRIDE;
virtual void SetEncoding(wxFontEncoding encoding); virtual void SetEncoding(wxFontEncoding encoding) wxOVERRIDE;
wxDECLARE_COMMON_FONT_METHODS(); wxDECLARE_COMMON_FONT_METHODS();
virtual QFont GetHandle() const; virtual QFont GetHandle() const;
protected: protected:
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
virtual wxFontFamily DoGetFamily() const; virtual wxFontFamily DoGetFamily() const wxOVERRIDE;
virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info) wxOVERRIDE; virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info) wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxFont); wxDECLARE_DYNAMIC_CLASS(wxFont);

2
include/wx/qt/fontdlg.h
View File

@@ -18,7 +18,7 @@ public:
wxFontDialog(wxWindow *parent, const wxFontData& data) { Create(parent, data); } wxFontDialog(wxWindow *parent, const wxFontData& data) { Create(parent, data); }
protected: protected:
bool DoCreate(wxWindow *parent); bool DoCreate(wxWindow *parent) wxOVERRIDE;
private: private:

16
include/wx/qt/frame.h
View File

@@ -42,20 +42,20 @@ public:
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr); const wxString& name = wxFrameNameStr);
virtual void SetMenuBar(wxMenuBar *menubar); virtual void SetMenuBar(wxMenuBar *menubar) wxOVERRIDE;
virtual void SetStatusBar(wxStatusBar *statusBar ); virtual void SetStatusBar(wxStatusBar *statusBar ) wxOVERRIDE;
virtual void SetToolBar(wxToolBar *toolbar); virtual void SetToolBar(wxToolBar *toolbar) wxOVERRIDE;
virtual void SetWindowStyleFlag( long style ); virtual void SetWindowStyleFlag( long style ) wxOVERRIDE;
virtual void AddChild( wxWindowBase *child ); virtual void AddChild( wxWindowBase *child ) wxOVERRIDE;
virtual void RemoveChild( wxWindowBase *child ); virtual void RemoveChild( wxWindowBase *child ) wxOVERRIDE;
QMainWindow *GetQMainWindow() const; QMainWindow *GetQMainWindow() const;
virtual QScrollArea *QtGetScrollBarsContainer() const; virtual QScrollArea *QtGetScrollBarsContainer() const wxOVERRIDE;
protected: protected:
virtual void DoGetClientSize(int *width, int *height) const; virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
private: private:
// Common part of all ctors. // Common part of all ctors.

10
include/wx/qt/gauge.h
View File

@@ -33,14 +33,14 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxGaugeNameStr); const wxString& name = wxGaugeNameStr);
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
// set/get the control range // set/get the control range
virtual void SetRange(int range); virtual void SetRange(int range) wxOVERRIDE;
virtual int GetRange() const; virtual int GetRange() const wxOVERRIDE;
virtual void SetValue(int pos); virtual void SetValue(int pos) wxOVERRIDE;
virtual int GetValue() const; virtual int GetValue() const wxOVERRIDE;
private: private:
QProgressBar *m_qtProgressBar; QProgressBar *m_qtProgressBar;

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

@@ -75,7 +75,7 @@ public:
const int *attribList = NULL, const int *attribList = NULL,
const wxPalette& palette = wxNullPalette); const wxPalette& palette = wxNullPalette);
virtual bool SwapBuffers(); virtual bool SwapBuffers() wxOVERRIDE;
static bool ConvertWXAttrsToQtGL(const int *wxattrs, QGLFormat &format); static bool ConvertWXAttrsToQtGL(const int *wxattrs, QGLFormat &format);

24
include/wx/qt/listbox.h
View File

@@ -52,13 +52,13 @@ public:
virtual bool IsSelected(int n) const wxOVERRIDE; virtual bool IsSelected(int n) const wxOVERRIDE;
virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE; virtual int GetSelections(wxArrayInt& aSelections) const 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 GetSelection() const; virtual int GetSelection() const wxOVERRIDE;
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
void QtSendEvent(wxEventType evtType, const QModelIndex &index, bool selected); void QtSendEvent(wxEventType evtType, const QModelIndex &index, bool selected);
@@ -70,16 +70,16 @@ protected:
virtual int DoInsertItems(const wxArrayStringsAdapter & items, virtual int DoInsertItems(const wxArrayStringsAdapter & items,
unsigned int pos, unsigned int pos,
void **clientData, void **clientData,
wxClientDataType type); wxClientDataType type) wxOVERRIDE;
virtual int DoInsertOneItem(const wxString& item, unsigned int pos); virtual int DoInsertOneItem(const wxString& item, unsigned int pos) 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;
virtual void DoClear(); virtual void DoClear() wxOVERRIDE;
virtual void DoDeleteOneItem(unsigned int pos); virtual void DoDeleteOneItem(unsigned int pos) wxOVERRIDE;
virtual QScrollArea *QtGetScrollBarsContainer() const; virtual QScrollArea *QtGetScrollBarsContainer() const wxOVERRIDE;
#if wxUSE_CHECKLISTBOX #if wxUSE_CHECKLISTBOX
bool m_hasCheckBoxes; bool m_hasCheckBoxes;

28
include/wx/qt/listctrl.h
View File

@@ -42,20 +42,20 @@ public:
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Set the control colours // Set the control colours
bool SetForegroundColour(const wxColour& col); bool SetForegroundColour(const wxColour& col) wxOVERRIDE;
bool SetBackgroundColour(const wxColour& col); bool SetBackgroundColour(const wxColour& col) wxOVERRIDE;
// Gets information about this column // Gets information about this column
bool GetColumn(int col, wxListItem& info) const; bool GetColumn(int col, wxListItem& info) const wxOVERRIDE;
// Sets information about this column // Sets information about this column
bool SetColumn(int col, const wxListItem& info); bool SetColumn(int col, const wxListItem& info) wxOVERRIDE;
// Gets the column width // Gets the column width
int GetColumnWidth(int col) const; int GetColumnWidth(int col) const wxOVERRIDE;
// Sets the column width // Sets the column width
bool SetColumnWidth(int col, int width); bool SetColumnWidth(int col, int width) wxOVERRIDE;
// Gets the column order from its index or index from its order // Gets the column order from its index or index from its order
@@ -129,7 +129,7 @@ public:
int GetItemCount() const; int GetItemCount() const;
// Gets the number of columns in the list control // Gets the number of columns in the list control
int GetColumnCount() const; int GetColumnCount() const wxOVERRIDE;
// get the horizontal and vertical components of the item spacing // get the horizontal and vertical components of the item spacing
wxSize GetItemSpacing() const; wxSize GetItemSpacing() const;
@@ -163,7 +163,7 @@ public:
void SetSingleStyle(long style, bool add = true); void SetSingleStyle(long style, bool add = true);
// Set the whole window style // Set the whole window style
void SetWindowStyleFlag(long style); void SetWindowStyleFlag(long style) wxOVERRIDE;
// Searches for an item, starting from 'item'. // Searches for an item, starting from 'item'.
// item can be -1 to find the first item that matches the // item can be -1 to find the first item that matches the
@@ -172,11 +172,11 @@ public:
long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const; long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const;
// Gets one of the three image lists // Gets one of the three image lists
wxImageList *GetImageList(int which) const; wxImageList *GetImageList(int which) const wxOVERRIDE;
// Sets the image list // Sets the image list
void SetImageList(wxImageList *imageList, int which); void SetImageList(wxImageList *imageList, int which) wxOVERRIDE;
void AssignImageList(wxImageList *imageList, int which); void AssignImageList(wxImageList *imageList, int which) wxOVERRIDE;
// refresh items selectively (only useful for virtual list controls) // refresh items selectively (only useful for virtual list controls)
void RefreshItem(long item); void RefreshItem(long item);
@@ -195,10 +195,10 @@ public:
bool DeleteAllItems(); bool DeleteAllItems();
// Deletes a column // Deletes a column
bool DeleteColumn(int col); bool DeleteColumn(int col) wxOVERRIDE;
// Deletes all columns // Deletes all columns
bool DeleteAllColumns(); bool DeleteAllColumns() wxOVERRIDE;
// Clears items, and columns if there are any. // Clears items, and columns if there are any.
void ClearAll(); void ClearAll();
@@ -286,7 +286,7 @@ public:
return OnGetItemAttr(item); return OnGetItemAttr(item);
} }
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
protected: protected:
void Init(); void Init();

8
include/wx/qt/mdi.h
View File

@@ -33,8 +33,8 @@ public:
static bool IsTDI() { return false; } static bool IsTDI() { return false; }
virtual void ActivateNext(); virtual void ActivateNext() wxOVERRIDE;
virtual void ActivatePrevious(); virtual void ActivatePrevious() wxOVERRIDE;
protected: protected:
@@ -64,7 +64,7 @@ public:
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr); const wxString& name = wxFrameNameStr);
virtual void Activate(); virtual void Activate() wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxMDIChildFrame); wxDECLARE_DYNAMIC_CLASS(wxMDIChildFrame);
}; };
@@ -76,7 +76,7 @@ class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase
public: public:
wxMDIClientWindow(); wxMDIClientWindow();
virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL); virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL) wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow); wxDECLARE_DYNAMIC_CLASS(wxMDIClientWindow);
}; };

2
include/wx/qt/msgdlg.h
View File

@@ -22,7 +22,7 @@ public:
virtual ~wxMessageDialog(); virtual ~wxMessageDialog();
// Reimplemented to translate return codes from Qt to wx // Reimplemented to translate return codes from Qt to wx
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMessageDialog); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxMessageDialog);

24
include/wx/qt/notebook.h
View File

@@ -28,29 +28,29 @@ public:
long style = 0, long style = 0,
const wxString& name = wxNotebookNameStr); const wxString& name = wxNotebookNameStr);
virtual void SetPadding(const wxSize& padding); virtual void SetPadding(const wxSize& padding) wxOVERRIDE;
virtual void SetTabSize(const wxSize& sz); virtual void SetTabSize(const wxSize& sz) wxOVERRIDE;
virtual bool SetPageText(size_t n, const wxString& strText); virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE;
virtual wxString GetPageText(size_t n) const; virtual wxString GetPageText(size_t n) const wxOVERRIDE;
virtual int GetPageImage(size_t n) const; virtual int GetPageImage(size_t n) const wxOVERRIDE;
virtual bool SetPageImage(size_t n, int imageId); virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE;
virtual bool InsertPage(size_t n, wxWindow *page, const wxString& text, virtual bool InsertPage(size_t n, wxWindow *page, const wxString& text,
bool bSelect = false, int imageId = -1); bool bSelect = false, int imageId = -1) wxOVERRIDE;
virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE;
int SetSelection(size_t nPage); int SetSelection(size_t nPage) wxOVERRIDE;
int ChangeSelection(size_t nPage); int ChangeSelection(size_t nPage) wxOVERRIDE;
virtual bool DeleteAllPages() wxOVERRIDE; virtual bool DeleteAllPages() wxOVERRIDE;
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
protected: protected:
virtual wxWindow *DoRemovePage(size_t page); virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE;
private: private:
QTabWidget *m_qtTabWidget; QTabWidget *m_qtTabWidget;

4
include/wx/qt/palette.h
View File

@@ -20,8 +20,8 @@ public:
int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const; int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
protected: protected:
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS(wxPalette); wxDECLARE_DYNAMIC_CLASS(wxPalette);

34
include/wx/qt/pen.h
View File

@@ -23,23 +23,23 @@ public:
bool operator==(const wxPen& pen) const; bool operator==(const wxPen& pen) const;
bool operator!=(const wxPen& pen) const; bool operator!=(const wxPen& pen) const;
virtual void SetColour(const wxColour& col); virtual void SetColour(const wxColour& col) wxOVERRIDE;
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b); virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE;
virtual void SetWidth(int width); virtual void SetWidth(int width) wxOVERRIDE;
virtual void SetStyle(wxPenStyle style); virtual void SetStyle(wxPenStyle style) wxOVERRIDE;
virtual void SetStipple(const wxBitmap& stipple); virtual void SetStipple(const wxBitmap& stipple) wxOVERRIDE;
virtual void SetDashes(int nb_dashes, const wxDash *dash); virtual void SetDashes(int nb_dashes, const wxDash *dash) wxOVERRIDE;
virtual void SetJoin(wxPenJoin join); virtual void SetJoin(wxPenJoin join) wxOVERRIDE;
virtual void SetCap(wxPenCap cap); virtual void SetCap(wxPenCap cap) wxOVERRIDE;
virtual wxColour GetColour() const; virtual wxColour GetColour() const wxOVERRIDE;
virtual wxBitmap *GetStipple() const; virtual wxBitmap *GetStipple() const wxOVERRIDE;
virtual wxPenStyle GetStyle() const; virtual wxPenStyle GetStyle() const wxOVERRIDE;
virtual wxPenJoin GetJoin() const; virtual wxPenJoin GetJoin() const wxOVERRIDE;
virtual wxPenCap GetCap() const; virtual wxPenCap GetCap() const wxOVERRIDE;
virtual int GetWidth() const; virtual int GetWidth() const wxOVERRIDE;
virtual int GetDashes(wxDash **ptr) const; virtual int GetDashes(wxDash **ptr) const wxOVERRIDE;
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants") wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxPenStyle)style); } void SetStyle(int style) { SetStyle((wxPenStyle)style); }
@@ -47,8 +47,8 @@ public:
QPen GetHandle() const; QPen GetHandle() const;
protected: protected:
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS(wxPen); wxDECLARE_DYNAMIC_CLASS(wxPen);

14
include/wx/qt/printdlg.h
View File

@@ -16,10 +16,10 @@ class WXDLLIMPEXP_CORE wxQtPrintNativeData: public wxPrintNativeDataBase
public: public:
wxQtPrintNativeData(); wxQtPrintNativeData();
virtual bool TransferTo( wxPrintData &data ); virtual bool TransferTo( wxPrintData &data ) wxOVERRIDE;
virtual bool TransferFrom( const wxPrintData &data ); virtual bool TransferFrom( const wxPrintData &data ) wxOVERRIDE;
virtual bool IsOk() const; virtual bool IsOk() const wxOVERRIDE;
}; };
@@ -29,9 +29,9 @@ public:
wxQtPrintDialog(wxWindow *parent, wxPrintDialogData *data); wxQtPrintDialog(wxWindow *parent, wxPrintDialogData *data);
wxQtPrintDialog(wxWindow *parent, wxPrintData *data); wxQtPrintDialog(wxWindow *parent, wxPrintData *data);
virtual wxPrintDialogData& GetPrintDialogData(); virtual wxPrintDialogData& GetPrintDialogData() wxOVERRIDE;
virtual wxPrintData& GetPrintData(); virtual wxPrintData& GetPrintData() wxOVERRIDE;
virtual wxDC *GetPrintDC(); virtual wxDC *GetPrintDC() wxOVERRIDE;
protected: protected:
@@ -48,7 +48,7 @@ public:
bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL); bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL);
virtual wxPageSetupDialogData& GetPageSetupDialogData(); virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE;
private: private:
}; };

10
include/wx/qt/printqt.h
View File

@@ -15,9 +15,9 @@ class WXDLLIMPEXP_CORE wxQtPrinter : public wxPrinterBase
public: public:
wxQtPrinter( wxPrintDialogData *data = NULL ); wxQtPrinter( wxPrintDialogData *data = NULL );
virtual bool Setup(wxWindow *parent); virtual bool Setup(wxWindow *parent) wxOVERRIDE;
virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true); virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) wxOVERRIDE;
virtual wxDC* PrintDialog(wxWindow *parent); virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE;
private: private:
}; };
@@ -33,8 +33,8 @@ public:
wxPrintout *printoutForPrinting, wxPrintout *printoutForPrinting,
wxPrintData *data); wxPrintData *data);
virtual bool Print(bool interactive); virtual bool Print(bool interactive) wxOVERRIDE;
virtual void DetermineScaling(); virtual void DetermineScaling() wxOVERRIDE;
protected: protected:
}; };

8
include/wx/qt/private/timer.h
View File

@@ -23,12 +23,12 @@ class WXDLLIMPEXP_CORE wxQtTimerImpl : public wxTimerImpl, QObject
public: public:
wxQtTimerImpl( wxTimer* timer ); wxQtTimerImpl( wxTimer* timer );
virtual bool Start( int millisecs = -1, bool oneShot = false ); virtual bool Start( int millisecs = -1, bool oneShot = false ) wxOVERRIDE;
virtual void Stop(); virtual void Stop() wxOVERRIDE;
virtual bool IsRunning() const; virtual bool IsRunning() const wxOVERRIDE;
protected: protected:
virtual void timerEvent( QTimerEvent * event ); virtual void timerEvent( QTimerEvent * event ) wxOVERRIDE;
private: private:
int m_timerId; int m_timerId;

40
include/wx/qt/private/winevent.h
View File

@@ -67,7 +67,7 @@ public:
{ {
} }
virtual Handler *GetHandler() const virtual Handler *GetHandler() const wxOVERRIDE
{ {
// Only process the signal / event if the wxWindow is not destroyed // Only process the signal / event if the wxWindow is not destroyed
if ( !wxWindow::QtRetrieveWindowPointer( this ) ) if ( !wxWindow::QtRetrieveWindowPointer( this ) )
@@ -84,7 +84,7 @@ protected:
* wxPowerEvent, wxScrollWinEvent, wxSysColourChangedEvent */ * wxPowerEvent, wxScrollWinEvent, wxSysColourChangedEvent */
//wxActivateEvent //wxActivateEvent
virtual void changeEvent ( QEvent * event ) virtual void changeEvent ( QEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -96,7 +96,7 @@ protected:
} }
//wxCloseEvent //wxCloseEvent
virtual void closeEvent ( QCloseEvent * event ) virtual void closeEvent ( QCloseEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -108,7 +108,7 @@ protected:
} }
//wxContextMenuEvent //wxContextMenuEvent
virtual void contextMenuEvent ( QContextMenuEvent * event ) virtual void contextMenuEvent ( QContextMenuEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -123,7 +123,7 @@ protected:
//virtual void dropEvent ( QDropEvent * event ) { } //virtual void dropEvent ( QDropEvent * event ) { }
//wxMouseEvent //wxMouseEvent
virtual void enterEvent ( QEvent * event ) virtual void enterEvent ( QEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -135,7 +135,7 @@ protected:
} }
//wxFocusEvent. //wxFocusEvent.
virtual void focusInEvent ( QFocusEvent * event ) virtual void focusInEvent ( QFocusEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -147,7 +147,7 @@ protected:
} }
//wxFocusEvent. //wxFocusEvent.
virtual void focusOutEvent ( QFocusEvent * event ) virtual void focusOutEvent ( QFocusEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -159,7 +159,7 @@ protected:
} }
//wxShowEvent //wxShowEvent
virtual void hideEvent ( QHideEvent * event ) virtual void hideEvent ( QHideEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -171,7 +171,7 @@ protected:
} }
//wxKeyEvent //wxKeyEvent
virtual void keyPressEvent ( QKeyEvent * event ) virtual void keyPressEvent ( QKeyEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -183,7 +183,7 @@ protected:
} }
//wxKeyEvent //wxKeyEvent
virtual void keyReleaseEvent ( QKeyEvent * event ) virtual void keyReleaseEvent ( QKeyEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -195,7 +195,7 @@ protected:
} }
//wxMouseEvent //wxMouseEvent
virtual void leaveEvent ( QEvent * event ) virtual void leaveEvent ( QEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -207,7 +207,7 @@ protected:
} }
//wxMouseEvent //wxMouseEvent
virtual void mouseDoubleClickEvent ( QMouseEvent * event ) virtual void mouseDoubleClickEvent ( QMouseEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -219,7 +219,7 @@ protected:
} }
//wxMouseEvent //wxMouseEvent
virtual void mouseMoveEvent ( QMouseEvent * event ) virtual void mouseMoveEvent ( QMouseEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -231,7 +231,7 @@ protected:
} }
//wxMouseEvent //wxMouseEvent
virtual void mousePressEvent ( QMouseEvent * event ) virtual void mousePressEvent ( QMouseEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -243,7 +243,7 @@ protected:
} }
//wxMouseEvent //wxMouseEvent
virtual void mouseReleaseEvent ( QMouseEvent * event ) virtual void mouseReleaseEvent ( QMouseEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -255,7 +255,7 @@ protected:
} }
//wxMoveEvent //wxMoveEvent
virtual void moveEvent ( QMoveEvent * event ) virtual void moveEvent ( QMoveEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -267,7 +267,7 @@ protected:
} }
//wxEraseEvent then wxPaintEvent //wxEraseEvent then wxPaintEvent
virtual void paintEvent ( QPaintEvent * event ) virtual void paintEvent ( QPaintEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -279,7 +279,7 @@ protected:
} }
//wxSizeEvent //wxSizeEvent
virtual void resizeEvent ( QResizeEvent * event ) virtual void resizeEvent ( QResizeEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -291,7 +291,7 @@ protected:
} }
//wxShowEvent //wxShowEvent
virtual void showEvent ( QShowEvent * event ) virtual void showEvent ( QShowEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;
@@ -303,7 +303,7 @@ protected:
} }
//wxMouseEvent //wxMouseEvent
virtual void wheelEvent ( QWheelEvent * event ) virtual void wheelEvent ( QWheelEvent * event ) wxOVERRIDE
{ {
if ( !this->GetHandler() ) if ( !this->GetHandler() )
return; return;

12
include/wx/qt/radiobox.h
View File

@@ -72,14 +72,14 @@ public:
virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE; virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE;
virtual bool IsItemShown(unsigned int n) const wxOVERRIDE; virtual bool IsItemShown(unsigned int n) const 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 void SetSelection(int n); virtual void SetSelection(int n) wxOVERRIDE;
virtual int GetSelection() const; virtual int GetSelection() const wxOVERRIDE;
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
private: private:
// The 'visual' group box: // The 'visual' group box:

2
include/wx/qt/radiobut.h
View File

@@ -35,7 +35,7 @@ public:
virtual void SetValue(bool value); virtual void SetValue(bool value);
virtual bool GetValue() const; virtual bool GetValue() const;
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
private: private:
QRadioButton *m_qtRadioButton; QRadioButton *m_qtRadioButton;

28
include/wx/qt/region.h
View File

@@ -24,29 +24,29 @@ public:
wxRegion(const wxBitmap& bmp); wxRegion(const wxBitmap& bmp);
wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0); wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0);
virtual bool IsEmpty() const; virtual bool IsEmpty() const wxOVERRIDE;
virtual void Clear(); virtual void Clear() wxOVERRIDE;
virtual const QRegion &GetHandle() const; virtual const QRegion &GetHandle() const;
virtual void QtSetRegion(QRegion region); // Hangs on to this region virtual void QtSetRegion(QRegion region); // Hangs on to this region
protected: protected:
virtual wxGDIRefData *CreateGDIRefData() const; virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
virtual bool DoIsEqual(const wxRegion& region) const; virtual bool DoIsEqual(const wxRegion& region) const wxOVERRIDE;
virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const wxOVERRIDE;
virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const; virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const wxOVERRIDE;
virtual wxRegionContain DoContainsRect(const wxRect& rect) const; virtual wxRegionContain DoContainsRect(const wxRect& rect) const wxOVERRIDE;
virtual bool DoOffset(wxCoord x, wxCoord y); virtual bool DoOffset(wxCoord x, wxCoord y) wxOVERRIDE;
virtual bool DoUnionWithRect(const wxRect& rect); virtual bool DoUnionWithRect(const wxRect& rect) wxOVERRIDE;
virtual bool DoUnionWithRegion(const wxRegion& region); virtual bool DoUnionWithRegion(const wxRegion& region) wxOVERRIDE;
virtual bool DoIntersect(const wxRegion& region); virtual bool DoIntersect(const wxRegion& region) wxOVERRIDE;
virtual bool DoSubtract(const wxRegion& region); virtual bool DoSubtract(const wxRegion& region) wxOVERRIDE;
virtual bool DoXor(const wxRegion& region); virtual bool DoXor(const wxRegion& region) wxOVERRIDE;
virtual bool DoCombine(const wxRegion& rgn, wxRegionOp op); virtual bool DoCombine(const wxRegion& rgn, wxRegionOp op);

14
include/wx/qt/scrolbar.h
View File

@@ -32,18 +32,18 @@ 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; virtual int GetThumbSize() const wxOVERRIDE;
virtual int GetPageSize() const; virtual int GetPageSize() const wxOVERRIDE;
virtual int GetRange() const; virtual int GetRange() const wxOVERRIDE;
virtual void SetThumbPosition(int viewStart); virtual void SetThumbPosition(int viewStart) wxOVERRIDE;
virtual void SetScrollbar(int position, int thumbSize, virtual void SetScrollbar(int position, int thumbSize,
int range, int pageSize, int range, int pageSize,
bool refresh = true); bool refresh = true) wxOVERRIDE;
QScrollBar *GetQScrollBar() const { return m_qtScrollBar; } QScrollBar *GetQScrollBar() const { return m_qtScrollBar; }
QWidget *GetHandle() const; QWidget *GetHandle() const wxOVERRIDE;
private: private:
QScrollBar *m_qtScrollBar; QScrollBar *m_qtScrollBar;

28
include/wx/qt/slider.h
View File

@@ -32,25 +32,25 @@ 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 value); virtual void SetValue(int value) wxOVERRIDE;
virtual void SetRange(int minValue, int maxValue); virtual void SetRange(int minValue, int maxValue) wxOVERRIDE;
virtual int GetMin() const; virtual int GetMin() const wxOVERRIDE;
virtual int GetMax() const; virtual int GetMax() const wxOVERRIDE;
virtual void DoSetTickFreq(int freq); virtual void DoSetTickFreq(int freq) wxOVERRIDE;
virtual int GetTickFreq() const; virtual int GetTickFreq() const wxOVERRIDE;
virtual void SetLineSize(int lineSize); virtual void SetLineSize(int lineSize) wxOVERRIDE;
virtual void SetPageSize(int pageSize); virtual void SetPageSize(int pageSize) wxOVERRIDE;
virtual int GetLineSize() const; virtual int GetLineSize() const wxOVERRIDE;
virtual int GetPageSize() const; virtual int GetPageSize() const wxOVERRIDE;
virtual void SetThumbLength(int lenPixels); virtual void SetThumbLength(int lenPixels) wxOVERRIDE;
virtual int GetThumbLength() const; virtual int GetThumbLength() const wxOVERRIDE;
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
private: private:
QSlider *m_qtSlider; QSlider *m_qtSlider;

6
include/wx/qt/spinbutt.h
View File

@@ -29,11 +29,11 @@ public:
long style = wxSP_VERTICAL, long style = wxSP_VERTICAL,
const wxString& name = wxSPIN_BUTTON_NAME); const wxString& name = wxSPIN_BUTTON_NAME);
virtual int GetValue() const; virtual int GetValue() const wxOVERRIDE;
virtual void SetValue(int val); virtual void SetValue(int val) wxOVERRIDE;
virtual void SetRange(int min, int max) wxOVERRIDE; virtual void SetRange(int min, int max) wxOVERRIDE;
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
private: private:
QSpinBox *m_qtSpinBox; QSpinBox *m_qtSpinBox;

18
include/wx/qt/spinctrl.h
View File

@@ -29,12 +29,12 @@ public:
T min, T max, T initial, T inc, T min, T max, T initial, T inc,
const wxString& name ); const wxString& name );
virtual void SetValue(const wxString&) {} virtual void SetValue(const wxString&) wxOVERRIDE {}
virtual void SetSnapToTicks(bool snap_to_ticks); virtual void SetSnapToTicks(bool snap_to_ticks) wxOVERRIDE;
virtual bool GetSnapToTicks() const; virtual bool GetSnapToTicks() const wxOVERRIDE;
virtual void SetSelection(long from, long to); virtual void SetSelection(long from, long to) wxOVERRIDE;
virtual void SetValue(T val); virtual void SetValue(T val);
void SetRange(T minVal, T maxVal); void SetRange(T minVal, T maxVal);
@@ -45,7 +45,7 @@ public:
T GetMax() const; T GetMax() const;
T GetIncrement() const; T GetIncrement() const;
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
protected: protected:
Widget *m_qtSpinBox; Widget *m_qtSpinBox;
@@ -75,8 +75,8 @@ public:
const wxString& name = wxT("wxSpinCtrl")); const wxString& name = wxT("wxSpinCtrl"));
virtual int GetBase() const wxOVERRIDE { return m_base; } virtual int GetBase() const wxOVERRIDE { return m_base; }
virtual bool SetBase(int base) wxOVERRIDE; virtual bool SetBase(int base) wxOVERRIDE;
virtual void SetValue(const wxString & val); virtual void SetValue(const wxString & val) wxOVERRIDE;
virtual void SetValue(int val) { wxSpinCtrlQt<int,QSpinBox>::SetValue(val); } virtual void SetValue(int val) wxOVERRIDE { wxSpinCtrlQt<int,QSpinBox>::SetValue(val); }
private: private:
// Common part of all ctors. // Common part of all ctors.
@@ -117,8 +117,8 @@ public:
virtual int GetBase() const wxOVERRIDE { return 10; } virtual int GetBase() const wxOVERRIDE { return 10; }
virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return false; } virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return false; }
virtual void SetValue(const wxString & val); virtual void SetValue(const wxString & val) wxOVERRIDE;
virtual void SetValue(double val) { wxSpinCtrlQt<double,QDoubleSpinBox>::SetValue(val); } virtual void SetValue(double val) wxOVERRIDE { wxSpinCtrlQt<double,QDoubleSpinBox>::SetValue(val); }
private: private:
wxDECLARE_DYNAMIC_CLASS( wxSpinCtrlDouble ); wxDECLARE_DYNAMIC_CLASS( wxSpinCtrlDouble );

10
include/wx/qt/statbmp.h
View File

@@ -30,12 +30,12 @@ public:
long style = 0, long style = 0,
const wxString& name = wxStaticBitmapNameStr); const wxString& name = wxStaticBitmapNameStr);
virtual void SetIcon(const wxIcon& icon); virtual void SetIcon(const wxIcon& icon) wxOVERRIDE;
virtual void SetBitmap(const wxBitmap& bitmap); virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE;
virtual wxBitmap GetBitmap() const; virtual wxBitmap GetBitmap() const wxOVERRIDE;
virtual wxIcon GetIcon() const; virtual wxIcon GetIcon() const wxOVERRIDE;
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
protected: protected:
private: private:

4
include/wx/qt/statbox.h
View File

@@ -29,9 +29,9 @@ public:
long style = 0, long style = 0,
const wxString& name = wxStaticBoxNameStr); const wxString& name = wxStaticBoxNameStr);
virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE;
virtual QWidget *GetHandle() const; virtual QWidget *GetHandle() const wxOVERRIDE;
virtual void SetLabel(const wxString& label) wxOVERRIDE; virtual void SetLabel(const wxString& label) wxOVERRIDE;
virtual wxString GetLabel() const wxOVERRIDE; virtual wxString GetLabel() const wxOVERRIDE;

Some files were not shown because too many files have changed in this diff Show More