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/qt/accel.h
View File

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

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

@@ -23,9 +23,9 @@ public:
// 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
void QtUpdateState();

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -47,29 +47,29 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr );
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual unsigned int GetCount() const;
virtual wxString GetString(unsigned int n) const;
virtual void SetString(unsigned int n, const wxString& s);
virtual unsigned int GetCount() const wxOVERRIDE;
virtual wxString GetString(unsigned int n) const wxOVERRIDE;
virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
virtual void SetSelection(int n);
virtual int GetSelection() const;
virtual void SetSelection(int n) wxOVERRIDE;
virtual int GetSelection() const wxOVERRIDE;
virtual QWidget *GetHandle() const;
virtual QWidget *GetHandle() const wxOVERRIDE;
protected:
virtual int DoInsertItems(const wxArrayStringsAdapter & items,
unsigned int pos,
void **clientData,
wxClientDataType type);
virtual int DoInsertOneItem(const wxString& item, unsigned int pos);
wxClientDataType type) wxOVERRIDE;
virtual int DoInsertOneItem(const wxString& item, unsigned int pos) wxOVERRIDE;
virtual void DoSetItemClientData(unsigned int n, void *clientData);
virtual void *DoGetItemClientData(unsigned int n) const;
virtual void DoSetItemClientData(unsigned int n, void *clientData) wxOVERRIDE;
virtual void *DoGetItemClientData(unsigned int n) const wxOVERRIDE;
virtual void DoClear();
virtual void DoDeleteOneItem(unsigned int pos);
virtual void DoClear() wxOVERRIDE;
virtual void DoDeleteOneItem(unsigned int pos) wxOVERRIDE;
void QtInitSort(QComboBox *combo);

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

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

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

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

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

@@ -18,12 +18,12 @@ public:
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
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 Green() const { return m_green; }
ChannelType Blue() const { return m_blue; }
ChannelType Alpha() const { return m_alpha; }
ChannelType Red() const wxOVERRIDE { return m_red; }
ChannelType Green() const wxOVERRIDE { return m_green; }
ChannelType Blue() const wxOVERRIDE { return m_blue; }
ChannelType Alpha() const wxOVERRIDE { return m_alpha; }
bool operator==(const wxColour& color) const;
bool operator!=(const wxColour& color) const;
@@ -34,7 +34,7 @@ public:
protected:
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:
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 wxString& name = wxControlNameStr);
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const wxOVERRIDE;
protected:
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);
#endif
virtual wxPoint GetHotSpot() const;
virtual wxPoint GetHotSpot() const wxOVERRIDE;
QCursor &GetHandle() const;
protected:
@@ -38,8 +38,8 @@ protected:
private:
void Init();
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS(wxCursor);
};

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

@@ -19,73 +19,73 @@ public:
wxQtDCImpl( wxDC *owner );
~wxQtDCImpl();
virtual bool CanDrawBitmap() const;
virtual bool CanGetTextExtent() const;
virtual bool CanDrawBitmap() const wxOVERRIDE;
virtual bool CanGetTextExtent() const wxOVERRIDE;
virtual void DoGetSize(int *width, int *height) const;
virtual void DoGetSizeMM(int* width, int* height) const;
virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE;
virtual int GetDepth() const;
virtual wxSize GetPPI() const;
virtual int GetDepth() const wxOVERRIDE;
virtual wxSize GetPPI() const wxOVERRIDE;
virtual void SetFont(const wxFont& font);
virtual void SetPen(const wxPen& pen);
virtual void SetBrush(const wxBrush& brush);
virtual void SetBackground(const wxBrush& brush);
virtual void SetBackgroundMode(int mode);
virtual void SetFont(const wxFont& font) wxOVERRIDE;
virtual void SetPen(const wxPen& pen) wxOVERRIDE;
virtual void SetBrush(const wxBrush& brush) wxOVERRIDE;
virtual void SetBackground(const wxBrush& brush) wxOVERRIDE;
virtual void SetBackgroundMode(int mode) wxOVERRIDE;
#if wxUSE_PALETTE
virtual void SetPalette(const wxPalette& palette);
virtual void SetPalette(const wxPalette& palette) wxOVERRIDE;
#endif // wxUSE_PALETTE
virtual void SetLogicalFunction(wxRasterOperationMode function);
virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE;
virtual wxCoord GetCharHeight() const;
virtual wxCoord GetCharWidth() const;
virtual wxCoord GetCharHeight() const wxOVERRIDE;
virtual wxCoord GetCharWidth() const wxOVERRIDE;
virtual void DoGetTextExtent(const wxString& string,
wxCoord *x, wxCoord *y,
wxCoord *descent = 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,
wxCoord width, wxCoord height);
wxCoord width, wxCoord height) wxOVERRIDE;
virtual void DoSetDeviceClippingRegion(const wxRegion& region);
virtual void DestroyClippingRegion();
virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE;
virtual void DestroyClippingRegion() wxOVERRIDE;
virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
wxFloodFillStyle style = wxFLOOD_SURFACE);
virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE;
virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE;
virtual void DoDrawPoint(wxCoord x, wxCoord y);
virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE;
virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE;
virtual void DoDrawArc(wxCoord x1, wxCoord y1,
wxCoord x2, wxCoord y2,
wxCoord xc, wxCoord yc);
wxCoord xc, wxCoord yc) wxOVERRIDE;
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,
wxCoord width, wxCoord height,
double radius);
double radius) wxOVERRIDE;
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,
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,
wxCoord x, wxCoord y, double angle);
wxCoord x, wxCoord y, double angle) wxOVERRIDE;
virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
wxCoord width, wxCoord height,
@@ -94,21 +94,21 @@ public:
wxRasterOperationMode rop = wxCOPY,
bool useMask = false,
wxCoord xsrcMask = wxDefaultCoord,
wxCoord ysrcMask = wxDefaultCoord);
wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE;
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[],
wxCoord xoffset, wxCoord yoffset,
wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE;
// Use Qt transformations, as they automatically scale pen widths, text...
virtual void ComputeScaleAndOrigin();
virtual void ComputeScaleAndOrigin() wxOVERRIDE;
void QtPreparePainter();
virtual void* GetHandle() const { return (void*) m_qtPainter; }
virtual void* GetHandle() const wxOVERRIDE { return (void*) m_qtPainter; }
protected:
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();
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
virtual void DoSelect(const wxBitmap& bitmap);
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE;
virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE;
virtual const wxBitmap& GetSelectedBitmap() const;
virtual wxBitmap& GetSelectedBitmap();
virtual const wxBitmap& GetSelectedBitmap() const wxOVERRIDE;
virtual wxBitmap& GetSelectedBitmap() wxOVERRIDE;
private:
wxBitmap m_selected;

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

@@ -15,72 +15,72 @@ class WXDLLIMPEXP_CORE wxPrinterDCImpl : public wxDCImpl
public:
wxPrinterDCImpl( wxPrinterDC *, const wxPrintData & );
virtual bool CanDrawBitmap() const;
virtual bool CanGetTextExtent() const;
virtual bool CanDrawBitmap() const wxOVERRIDE;
virtual bool CanGetTextExtent() const wxOVERRIDE;
virtual void DoGetSize(int *width, int *height) const;
virtual void DoGetSizeMM(int* width, int* height) const;
virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
virtual void DoGetSizeMM(int* width, int* height) const wxOVERRIDE;
virtual int GetDepth() const;
virtual wxSize GetPPI() const;
virtual int GetDepth() const wxOVERRIDE;
virtual wxSize GetPPI() const wxOVERRIDE;
virtual void SetFont(const wxFont& font);
virtual void SetPen(const wxPen& pen);
virtual void SetBrush(const wxBrush& brush);
virtual void SetBackground(const wxBrush& brush);
virtual void SetBackgroundMode(int mode);
virtual void SetFont(const wxFont& font) wxOVERRIDE;
virtual void SetPen(const wxPen& pen) wxOVERRIDE;
virtual void SetBrush(const wxBrush& brush) wxOVERRIDE;
virtual void SetBackground(const wxBrush& brush) wxOVERRIDE;
virtual void SetBackgroundMode(int mode) wxOVERRIDE;
#if wxUSE_PALETTE
virtual void SetPalette(const wxPalette& palette);
virtual void SetPalette(const wxPalette& palette) wxOVERRIDE;
#endif // wxUSE_PALETTE
virtual void SetLogicalFunction(wxRasterOperationMode function);
virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE;
virtual wxCoord GetCharHeight() const;
virtual wxCoord GetCharWidth() const;
virtual wxCoord GetCharHeight() const wxOVERRIDE;
virtual wxCoord GetCharWidth() const wxOVERRIDE;
virtual void DoGetTextExtent(const wxString& string,
wxCoord *x, wxCoord *y,
wxCoord *descent = 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,
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,
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 DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE;
virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE;
virtual void DoDrawArc(wxCoord x1, wxCoord y1,
wxCoord x2, wxCoord y2,
wxCoord xc, wxCoord yc);
wxCoord xc, wxCoord yc) wxOVERRIDE;
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,
wxCoord width, wxCoord height,
double radius);
double radius) wxOVERRIDE;
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,
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,
wxCoord x, wxCoord y, double angle);
wxCoord x, wxCoord y, double angle) wxOVERRIDE;
virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
wxCoord width, wxCoord height,
@@ -89,14 +89,14 @@ public:
wxRasterOperationMode rop = wxCOPY,
bool useMask = false,
wxCoord xsrcMask = wxDefaultCoord,
wxCoord ysrcMask = wxDefaultCoord);
wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE;
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[],
wxCoord xoffset, wxCoord yoffset,
wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE;
private:
wxDECLARE_CLASS(wxPrinterDCImpl);

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

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

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

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

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

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

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

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

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

@@ -75,7 +75,7 @@ public:
const int *attribList = NULL,
const wxPalette& palette = wxNullPalette);
virtual bool SwapBuffers();
virtual bool SwapBuffers() wxOVERRIDE;
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 int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE;
virtual unsigned int GetCount() const;
virtual wxString GetString(unsigned int n) const;
virtual void SetString(unsigned int n, const wxString& s);
virtual unsigned int GetCount() const wxOVERRIDE;
virtual wxString GetString(unsigned int n) const wxOVERRIDE;
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);
@@ -70,16 +70,16 @@ protected:
virtual int DoInsertItems(const wxArrayStringsAdapter & items,
unsigned int pos,
void **clientData,
wxClientDataType type);
virtual int DoInsertOneItem(const wxString& item, unsigned int pos);
wxClientDataType type) wxOVERRIDE;
virtual int DoInsertOneItem(const wxString& item, unsigned int pos) wxOVERRIDE;
virtual void DoSetItemClientData(unsigned int n, void *clientData);
virtual void *DoGetItemClientData(unsigned int n) const;
virtual void DoSetItemClientData(unsigned int n, void *clientData) wxOVERRIDE;
virtual void *DoGetItemClientData(unsigned int n) const wxOVERRIDE;
virtual void DoClear();
virtual void DoDeleteOneItem(unsigned int pos);
virtual void DoClear() wxOVERRIDE;
virtual void DoDeleteOneItem(unsigned int pos) wxOVERRIDE;
virtual QScrollArea *QtGetScrollBarsContainer() const;
virtual QScrollArea *QtGetScrollBarsContainer() const wxOVERRIDE;
#if wxUSE_CHECKLISTBOX
bool m_hasCheckBoxes;

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

@@ -42,20 +42,20 @@ public:
////////////////////////////////////////////////////////////////////////////
// Set the control colours
bool SetForegroundColour(const wxColour& col);
bool SetBackgroundColour(const wxColour& col);
bool SetForegroundColour(const wxColour& col) wxOVERRIDE;
bool SetBackgroundColour(const wxColour& col) wxOVERRIDE;
// 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
bool SetColumn(int col, const wxListItem& info);
bool SetColumn(int col, const wxListItem& info) wxOVERRIDE;
// Gets the column width
int GetColumnWidth(int col) const;
int GetColumnWidth(int col) const wxOVERRIDE;
// 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
@@ -129,7 +129,7 @@ public:
int GetItemCount() const;
// 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
wxSize GetItemSpacing() const;
@@ -163,7 +163,7 @@ public:
void SetSingleStyle(long style, bool add = true);
// Set the whole window style
void SetWindowStyleFlag(long style);
void SetWindowStyleFlag(long style) wxOVERRIDE;
// Searches for an item, starting from 'item'.
// 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;
// Gets one of the three image lists
wxImageList *GetImageList(int which) const;
wxImageList *GetImageList(int which) const wxOVERRIDE;
// Sets the image list
void SetImageList(wxImageList *imageList, int which);
void AssignImageList(wxImageList *imageList, int which);
void SetImageList(wxImageList *imageList, int which) wxOVERRIDE;
void AssignImageList(wxImageList *imageList, int which) wxOVERRIDE;
// refresh items selectively (only useful for virtual list controls)
void RefreshItem(long item);
@@ -195,10 +195,10 @@ public:
bool DeleteAllItems();
// Deletes a column
bool DeleteColumn(int col);
bool DeleteColumn(int col) wxOVERRIDE;
// Deletes all columns
bool DeleteAllColumns();
bool DeleteAllColumns() wxOVERRIDE;
// Clears items, and columns if there are any.
void ClearAll();
@@ -286,7 +286,7 @@ public:
return OnGetItemAttr(item);
}
virtual QWidget *GetHandle() const;
virtual QWidget *GetHandle() const wxOVERRIDE;
protected:
void Init();

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

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

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

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

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

@@ -28,29 +28,29 @@ public:
long style = 0,
const wxString& name = wxNotebookNameStr);
virtual void SetPadding(const wxSize& padding);
virtual void SetTabSize(const wxSize& sz);
virtual void SetPadding(const wxSize& padding) wxOVERRIDE;
virtual void SetTabSize(const wxSize& sz) wxOVERRIDE;
virtual bool SetPageText(size_t n, const wxString& strText);
virtual wxString GetPageText(size_t n) const;
virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE;
virtual wxString GetPageText(size_t n) const wxOVERRIDE;
virtual int GetPageImage(size_t n) const;
virtual bool SetPageImage(size_t n, int imageId);
virtual int GetPageImage(size_t n) const wxOVERRIDE;
virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE;
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 ChangeSelection(size_t nPage);
int SetSelection(size_t nPage) wxOVERRIDE;
int ChangeSelection(size_t nPage) wxOVERRIDE;
virtual bool DeleteAllPages() wxOVERRIDE;
virtual QWidget *GetHandle() const;
virtual QWidget *GetHandle() const wxOVERRIDE;
protected:
virtual wxWindow *DoRemovePage(size_t page);
virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE;
private:
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;
protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
private:
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;
virtual void SetColour(const wxColour& col);
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b);
virtual void SetColour(const wxColour& col) wxOVERRIDE;
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE;
virtual void SetWidth(int width);
virtual void SetStyle(wxPenStyle style);
virtual void SetStipple(const wxBitmap& stipple);
virtual void SetDashes(int nb_dashes, const wxDash *dash);
virtual void SetJoin(wxPenJoin join);
virtual void SetCap(wxPenCap cap);
virtual void SetWidth(int width) wxOVERRIDE;
virtual void SetStyle(wxPenStyle style) wxOVERRIDE;
virtual void SetStipple(const wxBitmap& stipple) wxOVERRIDE;
virtual void SetDashes(int nb_dashes, const wxDash *dash) wxOVERRIDE;
virtual void SetJoin(wxPenJoin join) wxOVERRIDE;
virtual void SetCap(wxPenCap cap) wxOVERRIDE;
virtual wxColour GetColour() const;
virtual wxBitmap *GetStipple() const;
virtual wxPenStyle GetStyle() const;
virtual wxPenJoin GetJoin() const;
virtual wxPenCap GetCap() const;
virtual int GetWidth() const;
virtual int GetDashes(wxDash **ptr) const;
virtual wxColour GetColour() const wxOVERRIDE;
virtual wxBitmap *GetStipple() const wxOVERRIDE;
virtual wxPenStyle GetStyle() const wxOVERRIDE;
virtual wxPenJoin GetJoin() const wxOVERRIDE;
virtual wxPenCap GetCap() const wxOVERRIDE;
virtual int GetWidth() const wxOVERRIDE;
virtual int GetDashes(wxDash **ptr) const wxOVERRIDE;
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
void SetStyle(int style) { SetStyle((wxPenStyle)style); }
@@ -47,8 +47,8 @@ public:
QPen GetHandle() const;
protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
private:
wxDECLARE_DYNAMIC_CLASS(wxPen);

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

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

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

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

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

@@ -23,12 +23,12 @@ class WXDLLIMPEXP_CORE wxQtTimerImpl : public wxTimerImpl, QObject
public:
wxQtTimerImpl( wxTimer* timer );
virtual bool Start( int millisecs = -1, bool oneShot = false );
virtual void Stop();
virtual bool IsRunning() const;
virtual bool Start( int millisecs = -1, bool oneShot = false ) wxOVERRIDE;
virtual void Stop() wxOVERRIDE;
virtual bool IsRunning() const wxOVERRIDE;
protected:
virtual void timerEvent( QTimerEvent * event );
virtual void timerEvent( QTimerEvent * event ) wxOVERRIDE;
private:
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
if ( !wxWindow::QtRetrieveWindowPointer( this ) )
@@ -84,7 +84,7 @@ protected:
* wxPowerEvent, wxScrollWinEvent, wxSysColourChangedEvent */
//wxActivateEvent
virtual void changeEvent ( QEvent * event )
virtual void changeEvent ( QEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -96,7 +96,7 @@ protected:
}
//wxCloseEvent
virtual void closeEvent ( QCloseEvent * event )
virtual void closeEvent ( QCloseEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -108,7 +108,7 @@ protected:
}
//wxContextMenuEvent
virtual void contextMenuEvent ( QContextMenuEvent * event )
virtual void contextMenuEvent ( QContextMenuEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -123,7 +123,7 @@ protected:
//virtual void dropEvent ( QDropEvent * event ) { }
//wxMouseEvent
virtual void enterEvent ( QEvent * event )
virtual void enterEvent ( QEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -135,7 +135,7 @@ protected:
}
//wxFocusEvent.
virtual void focusInEvent ( QFocusEvent * event )
virtual void focusInEvent ( QFocusEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -147,7 +147,7 @@ protected:
}
//wxFocusEvent.
virtual void focusOutEvent ( QFocusEvent * event )
virtual void focusOutEvent ( QFocusEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -159,7 +159,7 @@ protected:
}
//wxShowEvent
virtual void hideEvent ( QHideEvent * event )
virtual void hideEvent ( QHideEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -171,7 +171,7 @@ protected:
}
//wxKeyEvent
virtual void keyPressEvent ( QKeyEvent * event )
virtual void keyPressEvent ( QKeyEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -183,7 +183,7 @@ protected:
}
//wxKeyEvent
virtual void keyReleaseEvent ( QKeyEvent * event )
virtual void keyReleaseEvent ( QKeyEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -195,7 +195,7 @@ protected:
}
//wxMouseEvent
virtual void leaveEvent ( QEvent * event )
virtual void leaveEvent ( QEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -207,7 +207,7 @@ protected:
}
//wxMouseEvent
virtual void mouseDoubleClickEvent ( QMouseEvent * event )
virtual void mouseDoubleClickEvent ( QMouseEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -219,7 +219,7 @@ protected:
}
//wxMouseEvent
virtual void mouseMoveEvent ( QMouseEvent * event )
virtual void mouseMoveEvent ( QMouseEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -231,7 +231,7 @@ protected:
}
//wxMouseEvent
virtual void mousePressEvent ( QMouseEvent * event )
virtual void mousePressEvent ( QMouseEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -243,7 +243,7 @@ protected:
}
//wxMouseEvent
virtual void mouseReleaseEvent ( QMouseEvent * event )
virtual void mouseReleaseEvent ( QMouseEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -255,7 +255,7 @@ protected:
}
//wxMoveEvent
virtual void moveEvent ( QMoveEvent * event )
virtual void moveEvent ( QMoveEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -267,7 +267,7 @@ protected:
}
//wxEraseEvent then wxPaintEvent
virtual void paintEvent ( QPaintEvent * event )
virtual void paintEvent ( QPaintEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -279,7 +279,7 @@ protected:
}
//wxSizeEvent
virtual void resizeEvent ( QResizeEvent * event )
virtual void resizeEvent ( QResizeEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -291,7 +291,7 @@ protected:
}
//wxShowEvent
virtual void showEvent ( QShowEvent * event )
virtual void showEvent ( QShowEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;
@@ -303,7 +303,7 @@ protected:
}
//wxMouseEvent
virtual void wheelEvent ( QWheelEvent * event )
virtual void wheelEvent ( QWheelEvent * event ) wxOVERRIDE
{
if ( !this->GetHandler() )
return;

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

@@ -72,14 +72,14 @@ public:
virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE;
virtual bool IsItemShown(unsigned int n) const wxOVERRIDE;
virtual unsigned int GetCount() const;
virtual wxString GetString(unsigned int n) const;
virtual void SetString(unsigned int n, const wxString& s);
virtual unsigned int GetCount() const wxOVERRIDE;
virtual wxString GetString(unsigned int n) const wxOVERRIDE;
virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
virtual void SetSelection(int n);
virtual int GetSelection() const;
virtual void SetSelection(int n) wxOVERRIDE;
virtual int GetSelection() const wxOVERRIDE;
virtual QWidget *GetHandle() const;
virtual QWidget *GetHandle() const wxOVERRIDE;
private:
// The 'visual' group box:

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

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

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

@@ -24,29 +24,29 @@ public:
wxRegion(const wxBitmap& bmp);
wxRegion(const wxBitmap& bmp, const wxColour& transp, int tolerance = 0);
virtual bool IsEmpty() const;
virtual void Clear();
virtual bool IsEmpty() const wxOVERRIDE;
virtual void Clear() wxOVERRIDE;
virtual const QRegion &GetHandle() const;
virtual void QtSetRegion(QRegion region); // Hangs on to this region
protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
virtual bool DoIsEqual(const wxRegion& region) const;
virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
virtual bool DoIsEqual(const wxRegion& region) const wxOVERRIDE;
virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const wxOVERRIDE;
virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const wxOVERRIDE;
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 DoUnionWithRegion(const wxRegion& region);
virtual bool DoUnionWithRect(const wxRect& rect) wxOVERRIDE;
virtual bool DoUnionWithRegion(const wxRegion& region) wxOVERRIDE;
virtual bool DoIntersect(const wxRegion& region);
virtual bool DoSubtract(const wxRegion& region);
virtual bool DoXor(const wxRegion& region);
virtual bool DoIntersect(const wxRegion& region) wxOVERRIDE;
virtual bool DoSubtract(const wxRegion& region) wxOVERRIDE;
virtual bool DoXor(const wxRegion& region) wxOVERRIDE;
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 wxString& name = wxScrollBarNameStr );
virtual int GetThumbPosition() const;
virtual int GetThumbSize() const;
virtual int GetPageSize() const;
virtual int GetRange() const;
virtual int GetThumbPosition() const wxOVERRIDE;
virtual int GetThumbSize() const wxOVERRIDE;
virtual int GetPageSize() const wxOVERRIDE;
virtual int GetRange() const wxOVERRIDE;
virtual void SetThumbPosition(int viewStart);
virtual void SetThumbPosition(int viewStart) wxOVERRIDE;
virtual void SetScrollbar(int position, int thumbSize,
int range, int pageSize,
bool refresh = true);
bool refresh = true) wxOVERRIDE;
QScrollBar *GetQScrollBar() const { return m_qtScrollBar; }
QWidget *GetHandle() const;
QWidget *GetHandle() const wxOVERRIDE;
private:
QScrollBar *m_qtScrollBar;

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

@@ -32,25 +32,25 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSliderNameStr);
virtual int GetValue() const;
virtual void SetValue(int value);
virtual int GetValue() const wxOVERRIDE;
virtual void SetValue(int value) wxOVERRIDE;
virtual void SetRange(int minValue, int maxValue);
virtual int GetMin() const;
virtual int GetMax() const;
virtual void SetRange(int minValue, int maxValue) wxOVERRIDE;
virtual int GetMin() const wxOVERRIDE;
virtual int GetMax() const wxOVERRIDE;
virtual void DoSetTickFreq(int freq);
virtual int GetTickFreq() const;
virtual void DoSetTickFreq(int freq) wxOVERRIDE;
virtual int GetTickFreq() const wxOVERRIDE;
virtual void SetLineSize(int lineSize);
virtual void SetPageSize(int pageSize);
virtual int GetLineSize() const;
virtual int GetPageSize() const;
virtual void SetLineSize(int lineSize) wxOVERRIDE;
virtual void SetPageSize(int pageSize) wxOVERRIDE;
virtual int GetLineSize() const wxOVERRIDE;
virtual int GetPageSize() const wxOVERRIDE;
virtual void SetThumbLength(int lenPixels);
virtual int GetThumbLength() const;
virtual void SetThumbLength(int lenPixels) wxOVERRIDE;
virtual int GetThumbLength() const wxOVERRIDE;
virtual QWidget *GetHandle() const;
virtual QWidget *GetHandle() const wxOVERRIDE;
private:
QSlider *m_qtSlider;

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

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

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

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

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

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

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

@@ -29,9 +29,9 @@ public:
long style = 0,
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 wxString GetLabel() const wxOVERRIDE;

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

@@ -29,7 +29,7 @@ public:
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticLineNameStr );
virtual QWidget *GetHandle() const;
virtual QWidget *GetHandle() const wxOVERRIDE;
private:
QFrame *m_qtFrame;

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

@@ -33,7 +33,7 @@ public:
virtual void SetLabel(const wxString& label) wxOVERRIDE;
virtual wxString GetLabel() const wxOVERRIDE;
virtual QWidget *GetHandle() const;
virtual QWidget *GetHandle() const wxOVERRIDE;
private:
QLabel *m_qtLabel;

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

@@ -27,18 +27,18 @@ public:
long style = wxSTB_DEFAULT_STYLE,
const wxString& name = wxStatusBarNameStr);
virtual bool GetFieldRect(int i, wxRect& rect) const;
virtual void SetMinHeight(int height);
virtual int GetBorderX() const;
virtual int GetBorderY() const;
virtual bool GetFieldRect(int i, wxRect& rect) const wxOVERRIDE;
virtual void SetMinHeight(int height) wxOVERRIDE;
virtual int GetBorderX() const wxOVERRIDE;
virtual int GetBorderY() const wxOVERRIDE;
virtual void Refresh( bool eraseBackground = true,
const wxRect *rect = (const wxRect *) NULL );
const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE;
QStatusBar *GetQStatusBar() const { return m_qtStatusBar; }
QWidget *GetHandle() const;
QWidget *GetHandle() const wxOVERRIDE;
protected:
virtual void DoUpdateStatusText(int number);
virtual void DoUpdateStatusText(int number) wxOVERRIDE;
private:
void Init();

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

@@ -22,9 +22,9 @@ public:
// Operations
virtual bool SetIcon(const wxIcon& icon,
const wxString& tooltip = wxEmptyString);
virtual bool RemoveIcon();
virtual bool PopupMenu(wxMenu *menu);
const wxString& tooltip = wxEmptyString) wxOVERRIDE;
virtual bool RemoveIcon() wxOVERRIDE;
virtual bool PopupMenu(wxMenu *menu) wxOVERRIDE;
private:
QSystemTrayIcon *m_qtSystemTrayIcon;

48
include/wx/qt/textctrl.h
View File

@@ -35,41 +35,41 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString &name = wxTextCtrlNameStr);
virtual int GetLineLength(long lineNo) const;
virtual wxString GetLineText(long lineNo) const;
virtual int GetNumberOfLines() const;
virtual int GetLineLength(long lineNo) const wxOVERRIDE;
virtual wxString GetLineText(long lineNo) const wxOVERRIDE;
virtual int GetNumberOfLines() const wxOVERRIDE;
virtual bool IsModified() const;
virtual void MarkDirty();
virtual void DiscardEdits();
virtual bool IsModified() const wxOVERRIDE;
virtual void MarkDirty() wxOVERRIDE;
virtual void DiscardEdits() wxOVERRIDE;
virtual bool SetStyle(long start, long end, const wxTextAttr& style);
virtual bool GetStyle(long position, wxTextAttr& style);
virtual bool SetDefaultStyle(const wxTextAttr& style);
virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE;
virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE;
virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE;
virtual long XYToPosition(long x, long y) const;
virtual bool PositionToXY(long pos, long *x, long *y) const;
virtual long XYToPosition(long x, long y) const wxOVERRIDE;
virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE;
virtual void ShowPosition(long pos);
virtual void ShowPosition(long pos) wxOVERRIDE;
virtual void SetInsertionPoint(long pos);
virtual long GetInsertionPoint() const;
virtual void SetSelection( long from, long to );
virtual void GetSelection(long *from, long *to) const;
virtual void SetInsertionPoint(long pos) wxOVERRIDE;
virtual long GetInsertionPoint() const wxOVERRIDE;
virtual void SetSelection( long from, long to ) wxOVERRIDE;
virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
virtual wxString DoGetValue() const;
virtual void DoSetValue(const wxString &text, int flags = 0);
virtual void WriteText(const wxString& text);
virtual wxString DoGetValue() const wxOVERRIDE;
virtual void DoSetValue(const wxString &text, int flags = 0) wxOVERRIDE;
virtual void WriteText(const wxString& text) wxOVERRIDE;
virtual QWidget *GetHandle() const;
virtual QWidget *GetHandle() const wxOVERRIDE;
protected:
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual bool DoLoadFile(const wxString& file, int fileType);
virtual bool DoSaveFile(const wxString& file, int fileType);
virtual bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE;
virtual bool DoSaveFile(const wxString& file, int fileType) wxOVERRIDE;
virtual QScrollArea *QtGetScrollBarsContainer() const;
virtual QScrollArea *QtGetScrollBarsContainer() const wxOVERRIDE;
private:
wxQtEdit *m_qtEdit;

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

@@ -13,34 +13,34 @@ class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase
public:
wxTextEntry();
virtual void WriteText(const wxString& text);
virtual void WriteText(const wxString& text) wxOVERRIDE;
virtual void Remove(long from, long to);
virtual void Remove(long from, long to) wxOVERRIDE;
virtual void Copy();
virtual void Cut();
virtual void Paste();
virtual void Copy() wxOVERRIDE;
virtual void Cut() wxOVERRIDE;
virtual void Paste() wxOVERRIDE;
virtual void Undo();
virtual void Redo();
virtual bool CanUndo() const;
virtual bool CanRedo() const;
virtual void Undo() wxOVERRIDE;
virtual void Redo() wxOVERRIDE;
virtual bool CanUndo() const wxOVERRIDE;
virtual bool CanRedo() const wxOVERRIDE;
virtual void SetInsertionPoint(long pos);
virtual long GetInsertionPoint() const;
virtual long GetLastPosition() const;
virtual void SetInsertionPoint(long pos) wxOVERRIDE;
virtual long GetInsertionPoint() const wxOVERRIDE;
virtual long GetLastPosition() const wxOVERRIDE;
virtual void SetSelection(long from, long to);
virtual void GetSelection(long *from, long *to) const;
virtual void SetSelection(long from, long to) wxOVERRIDE;
virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
virtual bool IsEditable() const;
virtual void SetEditable(bool editable);
virtual bool IsEditable() const wxOVERRIDE;
virtual void SetEditable(bool editable) wxOVERRIDE;
protected:
virtual wxString DoGetValue() const;
virtual void DoSetValue(const wxString& value, int flags=0);
virtual wxString DoGetValue() const wxOVERRIDE;
virtual void DoSetValue(const wxString& value, int flags=0) wxOVERRIDE;
virtual wxWindow *GetEditableWindow();
virtual wxWindow *GetEditableWindow() wxOVERRIDE;
};
#endif // _WX_QT_TEXTENTRY_H_

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

@@ -32,8 +32,8 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr);
virtual void SetValue(bool state);
virtual bool GetValue() const;
virtual void SetValue(bool state) wxOVERRIDE;
virtual bool GetValue() const wxOVERRIDE;
// implementation only
virtual int GetEventType() const wxOVERRIDE { return wxEVT_TOGGLEBUTTON; }

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

@@ -30,21 +30,21 @@ public:
const wxString& name = wxFrameNameStr);
virtual bool Show(bool show = true) wxOVERRIDE;
virtual void Maximize(bool maximize = true);
virtual void Restore();
virtual void Iconize(bool iconize = true);
virtual bool IsMaximized() const;
virtual bool IsIconized() const;
virtual void Maximize(bool maximize = true) wxOVERRIDE;
virtual void Restore() wxOVERRIDE;
virtual void Iconize(bool iconize = true) wxOVERRIDE;
virtual bool IsMaximized() const wxOVERRIDE;
virtual bool IsIconized() const wxOVERRIDE;
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual bool IsFullScreen() const;
virtual void SetTitle(const wxString& title);
virtual wxString GetTitle() const;
virtual void SetIcons(const wxIconBundle& icons);
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE;
virtual bool IsFullScreen() const wxOVERRIDE;
virtual void SetTitle(const wxString& title) wxOVERRIDE;
virtual wxString GetTitle() const wxOVERRIDE;
virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE;
// Styles
virtual void SetWindowStyleFlag( long style );
virtual long GetWindowStyleFlag() const;
virtual void SetWindowStyleFlag( long style ) wxOVERRIDE;
virtual long GetWindowStyleFlag() const wxOVERRIDE;
};
#endif // _WX_QT_TOPLEVEL_H_

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

@@ -112,7 +112,7 @@ public:
virtual bool GetBoundingRect(const wxTreeItemId& item, wxRect& rect, bool textOnly = false) const;
virtual QWidget *GetHandle() const;
virtual QWidget *GetHandle() const wxOVERRIDE;
protected:
virtual int DoGetItemState(const wxTreeItemId& item) const;