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

use wxOVERRIDE in wxMSW sources

Browse Source
This commit is contained in:
Paul Cornett
2016-09-23 07:59:11 -07:00
parent 9b477e46e5
commit 9b19a6e529
121 changed files with 1454 additions and 1454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/wx/msw/anybutton.h
View File

@@ -28,30 +28,30 @@ public:
virtual ~wxAnyButton(); virtual ~wxAnyButton();
// overridden base class methods // overridden base class methods
virtual void SetLabel(const wxString& label); virtual void SetLabel(const wxString& label) wxOVERRIDE;
virtual bool SetBackgroundColour(const wxColour &colour); virtual bool SetBackgroundColour(const wxColour &colour) wxOVERRIDE;
virtual bool SetForegroundColour(const wxColour &colour); virtual bool SetForegroundColour(const wxColour &colour) wxOVERRIDE;
// implementation from now on // implementation from now on
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item) wxOVERRIDE;
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
protected: protected:
// usually overridden base class virtuals // usually overridden base class virtuals
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual wxBitmap DoGetBitmap(State which) const; virtual wxBitmap DoGetBitmap(State which) const wxOVERRIDE;
virtual void DoSetBitmap(const wxBitmap& bitmap, State which); virtual void DoSetBitmap(const wxBitmap& bitmap, State which) wxOVERRIDE;
virtual wxSize DoGetBitmapMargins() const; virtual wxSize DoGetBitmapMargins() const wxOVERRIDE;
virtual void DoSetBitmapMargins(wxCoord x, wxCoord y); virtual void DoSetBitmapMargins(wxCoord x, wxCoord y) wxOVERRIDE;
virtual void DoSetBitmapPosition(wxDirection dir); virtual void DoSetBitmapPosition(wxDirection dir) wxOVERRIDE;
#if wxUSE_MARKUP #if wxUSE_MARKUP
virtual bool DoSetLabelMarkup(const wxString& markup); virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE;
#endif // wxUSE_MARKUP #endif // wxUSE_MARKUP
// Increases the passed in size to account for the button image. // Increases the passed in size to account for the button image.

10
include/wx/msw/app.h
View File

@@ -29,12 +29,12 @@ public:
virtual ~wxApp(); virtual ~wxApp();
// override base class (pure) virtuals // override base class (pure) virtuals
virtual bool Initialize(int& argc, wxChar **argv); virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE;
virtual void CleanUp(); virtual void CleanUp() wxOVERRIDE;
virtual void WakeUpIdle(); virtual void WakeUpIdle() wxOVERRIDE;
virtual void SetPrintMode(int mode) { m_printMode = mode; } virtual void SetPrintMode(int mode) wxOVERRIDE { m_printMode = mode; }
virtual int GetPrintMode() const { return m_printMode; } virtual int GetPrintMode() const { return m_printMode; }
// implementation only // implementation only
@@ -43,7 +43,7 @@ public:
void OnQueryEndSession(wxCloseEvent& event); void OnQueryEndSession(wxCloseEvent& event);
#if wxUSE_EXCEPTIONS #if wxUSE_EXCEPTIONS
virtual bool OnExceptionInMainLoop(); virtual bool OnExceptionInMainLoop() wxOVERRIDE;
#endif // wxUSE_EXCEPTIONS #endif // wxUSE_EXCEPTIONS
// MSW-specific from now on // MSW-specific from now on

32
include/wx/msw/apptrait.h
View File

@@ -18,18 +18,18 @@
class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
{ {
public: public:
virtual wxEventLoopBase *CreateEventLoop(); virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE;
virtual void *BeforeChildWaitLoop(); virtual void *BeforeChildWaitLoop() wxOVERRIDE;
virtual void AfterChildWaitLoop(void *data); virtual void AfterChildWaitLoop(void *data) wxOVERRIDE;
#if wxUSE_TIMER #if wxUSE_TIMER
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE;
#endif // wxUSE_TIMER #endif // wxUSE_TIMER
#if wxUSE_THREADS #if wxUSE_THREADS
virtual bool DoMessageFromThreadWait(); virtual bool DoMessageFromThreadWait() wxOVERRIDE;
virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags); virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags) wxOVERRIDE;
#endif // wxUSE_THREADS #endif // wxUSE_THREADS
virtual bool CanUseStderr() { return true; } virtual bool CanUseStderr() wxOVERRIDE { return true; }
virtual bool WriteToStderr(const wxString& text); virtual bool WriteToStderr(const wxString& text) wxOVERRIDE;
}; };
#if wxUSE_GUI #if wxUSE_GUI
@@ -39,22 +39,22 @@ public:
class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
{ {
public: public:
virtual wxEventLoopBase *CreateEventLoop(); virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE;
virtual void *BeforeChildWaitLoop(); virtual void *BeforeChildWaitLoop() wxOVERRIDE;
virtual void AfterChildWaitLoop(void *data); virtual void AfterChildWaitLoop(void *data) wxOVERRIDE;
#if wxUSE_TIMER #if wxUSE_TIMER
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer); virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE;
#endif // wxUSE_TIMER #endif // wxUSE_TIMER
#if wxUSE_THREADS #if wxUSE_THREADS
virtual bool DoMessageFromThreadWait(); virtual bool DoMessageFromThreadWait() wxOVERRIDE;
virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags); virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags) wxOVERRIDE;
#endif // wxUSE_THREADS #endif // wxUSE_THREADS
wxPortId GetToolkitVersion(int *majVer = NULL, wxPortId GetToolkitVersion(int *majVer = NULL,
int *minVer = NULL, int *minVer = NULL,
int *microVer = NULL) const wxOVERRIDE; int *microVer = NULL) const wxOVERRIDE;
virtual bool CanUseStderr(); virtual bool CanUseStderr() wxOVERRIDE;
virtual bool WriteToStderr(const wxString& text); virtual bool WriteToStderr(const wxString& text) wxOVERRIDE;
}; };
#elif defined(__WXGTK__) #elif defined(__WXGTK__)

10
include/wx/msw/bitmap.h
View File

@@ -206,8 +206,8 @@ public:
wxDC *GetSelectedInto() const; wxDC *GetSelectedInto() const;
protected: protected:
virtual wxGDIImageRefData *CreateData() const; virtual wxGDIImageRefData *CreateData() const wxOVERRIDE;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
// creates an uninitialized bitmap, called from Create()s above // creates an uninitialized bitmap, called from Create()s above
bool DoCreate(int w, int h, int depth, WXHDC hdc); bool DoCreate(int w, int h, int depth, WXHDC hdc);
@@ -295,14 +295,14 @@ public:
virtual bool Create(wxGDIImage *image, virtual bool Create(wxGDIImage *image,
const void* data, const void* data,
wxBitmapType type, wxBitmapType type,
int width, int height, int depth = 1); int width, int height, int depth = 1) wxOVERRIDE;
virtual bool Load(wxGDIImage *image, virtual bool Load(wxGDIImage *image,
const wxString& name, const wxString& name,
wxBitmapType type, wxBitmapType type,
int desiredWidth, int desiredHeight); int desiredWidth, int desiredHeight) wxOVERRIDE;
virtual bool Save(const wxGDIImage *image, virtual bool Save(const wxGDIImage *image,
const wxString& name, const wxString& name,
wxBitmapType type) const; wxBitmapType type) const wxOVERRIDE;
// make wxBitmapHandler compatible with the wxBitmapHandler interface // make wxBitmapHandler compatible with the wxBitmapHandler interface

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

@@ -82,9 +82,9 @@ public:
virtual ~wxBitmapComboBox(); virtual ~wxBitmapComboBox();
// Sets the image for the given item. // Sets the image for the given item.
virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap); virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap) wxOVERRIDE;
virtual bool SetFont(const wxFont& font); virtual bool SetFont(const wxFont& font) wxOVERRIDE;
// Adds item with image to the end of the combo box. // Adds item with image to the end of the combo box.
int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap); int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap);
@@ -101,25 +101,25 @@ public:
protected: protected:
WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item) wxOVERRIDE;
virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item); virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item) wxOVERRIDE;
// Event handlers // Event handlers
void OnSize(wxSizeEvent& event); void OnSize(wxSizeEvent& event);
virtual wxItemContainer* GetItemContainer() { return this; } virtual wxItemContainer* GetItemContainer() wxOVERRIDE { return this; }
virtual wxWindow* GetControl() { return this; } virtual wxWindow* GetControl() wxOVERRIDE { return this; }
// wxItemContainer implementation // wxItemContainer implementation
virtual int DoInsertItems(const wxArrayStringsAdapter & items, virtual int DoInsertItems(const wxArrayStringsAdapter & items,
unsigned int pos, unsigned int pos,
void **clientData, wxClientDataType type); void **clientData, wxClientDataType type) wxOVERRIDE;
virtual void DoClear(); virtual void DoClear() wxOVERRIDE;
virtual void DoDeleteOneItem(unsigned int n); virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
virtual bool OnAddBitmap(const wxBitmap& bitmap); virtual bool OnAddBitmap(const wxBitmap& bitmap) wxOVERRIDE;
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
void RecreateControl(); void RecreateControl();
private: private:

20
include/wx/msw/brush.h
View File

@@ -27,17 +27,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")
@@ -47,11 +47,11 @@ public:
void SetStyle(int style) { SetStyle((wxBrushStyle)style); } void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
// return the HBRUSH for this brush // return the HBRUSH for this brush
virtual WXHANDLE GetResourceHandle() const; virtual WXHANDLE GetResourceHandle() 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(wxBrush); wxDECLARE_DYNAMIC_CLASS(wxBrush);

14
include/wx/msw/button.h
View File

@@ -44,14 +44,14 @@ public:
virtual ~wxButton(); virtual ~wxButton();
virtual wxWindow *SetDefault(); virtual wxWindow *SetDefault() wxOVERRIDE;
// implementation from now on // implementation from now on
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event) wxOVERRIDE;
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
protected: protected:
// send a notification event, return true if processed // send a notification event, return true if processed
@@ -64,8 +64,8 @@ protected:
// set or unset BS_DEFPUSHBUTTON style // set or unset BS_DEFPUSHBUTTON style
static void SetDefaultStyle(wxButton *btn, bool on); static void SetDefaultStyle(wxButton *btn, bool on);
virtual bool DoGetAuthNeeded() const; virtual bool DoGetAuthNeeded() const wxOVERRIDE;
virtual void DoSetAuthNeeded(bool show); virtual void DoSetAuthNeeded(bool show) wxOVERRIDE;
// true if the UAC symbol is shown // true if the UAC symbol is shown
bool m_authNeeded; bool m_authNeeded;

28
include/wx/msw/calctrl.h
View File

@@ -34,30 +34,30 @@ 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;
virtual void SetHoliday(size_t day); virtual void SetHoliday(size_t day) wxOVERRIDE;
virtual wxCalendarHitTestResult HitTest(const wxPoint& pos, virtual wxCalendarHitTestResult HitTest(const wxPoint& pos,
wxDateTime *date = NULL, wxDateTime *date = NULL,
wxDateTime::WeekDay *wd = NULL); wxDateTime::WeekDay *wd = NULL) wxOVERRIDE;
virtual void SetWindowStyleFlag(long style); virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
void MSWOnClick(wxMouseEvent& event); void MSWOnClick(wxMouseEvent& event);
void MSWOnDoubleClick(wxMouseEvent& event); void MSWOnDoubleClick(wxMouseEvent& event);
@@ -73,10 +73,10 @@ private:
void UpdateFirstDayOfWeek(); void UpdateFirstDayOfWeek();
// reset holiday information // reset holiday information
virtual void ResetHolidayAttrs() { m_holidays = 0; } virtual void ResetHolidayAttrs() wxOVERRIDE { m_holidays = 0; }
// redisplay holidays // redisplay holidays
virtual void RefreshHolidays() { UpdateMarks(); } virtual void RefreshHolidays() wxOVERRIDE { UpdateMarks(); }
// current date, we need to store it instead of simply retrieving it from // current date, we need to store it instead of simply retrieving it from

12
include/wx/msw/caret.h
View File

@@ -32,8 +32,8 @@ public:
} }
// process wxWindow notifications // process wxWindow notifications
virtual void OnSetFocus(); virtual void OnSetFocus() wxOVERRIDE;
virtual void OnKillFocus(); virtual void OnKillFocus() wxOVERRIDE;
protected: protected:
void Init() void Init()
@@ -44,10 +44,10 @@ protected:
} }
// override base class virtuals // override base class virtuals
virtual void DoMove(); virtual void DoMove() wxOVERRIDE;
virtual void DoShow(); virtual void DoShow() wxOVERRIDE;
virtual void DoHide(); virtual void DoHide() wxOVERRIDE;
virtual void DoSize(); virtual void DoSize() wxOVERRIDE;
// helper function which creates the system caret // helper function which creates the system caret
bool MSWCreateCaret(); bool MSWCreateCaret();

20
include/wx/msw/checkbox.h
View File

@@ -39,26 +39,26 @@ 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;
// override some base class virtuals // override some base class virtuals
virtual void SetLabel(const wxString& label); virtual void SetLabel(const wxString& label) wxOVERRIDE;
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event) wxOVERRIDE;
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
// implementation only from now on // implementation only from now on
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE;
protected: protected:
virtual wxSize DoGetBestClientSize() const; virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
virtual void DoSet3StateValue(wxCheckBoxState value); virtual void DoSet3StateValue(wxCheckBoxState value) wxOVERRIDE;
virtual wxCheckBoxState DoGet3StateValue() const; virtual wxCheckBoxState DoGet3StateValue() const wxOVERRIDE;
// Implement wxMSWOwnerDrawnButtonBase methods. // Implement wxMSWOwnerDrawnButtonBase methods.
virtual int MSWGetButtonStyle() const wxOVERRIDE; virtual int MSWGetButtonStyle() const wxOVERRIDE;

10
include/wx/msw/checklst.h
View File

@@ -55,14 +55,14 @@ public:
const wxString& name = wxListBoxNameStr); const wxString& name = wxListBoxNameStr);
// items may be checked // items may be checked
virtual bool IsChecked(unsigned int uiIndex) const; virtual bool IsChecked(unsigned int uiIndex) const wxOVERRIDE;
virtual void Check(unsigned int uiIndex, bool bCheck = true); virtual void Check(unsigned int uiIndex, bool bCheck = true) wxOVERRIDE;
virtual void Toggle(unsigned int uiIndex); virtual void Toggle(unsigned int uiIndex);
// we create our items ourselves and they have non-standard size, // we create our items ourselves and they have non-standard size,
// so we need to override these functions // so we need to override these functions
virtual wxOwnerDrawn *CreateLboxItem(size_t n); virtual wxOwnerDrawn *CreateLboxItem(size_t n) wxOVERRIDE;
virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item); virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item) wxOVERRIDE;
protected: protected:
// pressing space or clicking the check box toggles the item // pressing space or clicking the check box toggles the item
@@ -79,7 +79,7 @@ protected:
ProcessCommand(event); ProcessCommand(event);
} }
wxSize DoGetBestClientSize() const; wxSize DoGetBestClientSize() const wxOVERRIDE;
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckListBox); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckListBox);

56
include/wx/msw/choice.h
View File

@@ -67,20 +67,20 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr); const wxString& name = wxChoiceNameStr);
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
virtual void SetLabel(const wxString& label); virtual void SetLabel(const wxString& label) wxOVERRIDE;
virtual unsigned int GetCount() const; virtual unsigned int GetCount() const wxOVERRIDE;
virtual int GetSelection() const; virtual int GetSelection() const wxOVERRIDE;
virtual int GetCurrentSelection() const; virtual int GetCurrentSelection() 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 n, const wxString& s); virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
virtual wxVisualAttributes GetDefaultAttributes() const virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
{ {
return GetClassDefaultAttributes(GetWindowVariant()); return GetClassDefaultAttributes(GetWindowVariant());
} }
@@ -89,18 +89,18 @@ public:
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
// MSW only // MSW only
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd); virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd) wxOVERRIDE;
virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg); virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg) wxOVERRIDE;
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
protected: protected:
// choose the default border for this window // choose the default border for this window
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
// common part of all ctors // common part of all ctors
void Init() void Init()
@@ -110,24 +110,24 @@ protected:
m_heightOwn = wxDefaultCoord; m_heightOwn = wxDefaultCoord;
} }
virtual void DoDeleteOneItem(unsigned int n); virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
virtual void DoClear(); virtual void DoClear() 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 DoMoveWindow(int x, int y, int width, int height); virtual void DoMoveWindow(int x, int y, int width, int height) 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;
// MSW implementation // MSW implementation
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual void DoGetSize(int *w, int *h) const; virtual void DoGetSize(int *w, int *h) const wxOVERRIDE;
virtual void DoSetSize(int x, int y, virtual void DoSetSize(int x, int y,
int width, int height, int width, int height,
int sizeFlags = wxSIZE_AUTO); int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE;
// Show or hide the popup part of the control. // Show or hide the popup part of the control.
void MSWDoPopupOrDismiss(bool show); void MSWDoPopupOrDismiss(bool show);
@@ -155,7 +155,7 @@ protected:
int SetHeightSimpleComboBox(int nItems) const; int SetHeightSimpleComboBox(int nItems) const;
#if wxUSE_DEFERRED_SIZING #if wxUSE_DEFERRED_SIZING
virtual void MSWEndDeferWindowPos(); virtual void MSWEndDeferWindowPos() wxOVERRIDE;
#endif // wxUSE_DEFERRED_SIZING #endif // wxUSE_DEFERRED_SIZING
// These variables are only used while the drop down is opened. // These variables are only used while the drop down is opened.

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

@@ -49,33 +49,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:
IDataObject *m_lastDataObject; IDataObject *m_lastDataObject;

16
include/wx/msw/colordlg.h
View File

@@ -33,10 +33,10 @@ public:
wxColourData& GetColourData() { return m_colourData; } wxColourData& GetColourData() { return m_colourData; }
// override some base class virtuals // override some base class virtuals
virtual void SetTitle(const wxString& title); virtual void SetTitle(const wxString& title) wxOVERRIDE;
virtual wxString GetTitle() const; virtual wxString GetTitle() const wxOVERRIDE;
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
// wxMSW-specific implementation from now on // wxMSW-specific implementation from now on
// ----------------------------------------- // -----------------------------------------
@@ -48,11 +48,11 @@ 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 DoGetClientSize(int *width, int *height) const; virtual void DoGetClientSize(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 DoCentre(int dir); virtual void DoCentre(int dir) wxOVERRIDE;
wxColourData m_colourData; wxColourData m_colourData;
wxString m_title; wxString m_title;

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

@@ -27,12 +27,12 @@ public:
// accessors // accessors
// --------- // ---------
virtual bool IsOk() const { return m_isInit; } virtual bool IsOk() const wxOVERRIDE { return m_isInit; }
unsigned char Red() const { return m_red; } unsigned char Red() const wxOVERRIDE { return m_red; }
unsigned char Green() const { return m_green; } unsigned char Green() const wxOVERRIDE { return m_green; }
unsigned char Blue() const { return m_blue; } unsigned char Blue() const wxOVERRIDE { return m_blue; }
unsigned char Alpha() const { return m_alpha ; } unsigned char Alpha() const wxOVERRIDE { return m_alpha ; }
// comparison // comparison
bool operator==(const wxColour& colour) const bool operator==(const wxColour& colour) const
@@ -56,7 +56,7 @@ protected:
void Init(); void Init();
virtual void virtual void
InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a) wxOVERRIDE;
private: private:
bool m_isInit; bool m_isInit;

14
include/wx/msw/combo.h
View File

@@ -64,8 +64,8 @@ public:
virtual ~wxComboCtrl(); virtual ~wxComboCtrl();
virtual void PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const; virtual void PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const wxOVERRIDE;
virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const; virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const wxOVERRIDE;
static int GetFeatures() { return wxComboCtrlFeatures::All; } static int GetFeatures() { return wxComboCtrlFeatures::All; }
@@ -75,23 +75,23 @@ public:
protected: protected:
void DoTimerEvent(); void DoTimerEvent();
virtual bool AnimateShow( const wxRect& rect, int flags ); virtual bool AnimateShow( const wxRect& rect, int flags ) wxOVERRIDE;
#endif // wxUSE_COMBOCTRL_POPUP_ANIMATION #endif // wxUSE_COMBOCTRL_POPUP_ANIMATION
protected: protected:
// Dummy method - we override all functions that call this // Dummy method - we override all functions that call this
virtual WXHWND GetEditHWND() const { return NULL; } virtual WXHWND GetEditHWND() const wxOVERRIDE { return NULL; }
// customization // customization
virtual void OnResize(); virtual void OnResize() wxOVERRIDE;
virtual wxCoord GetNativeTextIndent() const; virtual wxCoord GetNativeTextIndent() const wxOVERRIDE;
// event handlers // event handlers
void OnPaintEvent( wxPaintEvent& event ); void OnPaintEvent( wxPaintEvent& event );
void OnMouseEvent( wxMouseEvent& event ); void OnMouseEvent( wxMouseEvent& event );
virtual bool HasTransparentBackground() { return IsDoubleBuffered(); } virtual bool HasTransparentBackground() wxOVERRIDE { return IsDoubleBuffered(); }
private: private:
void Init(); void Init();

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

@@ -80,27 +80,27 @@ public:
// resolve ambiguities among virtual functions inherited from both base // resolve ambiguities among virtual functions inherited from both base
// classes // classes
virtual void Clear(); virtual void Clear() wxOVERRIDE;
virtual wxString GetValue() const; virtual wxString GetValue() const wxOVERRIDE;
virtual void SetValue(const wxString& value); virtual void SetValue(const wxString& value) wxOVERRIDE;
virtual wxString GetStringSelection() const virtual wxString GetStringSelection() const wxOVERRIDE
{ return wxChoice::GetStringSelection(); } { return wxChoice::GetStringSelection(); }
virtual void Popup() { MSWDoPopupOrDismiss(true); } virtual void Popup() { MSWDoPopupOrDismiss(true); }
virtual void Dismiss() { MSWDoPopupOrDismiss(false); } virtual void Dismiss() { MSWDoPopupOrDismiss(false); }
virtual void SetSelection(int n) { wxChoice::SetSelection(n); } virtual void SetSelection(int n) wxOVERRIDE { wxChoice::SetSelection(n); }
virtual void SetSelection(long from, long to) virtual void SetSelection(long from, long to) wxOVERRIDE
{ wxTextEntry::SetSelection(from, to); } { wxTextEntry::SetSelection(from, to); }
virtual int GetSelection() const { return wxChoice::GetSelection(); } virtual int GetSelection() const wxOVERRIDE { return wxChoice::GetSelection(); }
virtual bool ContainsHWND(WXHWND hWnd) const; virtual bool ContainsHWND(WXHWND hWnd) const wxOVERRIDE;
virtual void GetSelection(long *from, long *to) const; virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
virtual bool IsEditable() const; virtual bool IsEditable() const wxOVERRIDE;
// implementation only from now on // implementation only from now on
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam); bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam);
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
bool MSWShouldPreProcessMessage(WXMSG *pMsg); bool MSWShouldPreProcessMessage(WXMSG *pMsg) wxOVERRIDE;
// Standard event handling // Standard event handling
void OnCut(wxCommandEvent& event); void OnCut(wxCommandEvent& event);
@@ -119,24 +119,24 @@ public:
void OnUpdateDelete(wxUpdateUIEvent& event); void OnUpdateDelete(wxUpdateUIEvent& event);
void OnUpdateSelectAll(wxUpdateUIEvent& event); void OnUpdateSelectAll(wxUpdateUIEvent& event);
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
#if wxUSE_UXTHEME #if wxUSE_UXTHEME
// override wxTextEntry method to work around Windows bug // override wxTextEntry method to work around Windows bug
virtual bool SetHint(const wxString& hint); virtual bool SetHint(const wxString& hint) wxOVERRIDE;
#endif // wxUSE_UXTHEME #endif // wxUSE_UXTHEME
virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE;
protected: protected:
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
virtual void DoSetToolTip(wxToolTip *tip); virtual void DoSetToolTip(wxToolTip *tip) wxOVERRIDE;
#endif #endif
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE;
// Override this one to avoid eating events from our popup listbox. // Override this one to avoid eating events from our popup listbox.
virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const; virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const wxOVERRIDE;
// this is the implementation of GetEditHWND() which can also be used when // this is the implementation of GetEditHWND() which can also be used when
// we don't have the edit control, it simply returns NULL then // we don't have the edit control, it simply returns NULL then
@@ -147,7 +147,7 @@ protected:
// just testing for IsEditable() and using GetEditHWND() should be enough // just testing for IsEditable() and using GetEditHWND() should be enough
WXHWND GetEditHWNDIfAvailable() const; WXHWND GetEditHWNDIfAvailable() const;
virtual void EnableTextChangedEvents(bool enable) virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE
{ {
m_allowTextEvents = enable; m_allowTextEvents = enable;
} }
@@ -155,8 +155,8 @@ protected:
private: private:
// there are the overridden wxTextEntry methods which should only be called // there are the overridden wxTextEntry methods which should only be called
// when we do have an edit control so they assert if this is not the case // when we do have an edit control so they assert if this is not the case
virtual wxWindow *GetEditableWindow(); virtual wxWindow *GetEditableWindow() wxOVERRIDE;
virtual WXHWND GetEditHWND() const; virtual WXHWND GetEditHWND() const wxOVERRIDE;
// common part of all ctors // common part of all ctors
void Init() void Init()

10
include/wx/msw/commandlinkbutton.h
View File

@@ -51,20 +51,20 @@ public:
// ----------------------------- // -----------------------------
// do the same thing as in the generic case here // do the same thing as in the generic case here
virtual void SetLabel(const wxString& label) virtual void SetLabel(const wxString& label) wxOVERRIDE
{ {
SetMainLabelAndNote(label.BeforeFirst('\n'), label.AfterFirst('\n')); SetMainLabelAndNote(label.BeforeFirst('\n'), label.AfterFirst('\n'));
} }
virtual void SetMainLabelAndNote(const wxString& mainLabel, virtual void SetMainLabelAndNote(const wxString& mainLabel,
const wxString& note); const wxString& note) wxOVERRIDE;
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual bool HasNativeBitmap() const; virtual bool HasNativeBitmap() const wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCommandLinkButton); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCommandLinkButton);

14
include/wx/msw/control.h
View File

@@ -36,13 +36,13 @@ public:
// 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
// -------------------------- // --------------------------
virtual wxVisualAttributes GetDefaultAttributes() const virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
{ {
return GetClassDefaultAttributes(GetWindowVariant()); return GetClassDefaultAttributes(GetWindowVariant());
} }
@@ -54,7 +54,7 @@ public:
bool ProcessCommand(wxCommandEvent& event); bool ProcessCommand(wxCommandEvent& event);
// MSW-specific // MSW-specific
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
// For ownerdraw items // For ownerdraw items
virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; } virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; }
@@ -67,14 +67,14 @@ public:
virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd); virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd);
// default style for the control include WS_TABSTOP if it AcceptsFocus() // default style for the control include WS_TABSTOP if it AcceptsFocus()
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
protected: protected:
// choose the default border for this window // choose the default border for this window
virtual wxBorder GetDefaultBorder() const; virtual wxBorder GetDefaultBorder() const wxOVERRIDE;
// return default best size (doesn't really make any sense, override this) // return default best size (doesn't really make any sense, override this)
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
// create the control of the given Windows class: this is typically called // create the control of the given Windows class: this is typically called
// from Create() method of the derived class passing its label, pos and // from Create() method of the derived class passing its label, pos and
@@ -116,7 +116,7 @@ protected:
virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd); virtual WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd);
// Look in our GetSubcontrols() for the windows with the given ID. // Look in our GetSubcontrols() for the windows with the given ID.
virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const; virtual wxWindow *MSWFindItem(long id, WXHWND hWnd) const wxOVERRIDE;
// for controls like radiobuttons which are really composite this array // for controls like radiobuttons which are really composite this array

2
include/wx/msw/cursor.h
View File

@@ -39,7 +39,7 @@ public:
protected: protected:
void InitFromStock(wxStockCursor); void InitFromStock(wxStockCursor);
virtual wxGDIImageRefData *CreateData() const; virtual wxGDIImageRefData *CreateData() const wxOVERRIDE;
private: private:
wxDECLARE_DYNAMIC_CLASS(wxCursor); wxDECLARE_DYNAMIC_CLASS(wxCursor);

16
include/wx/msw/datectrl.h
View File

@@ -43,22 +43,22 @@ public:
const wxString& name = wxDatePickerCtrlNameStr); const wxString& name = wxDatePickerCtrlNameStr);
// Override this one to add date-specific (and time-ignoring) checks. // Override this one to add date-specific (and time-ignoring) checks.
virtual void SetValue(const wxDateTime& dt); virtual void SetValue(const wxDateTime& dt) wxOVERRIDE;
virtual wxDateTime GetValue() const; virtual wxDateTime GetValue() const wxOVERRIDE;
// 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;
// Override MSW-specific functions used during control creation. // Override MSW-specific functions used during control creation.
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
protected: protected:
#if wxUSE_INTL #if wxUSE_INTL
virtual wxLocaleInfo MSWGetFormat() const; virtual wxLocaleInfo MSWGetFormat() const wxOVERRIDE;
#endif // wxUSE_INTL #endif // wxUSE_INTL
virtual bool MSWAllowsNone() const { return HasFlag(wxDP_ALLOWNONE); } virtual bool MSWAllowsNone() const wxOVERRIDE { return HasFlag(wxDP_ALLOWNONE); }
virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch); virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch) wxOVERRIDE;
private: private:
wxDateTime MSWGetControlValue() const; wxDateTime MSWGetControlValue() const;

12
include/wx/msw/datetimectrl.h
View File

@@ -23,17 +23,17 @@ class WXDLLIMPEXP_ADV wxDateTimePickerCtrl : public wxDateTimePickerCtrlBase
{ {
public: public:
// set/get the date // set/get the date
virtual void SetValue(const wxDateTime& dt); virtual void SetValue(const wxDateTime& dt) wxOVERRIDE;
virtual wxDateTime GetValue() const; virtual wxDateTime GetValue() const wxOVERRIDE;
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
protected: protected:
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
// Helper for the derived classes Create(): creates a native control with // Helper for the derived classes Create(): creates a native control with
// the specified attributes. // the specified attributes.

130
include/wx/msw/dc.h
View File

@@ -51,49 +51,49 @@ public:
// implement base class pure virtuals // implement base class pure virtuals
// ---------------------------------- // ----------------------------------
virtual void Clear(); virtual void Clear() wxOVERRIDE;
virtual bool StartDoc(const wxString& message); virtual bool StartDoc(const wxString& message) wxOVERRIDE;
virtual void EndDoc(); virtual void EndDoc() wxOVERRIDE;
virtual void StartPage(); virtual void StartPage() wxOVERRIDE;
virtual void EndPage(); virtual void EndPage() 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 DestroyClippingRegion(); virtual void DestroyClippingRegion() wxOVERRIDE;
virtual wxCoord GetCharHeight() const; virtual wxCoord GetCharHeight() const wxOVERRIDE;
virtual wxCoord GetCharWidth() const; virtual wxCoord GetCharWidth() const wxOVERRIDE;
virtual bool CanDrawBitmap() const; virtual bool CanDrawBitmap() const wxOVERRIDE;
virtual bool CanGetTextExtent() const; virtual bool CanGetTextExtent() const wxOVERRIDE;
virtual int GetDepth() const; virtual int GetDepth() const wxOVERRIDE;
virtual wxSize GetPPI() const; virtual wxSize GetPPI() const wxOVERRIDE;
virtual void SetMapMode(wxMappingMode mode); virtual void SetMapMode(wxMappingMode mode) wxOVERRIDE;
virtual void SetUserScale(double x, double y); virtual void SetUserScale(double x, double y) wxOVERRIDE;
virtual void SetLogicalScale(double x, double y); virtual void SetLogicalScale(double x, double y) wxOVERRIDE;
virtual void SetLogicalOrigin(wxCoord x, wxCoord y); virtual void SetLogicalOrigin(wxCoord x, wxCoord y) wxOVERRIDE;
virtual void SetDeviceOrigin(wxCoord x, wxCoord y); virtual void SetDeviceOrigin(wxCoord x, wxCoord y) wxOVERRIDE;
virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp); virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) wxOVERRIDE;
#if wxUSE_DC_TRANSFORM_MATRIX #if wxUSE_DC_TRANSFORM_MATRIX
virtual bool CanUseTransformMatrix() const; virtual bool CanUseTransformMatrix() const wxOVERRIDE;
virtual bool SetTransformMatrix(const wxAffineMatrix2D& matrix); virtual bool SetTransformMatrix(const wxAffineMatrix2D& matrix) wxOVERRIDE;
virtual wxAffineMatrix2D GetTransformMatrix() const; virtual wxAffineMatrix2D GetTransformMatrix() const wxOVERRIDE;
virtual void ResetTransformMatrix(); virtual void ResetTransformMatrix() wxOVERRIDE;
#endif // wxUSE_DC_TRANSFORM_MATRIX #endif // wxUSE_DC_TRANSFORM_MATRIX
virtual void SetLogicalFunction(wxRasterOperationMode function); virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE;
// implementation from now on // implementation from now on
// -------------------------- // --------------------------
@@ -124,10 +124,10 @@ public:
m_isClipBoxValid = false; m_isClipBoxValid = false;
} }
void* GetHandle() const { return (void*)GetHDC(); } void* GetHandle() const wxOVERRIDE { return (void*)GetHDC(); }
const wxBitmap& GetSelectedBitmap() const { return m_selectedBitmap; } const wxBitmap& GetSelectedBitmap() const wxOVERRIDE { return m_selectedBitmap; }
wxBitmap& GetSelectedBitmap() { return m_selectedBitmap; } wxBitmap& GetSelectedBitmap() wxOVERRIDE { return m_selectedBitmap; }
// update the internal clip box variables // update the internal clip box variables
void UpdateClipBox(); void UpdateClipBox();
@@ -146,8 +146,8 @@ public:
// get or change the layout direction (LTR or RTL) for this dc, // get or change the layout direction (LTR or RTL) for this dc,
// wxLayout_Default is returned if layout direction is not supported // wxLayout_Default is returned if layout direction is not supported
virtual wxLayoutDirection GetLayoutDirection() const; virtual wxLayoutDirection GetLayoutDirection() const wxOVERRIDE;
virtual void SetLayoutDirection(wxLayoutDirection dir); virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE;
protected: protected:
void Init() void Init()
@@ -178,59 +178,59 @@ public:
int *descent, int *descent,
int *internalLeading, int *internalLeading,
int *externalLeading, int *externalLeading,
int *averageWidth) const; int *averageWidth) 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 bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const; virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const 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 void DoGradientFillLinear(const wxRect& rect, virtual void DoGradientFillLinear(const wxRect& rect,
const wxColour& initialColour, const wxColour& initialColour,
const wxColour& destColour, const wxColour& destColour,
wxDirection nDirection = wxEAST); wxDirection nDirection = wxEAST) 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 DoDrawCheckMark(wxCoord x, wxCoord y, virtual void DoDrawCheckMark(wxCoord x, wxCoord y,
wxCoord width, wxCoord height); wxCoord width, wxCoord height) 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, wxCoord width, wxCoord height); virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
#if wxUSE_SPLINES #if wxUSE_SPLINES
virtual void DoDrawSpline(const wxPointList *points); virtual void DoDrawSpline(const wxPointList *points) wxOVERRIDE;
#endif #endif
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, wxCoord x, wxCoord y, virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
double angle); double angle) wxOVERRIDE;
virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, wxDC *source, wxCoord xsrc, wxCoord ysrc,
wxRasterOperationMode rop = wxCOPY, bool useMask = false, wxRasterOperationMode rop = wxCOPY, bool useMask = false,
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE;
virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest, virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
wxCoord dstWidth, wxCoord dstHeight, wxCoord dstWidth, wxCoord dstHeight,
@@ -238,25 +238,25 @@ public:
wxCoord xsrc, wxCoord ysrc, wxCoord xsrc, wxCoord ysrc,
wxCoord srcWidth, wxCoord srcHeight, wxCoord srcWidth, wxCoord srcHeight,
wxRasterOperationMode rop = wxCOPY, bool useMask = false, wxRasterOperationMode rop = wxCOPY, bool useMask = false,
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) 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 DoGetClippingBox(wxCoord *x, wxCoord *y, virtual void DoGetClippingBox(wxCoord *x, wxCoord *y,
wxCoord *w, wxCoord *h) const; wxCoord *w, wxCoord *h) const wxOVERRIDE;
virtual void DoGetSizeMM(int* width, int* height) const; virtual void DoGetSizeMM(int* width, int* height) const 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;
virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[], virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[],
wxCoord xoffset, wxCoord yoffset, wxCoord xoffset, wxCoord yoffset,
wxPolygonFillMode fillStyle = wxODDEVEN_RULE); wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE;
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE
{ {
return subrect == NULL ? GetSelectedBitmap() return subrect == NULL ? GetSelectedBitmap()
: GetSelectedBitmap().GetSubBitmap(*subrect); : GetSelectedBitmap().GetSubBitmap(*subrect);
@@ -351,7 +351,7 @@ public:
SetHDC((WXHDC)NULL); SetHDC((WXHDC)NULL);
} }
virtual void DoGetSize(int *w, int *h) const virtual void DoGetSize(int *w, int *h) const wxOVERRIDE
{ {
wxASSERT_MSG( m_size.IsFullySpecified(), wxASSERT_MSG( m_size.IsFullySpecified(),
wxT("size of this DC hadn't been set and is unknown") ); wxT("size of this DC hadn't been set and is unknown") );

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

@@ -34,7 +34,7 @@ public:
// Create a DC corresponding to the whole window // Create a DC corresponding to the whole window
wxWindowDCImpl( wxDC *owner, wxWindow *win ); wxWindowDCImpl( wxDC *owner, wxWindow *win );
virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
protected: protected:
// initialize the newly created DC // initialize the newly created DC
@@ -55,7 +55,7 @@ public:
virtual ~wxClientDCImpl(); virtual ~wxClientDCImpl();
virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
protected: protected:
void InitDC(); void InitDC();

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

@@ -22,11 +22,11 @@ public:
wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); // Create compatible DC wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); // Create compatible DC
// override some base class virtuals // override some base class virtuals
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 DoGetSize(int* width, int* height) const; virtual void DoGetSize(int* width, int* height) const wxOVERRIDE;
virtual void DoSelect(const wxBitmap& bitmap); virtual void DoSelect(const wxBitmap& bitmap) wxOVERRIDE;
virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const wxOVERRIDE
{ return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmapOfHDC(*subrect, GetHDC() );} { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmapOfHDC(*subrect, GetHDC() );}
protected: protected:

16
include/wx/msw/dcprint.h
View File

@@ -29,22 +29,22 @@ public:
wxPrinterDCImpl( wxPrinterDC *owner, WXHDC theDC ); wxPrinterDCImpl( wxPrinterDC *owner, WXHDC theDC );
// override some base class virtuals // override some base class virtuals
virtual bool StartDoc(const wxString& message); virtual bool StartDoc(const wxString& message) wxOVERRIDE;
virtual void EndDoc(); virtual void EndDoc() wxOVERRIDE;
virtual void StartPage(); virtual void StartPage() wxOVERRIDE;
virtual void EndPage(); virtual void EndPage() wxOVERRIDE;
virtual wxRect GetPaperRect() const; virtual wxRect GetPaperRect() const wxOVERRIDE;
protected: protected:
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 bool DoBlit(wxCoord xdest, wxCoord ydest, virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
wxCoord width, wxCoord height, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, wxDC *source, wxCoord xsrc, wxCoord ysrc,
wxRasterOperationMode rop = wxCOPY, bool useMask = false, wxRasterOperationMode rop = wxCOPY, bool useMask = false,
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE;
virtual void DoGetSize(int *w, int *h) const virtual void DoGetSize(int *w, int *h) const wxOVERRIDE
{ {
GetDeviceSize(w, h); GetDeviceSize(w, h);
} }

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

@@ -21,7 +21,7 @@ public:
wxScreenDCImpl( wxScreenDC *owner ); wxScreenDCImpl( wxScreenDC *owner );
// Return the size of the whole virtual screen (all monitors) // Return the size of the whole virtual screen (all monitors)
virtual void DoGetSize(int *w, int *h) const; virtual void DoGetSize(int *w, int *h) const wxOVERRIDE;
wxDECLARE_CLASS(wxScreenDCImpl); wxDECLARE_CLASS(wxScreenDCImpl);
wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl); wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);

24
include/wx/msw/dde.h
View File

@@ -50,17 +50,17 @@ public:
// implement base class pure virtual methods // implement base class pure virtual methods
virtual const void *Request(const wxString& item, virtual const void *Request(const wxString& item,
size_t *size = NULL, size_t *size = NULL,
wxIPCFormat format = wxIPC_TEXT); wxIPCFormat format = wxIPC_TEXT) wxOVERRIDE;
virtual bool StartAdvise(const wxString& item); virtual bool StartAdvise(const wxString& item) wxOVERRIDE;
virtual bool StopAdvise(const wxString& item); virtual bool StopAdvise(const wxString& item) wxOVERRIDE;
virtual bool Disconnect(); virtual bool Disconnect() wxOVERRIDE;
protected: protected:
virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format); virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
virtual bool DoPoke(const wxString& item, const void *data, size_t size, virtual bool DoPoke(const wxString& item, const void *data, size_t size,
wxIPCFormat format); wxIPCFormat format) wxOVERRIDE;
virtual bool DoAdvise(const wxString& item, const void *data, size_t size, virtual bool DoAdvise(const wxString& item, const void *data, size_t size,
wxIPCFormat format); wxIPCFormat format) wxOVERRIDE;
public: public:
wxString m_topicName; wxString m_topicName;
@@ -80,10 +80,10 @@ class WXDLLIMPEXP_BASE wxDDEServer : public wxServerBase
{ {
public: public:
wxDDEServer(); wxDDEServer();
bool Create(const wxString& server_name); bool Create(const wxString& server_name) wxOVERRIDE;
virtual ~wxDDEServer(); virtual ~wxDDEServer();
virtual wxConnectionBase *OnAcceptConnection(const wxString& topic); virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE;
// Find/delete wxDDEConnection corresponding to the HCONV // Find/delete wxDDEConnection corresponding to the HCONV
wxDDEConnection *FindConnection(WXHCONV conv); wxDDEConnection *FindConnection(WXHCONV conv);
@@ -107,15 +107,15 @@ public:
wxDDEClient(); wxDDEClient();
virtual ~wxDDEClient(); virtual ~wxDDEClient();
bool ValidHost(const wxString& host); bool ValidHost(const wxString& host) wxOVERRIDE;
// Call this to make a connection. Returns NULL if cannot. // Call this to make a connection. Returns NULL if cannot.
virtual wxConnectionBase *MakeConnection(const wxString& host, virtual wxConnectionBase *MakeConnection(const wxString& host,
const wxString& server, const wxString& server,
const wxString& topic); const wxString& topic) wxOVERRIDE;
// Tailor this to return own connection. // Tailor this to return own connection.
virtual wxConnectionBase *OnMakeConnection(); virtual wxConnectionBase *OnMakeConnection() wxOVERRIDE;
// Find/delete wxDDEConnection corresponding to the HCONV // Find/delete wxDDEConnection corresponding to the HCONV
wxDDEConnection *FindConnection(WXHCONV conv); wxDDEConnection *FindConnection(WXHCONV conv);

12
include/wx/msw/dialog.h
View File

@@ -46,24 +46,24 @@ public:
virtual ~wxDialog(); virtual ~wxDialog();
// return true if we're showing the dialog modally // return true if we're showing the dialog modally
virtual bool IsModal() const { return m_modalData != NULL; } virtual bool IsModal() const wxOVERRIDE { return m_modalData != NULL; }
// 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;
// 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;
// implementation only from now on // implementation only from now on
// ------------------------------- // -------------------------------
// override some base class virtuals // override some base class virtuals
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
virtual void SetWindowStyleFlag(long style); virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
// Windows callbacks // Windows callbacks
WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
protected: protected:
// common part of all ctors // common part of all ctors

4
include/wx/msw/dirdlg.h
View File

@@ -22,9 +22,9 @@ public:
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
const wxString& name = wxDirDialogNameStr); const wxString& name = wxDirDialogNameStr);
void SetPath(const wxString& path); void SetPath(const wxString& path) wxOVERRIDE;
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
private: private:
// The real implementations of ShowModal(), used for Windows versions // The real implementations of ShowModal(), used for Windows versions

30
include/wx/msw/enhmeta.h
View File

@@ -39,7 +39,7 @@ public:
bool Play(wxDC *dc, wxRect *rectBound = NULL); bool Play(wxDC *dc, wxRect *rectBound = NULL);
// accessors // accessors
virtual bool IsOk() const { return m_hMF != 0; } virtual bool IsOk() const wxOVERRIDE { return m_hMF != 0; }
wxSize GetSize() const; wxSize GetSize() const;
int GetWidth() const { return GetSize().x; } int GetWidth() const { return GetSize().x; }
@@ -71,8 +71,8 @@ protected:
// we don't use these functions (but probably should) but have to implement // we don't use these functions (but probably should) but have to implement
// them as they're pure virtual in the base class // them as they're pure virtual in the base class
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:
wxString m_filename; wxString m_filename;
@@ -133,13 +133,13 @@ public:
{ return m_metafile; } { return m_metafile; }
// implement base class pure virtuals // implement base class pure virtuals
virtual wxDataFormat GetPreferredFormat(Direction dir) const; virtual wxDataFormat GetPreferredFormat(Direction dir) const wxOVERRIDE;
virtual size_t GetFormatCount(Direction dir) const; virtual size_t GetFormatCount(Direction dir) const wxOVERRIDE;
virtual void GetAllFormats(wxDataFormat *formats, Direction dir) const; virtual void GetAllFormats(wxDataFormat *formats, Direction dir) const wxOVERRIDE;
virtual size_t GetDataSize(const wxDataFormat& format) const; virtual size_t GetDataSize(const wxDataFormat& format) const wxOVERRIDE;
virtual bool GetDataHere(const wxDataFormat& format, void *buf) const; virtual bool GetDataHere(const wxDataFormat& format, void *buf) const wxOVERRIDE;
virtual bool SetData(const wxDataFormat& format, size_t len, virtual bool SetData(const wxDataFormat& format, size_t len,
const void *buf); const void *buf) wxOVERRIDE;
protected: protected:
wxEnhMetaFile m_metafile; wxEnhMetaFile m_metafile;
@@ -171,17 +171,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:

10
include/wx/msw/evtloop.h
View File

@@ -51,13 +51,13 @@ public:
} }
// override/implement base class virtuals // override/implement base class virtuals
virtual bool Dispatch(); virtual bool Dispatch() wxOVERRIDE;
virtual int DispatchTimeout(unsigned long timeout); virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE;
virtual void WakeUp(); virtual void WakeUp() wxOVERRIDE;
protected: protected:
virtual void OnNextIteration(); virtual void OnNextIteration() wxOVERRIDE;
virtual void DoYieldFor(long eventsToProcess); virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE;
private: private:
// check if the given window is a child of ms_winCritical (which must be // check if the given window is a child of ms_winCritical (which must be

10
include/wx/msw/evtloopconsole.h
View File

@@ -17,7 +17,7 @@ public:
wxMSWEventLoopBase(); wxMSWEventLoopBase();
// implement base class pure virtuals // implement base class pure virtuals
virtual bool Pending() const; virtual bool Pending() const wxOVERRIDE;
protected: protected:
// get the next message from queue and return true or return false if we // get the next message from queue and return true or return false if we
@@ -37,15 +37,15 @@ public:
wxConsoleEventLoop() { } wxConsoleEventLoop() { }
// override/implement base class virtuals // override/implement base class virtuals
virtual bool Dispatch(); virtual bool Dispatch() wxOVERRIDE;
virtual int DispatchTimeout(unsigned long timeout); virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE;
virtual void WakeUp(); virtual void WakeUp() wxOVERRIDE;
// Windows-specific function to process a single message // Windows-specific function to process a single message
virtual void ProcessMessage(WXMSG *msg); virtual void ProcessMessage(WXMSG *msg);
protected: protected:
virtual void DoYieldFor(long eventsToProcess); virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE;
}; };
#endif // wxUSE_CONSOLE_EVENTLOOP #endif // wxUSE_CONSOLE_EVENTLOOP

12
include/wx/msw/fdrepdlg.h
View File

@@ -37,16 +37,16 @@ public:
wxFindReplaceDialogImpl *GetImpl() const { return m_impl; } wxFindReplaceDialogImpl *GetImpl() const { return m_impl; }
// override some base class virtuals // override some base class virtuals
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
virtual void SetTitle( const wxString& title); virtual void SetTitle( const wxString& title) wxOVERRIDE;
virtual wxString GetTitle() const; virtual wxString GetTitle() const wxOVERRIDE;
protected: protected:
virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
virtual void DoGetClientSize(int *width, int *height) const; virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
virtual void DoSetSize(int x, int y, virtual void DoSetSize(int x, int y,
int width, int height, int width, int height,
int sizeFlags = wxSIZE_AUTO); int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
void Init(); void Init();

16
include/wx/msw/filedlg.h
View File

@@ -28,12 +28,12 @@ public:
const wxSize& sz = wxDefaultSize, const wxSize& sz = wxDefaultSize,
const wxString& name = wxFileDialogNameStr); const wxString& name = wxFileDialogNameStr);
virtual void GetPaths(wxArrayString& paths) const; virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE;
virtual void GetFilenames(wxArrayString& files) const; virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE;
virtual bool SupportsExtraControl() const { return true; } virtual bool SupportsExtraControl() const wxOVERRIDE { return true; }
void MSWOnInitDialogHook(WXHWND hwnd); void MSWOnInitDialogHook(WXHWND hwnd);
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
// wxMSW-specific implementation from now on // wxMSW-specific implementation from now on
// ----------------------------------------- // -----------------------------------------
@@ -46,10 +46,10 @@ public:
protected: protected:
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 DoCentre(int dir); virtual void DoCentre(int dir) wxOVERRIDE;
virtual void DoGetSize( int *width, int *height ) const; virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
virtual void DoGetPosition( int *x, int *y ) const; virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE;
private: private:
wxArrayString m_fileNames; wxArrayString m_fileNames;

56
include/wx/msw/font.h
View File

@@ -85,30 +85,30 @@ public:
virtual ~wxFont(); virtual ~wxFont();
// implement base class pure virtuals // implement base class pure virtuals
virtual int GetPointSize() const; virtual int GetPointSize() const wxOVERRIDE;
virtual wxSize GetPixelSize() const; virtual wxSize GetPixelSize() const wxOVERRIDE;
virtual bool IsUsingSizeInPixels() const; virtual bool IsUsingSizeInPixels() const wxOVERRIDE;
virtual wxFontStyle GetStyle() const; virtual wxFontStyle GetStyle() const wxOVERRIDE;
virtual wxFontWeight GetWeight() const; virtual wxFontWeight GetWeight() const wxOVERRIDE;
virtual bool GetUnderlined() const; virtual bool GetUnderlined() const wxOVERRIDE;
virtual bool GetStrikethrough() const; virtual bool GetStrikethrough() 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 void SetPointSize(int pointSize); virtual void SetPointSize(int pointSize) wxOVERRIDE;
virtual void SetPixelSize(const wxSize& pixelSize); 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 SetWeight(wxFontWeight weight); virtual void SetWeight(wxFontWeight 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); 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 bool IsFixedWidth() const; virtual bool IsFixedWidth() const wxOVERRIDE;
wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants ie: wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD") wxDEPRECATED_MSG("use wxFONT{FAMILY,STYLE,WEIGHT}_XXX constants ie: wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD")
wxFont(int size, wxFont(int size,
@@ -138,10 +138,10 @@ public:
// implementation only from now on // implementation only from now on
// ------------------------------- // -------------------------------
virtual bool IsFree() const; virtual bool IsFree() const wxOVERRIDE;
virtual bool RealizeResource(); virtual bool RealizeResource() wxOVERRIDE;
virtual WXHANDLE GetResourceHandle() const; virtual WXHANDLE GetResourceHandle() const wxOVERRIDE;
virtual bool FreeResource(bool force = false); virtual bool FreeResource(bool force = false) wxOVERRIDE;
// for consistency with other wxMSW classes // for consistency with other wxMSW classes
WXHFONT GetHFONT() const; WXHFONT GetHFONT() const;
@@ -158,12 +158,12 @@ protected:
const wxString& face = wxEmptyString, const wxString& face = wxEmptyString,
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info); virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info) wxOVERRIDE;
virtual wxFontFamily DoGetFamily() const; virtual wxFontFamily DoGetFamily() const wxOVERRIDE;
// implement wxObject virtuals which are used by AllocExclusive() // implement wxObject virtuals which are used by AllocExclusive()
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(wxFont); wxDECLARE_DYNAMIC_CLASS(wxFont);

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

@@ -24,7 +24,7 @@ public:
wxFontDialog(wxWindow *parent, const wxFontData& data) wxFontDialog(wxWindow *parent, const wxFontData& data)
: wxFontDialogBase(parent, data) { Create(parent, data); } : wxFontDialogBase(parent, data) { Create(parent, data); }
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
protected: protected:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog);

30
include/wx/msw/frame.h
View File

@@ -43,7 +43,7 @@ public:
virtual ~wxFrame(); virtual ~wxFrame();
// implement base class pure virtuals // implement base class pure virtuals
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE;
// implementation only from now on // implementation only from now on
// ------------------------------- // -------------------------------
@@ -55,7 +55,7 @@ public:
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
virtual wxToolBar* CreateToolBar(long style = -1, virtual wxToolBar* CreateToolBar(long style = -1,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,
const wxString& name = wxToolBarNameStr); const wxString& name = wxToolBarNameStr) wxOVERRIDE;
#endif // wxUSE_TOOLBAR #endif // wxUSE_TOOLBAR
// Status bar // Status bar
@@ -63,7 +63,7 @@ public:
virtual wxStatusBar* OnCreateStatusBar(int number = 1, virtual wxStatusBar* OnCreateStatusBar(int number = 1,
long style = wxSTB_DEFAULT_STYLE, long style = wxSTB_DEFAULT_STYLE,
wxWindowID id = 0, wxWindowID id = 0,
const wxString& name = wxStatusLineNameStr); const wxString& name = wxStatusLineNameStr) wxOVERRIDE;
// Hint to tell framework which status bar to use: the default is to use // Hint to tell framework which status bar to use: the default is to use
// native one for the platforms which support it (Win32), the generic one // native one for the platforms which support it (Win32), the generic one
@@ -87,12 +87,12 @@ public:
#endif // tooltips #endif // tooltips
// override the base class function to handle iconized/maximized frames // override the base class function to handle iconized/maximized frames
virtual void SendSizeEvent(int flags = 0); virtual void SendSizeEvent(int flags = 0) wxOVERRIDE;
virtual wxPoint GetClientAreaOrigin() const; virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
// override base class version to add menu bar accel processing // override base class version to add menu bar accel processing
virtual bool MSWTranslateMessage(WXMSG *msg) virtual bool MSWTranslateMessage(WXMSG *msg) wxOVERRIDE
{ {
return MSWDoTranslateMessage(this, msg); return MSWDoTranslateMessage(this, msg);
} }
@@ -100,18 +100,18 @@ public:
// window proc for the frames // window proc for the frames
virtual WXLRESULT MSWWindowProc(WXUINT message, virtual WXLRESULT MSWWindowProc(WXUINT message,
WXWPARAM wParam, WXWPARAM wParam,
WXLPARAM lParam); WXLPARAM lParam) wxOVERRIDE;
#if wxUSE_MENUS #if wxUSE_MENUS
// get the currently active menu: this is the same as the frame menu for // get the currently active menu: this is the same as the frame menu for
// normal frames but is overridden by wxMDIParentFrame // normal frames but is overridden by wxMDIParentFrame
virtual WXHMENU MSWGetActiveMenu() const { return m_hMenu; } virtual WXHMENU MSWGetActiveMenu() const { return m_hMenu; }
virtual bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu); virtual bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu) wxOVERRIDE;
virtual bool DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu); virtual bool DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu) wxOVERRIDE;
// Look up the menu in the menu bar. // Look up the menu in the menu bar.
virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu); virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu) wxOVERRIDE;
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
#if wxUSE_TASKBARBUTTON #if wxUSE_TASKBARBUTTON
@@ -128,12 +128,12 @@ protected:
void Init(); void Init();
// override base class virtuals // override base class virtuals
virtual void DoGetClientSize(int *width, int *height) const; virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
virtual void DoSetClientSize(int width, int height); virtual void DoSetClientSize(int width, int height) wxOVERRIDE;
#if wxUSE_MENUS_NATIVE #if wxUSE_MENUS_NATIVE
// perform MSW-specific action when menubar is changed // perform MSW-specific action when menubar is changed
virtual void AttachMenuBar(wxMenuBar *menubar); virtual void AttachMenuBar(wxMenuBar *menubar) wxOVERRIDE;
// a plug in for MDI frame classes which need to do something special when // a plug in for MDI frame classes which need to do something special when
// the menubar is set // the menubar is set
@@ -153,11 +153,11 @@ protected:
virtual WXHICON GetDefaultIcon() const; virtual WXHICON GetDefaultIcon() const;
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
virtual void PositionToolBar(); virtual void PositionToolBar() wxOVERRIDE;
#endif // wxUSE_TOOLBAR #endif // wxUSE_TOOLBAR
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
virtual void PositionStatusBar(); virtual void PositionStatusBar() wxOVERRIDE;
static bool m_useNativeStatusBar; static bool m_useNativeStatusBar;
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR

2
include/wx/msw/fswatcher.h
View File

@@ -26,7 +26,7 @@ public:
// implementation for it using the platform native support for watching the // implementation for it using the platform native support for watching the
// entire directory trees. // entire directory trees.
virtual bool AddTree(const wxFileName& path, int events = wxFSW_EVENT_ALL, virtual bool AddTree(const wxFileName& path, int events = wxFSW_EVENT_ALL,
const wxString& filter = wxEmptyString); const wxString& filter = wxEmptyString) wxOVERRIDE;
protected: protected:
bool Init(); bool Init();

16
include/wx/msw/gauge.h
View File

@@ -45,22 +45,22 @@ public:
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;
// overridden base class virtuals // overridden base class virtuals
virtual bool SetForegroundColour(const wxColour& col); virtual bool SetForegroundColour(const wxColour& col) wxOVERRIDE;
virtual bool SetBackgroundColour(const wxColour& col); virtual bool SetBackgroundColour(const wxColour& col) wxOVERRIDE;
virtual void Pulse(); virtual void Pulse() wxOVERRIDE;
WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
private: private:
// returns true if the control is currently in indeterminate (a.k.a. // returns true if the control is currently in indeterminate (a.k.a.

10
include/wx/msw/gdiimage.h
View File

@@ -50,7 +50,7 @@ public:
} }
// accessors // accessors
virtual bool IsOk() const { return m_handle != 0; } virtual bool IsOk() const wxOVERRIDE { return m_handle != 0; }
void SetSize(int w, int h) { m_width = w; m_height = h; } void SetSize(int w, int h) { m_width = w; m_height = h; }
@@ -130,19 +130,19 @@ public:
void SetSize(const wxSize& size) { SetSize(size.x, size.y); } void SetSize(const wxSize& size) { SetSize(size.x, size.y); }
// forward some of base class virtuals to wxGDIImageRefData // forward some of base class virtuals to wxGDIImageRefData
bool FreeResource(bool force = false); bool FreeResource(bool force = false) wxOVERRIDE;
virtual WXHANDLE GetResourceHandle() const; virtual WXHANDLE GetResourceHandle() const wxOVERRIDE;
protected: protected:
// create the data for the derived class here // create the data for the derived class here
virtual wxGDIImageRefData *CreateData() const = 0; virtual wxGDIImageRefData *CreateData() const = 0;
// implement the wxGDIObject method in terms of our, more specific, one // implement the wxGDIObject method in terms of our, more specific, one
virtual wxGDIRefData *CreateGDIRefData() const { return CreateData(); } virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE { return CreateData(); }
// we can't [efficiently] clone objects of this class // we can't [efficiently] clone objects of this class
virtual wxGDIRefData * virtual wxGDIRefData *
CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const wxOVERRIDE
{ {
wxFAIL_MSG( wxT("must be implemented if used") ); wxFAIL_MSG( wxT("must be implemented if used") );

6
include/wx/msw/glcanvas.h
View File

@@ -29,7 +29,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;
HGLRC GetGLRC() const { return m_glContext; } HGLRC GetGLRC() const { return m_glContext; }
@@ -88,7 +88,7 @@ public:
virtual ~wxGLCanvas(); virtual ~wxGLCanvas();
// implement wxGLCanvasBase methods // implement wxGLCanvasBase methods
virtual bool SwapBuffers(); virtual bool SwapBuffers() wxOVERRIDE;
// MSW-specific helpers // MSW-specific helpers
@@ -109,7 +109,7 @@ public:
#if wxUSE_PALETTE #if wxUSE_PALETTE
// palette stuff // palette stuff
bool SetupPalette(const wxPalette& palette); bool SetupPalette(const wxPalette& palette);
virtual wxPalette CreateDefaultPalette(); virtual wxPalette CreateDefaultPalette() wxOVERRIDE;
void OnQueryNewPalette(wxQueryNewPaletteEvent& event); void OnQueryNewPalette(wxQueryNewPaletteEvent& event);
void OnPaletteChanged(wxPaletteChangedEvent& event); void OnPaletteChanged(wxPaletteChangedEvent& event);
#endif // wxUSE_PALETTE #endif // wxUSE_PALETTE

20
include/wx/msw/headerctrl.h
View File

@@ -54,25 +54,25 @@ public:
protected: protected:
// override wxWindow methods which must be implemented by a new control // override wxWindow methods which must be implemented by a new control
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual void DoSetSize(int x, int y, virtual void DoSetSize(int x, int y,
int width, int height, int width, int height,
int sizeFlags = wxSIZE_AUTO); int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
private: private:
// implement base class pure virtuals // implement base class pure virtuals
virtual void DoSetCount(unsigned int count); virtual void DoSetCount(unsigned int count) wxOVERRIDE;
virtual unsigned int DoGetCount() const; virtual unsigned int DoGetCount() const wxOVERRIDE;
virtual void DoUpdate(unsigned int idx); virtual void DoUpdate(unsigned int idx) wxOVERRIDE;
virtual void DoScrollHorz(int dx); virtual void DoScrollHorz(int dx) wxOVERRIDE;
virtual void DoSetColumnsOrder(const wxArrayInt& order); virtual void DoSetColumnsOrder(const wxArrayInt& order) wxOVERRIDE;
virtual wxArrayInt DoGetColumnsOrder() const; virtual wxArrayInt DoGetColumnsOrder() const wxOVERRIDE;
// override MSW-specific methods needed for new control // override MSW-specific methods needed for new control
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
// common part of all ctors // common part of all ctors
void Init(); void Init();

30
include/wx/msw/helpbest.h
View File

@@ -32,52 +32,52 @@ public:
virtual ~wxBestHelpController() { delete m_helpController; } virtual ~wxBestHelpController() { delete m_helpController; }
// Must call this to set the filename // Must call this to set the filename
virtual bool Initialize(const wxString& file); virtual bool Initialize(const wxString& file) wxOVERRIDE;
virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); } virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) wxOVERRIDE { return Initialize( file ); }
// If file is "", reloads file given in Initialize // If file is "", reloads file given in Initialize
virtual bool LoadFile(const wxString& file = wxEmptyString) virtual bool LoadFile(const wxString& file = wxEmptyString) wxOVERRIDE
{ {
return m_helpController->LoadFile( GetValidFilename( file ) ); return m_helpController->LoadFile( GetValidFilename( file ) );
} }
virtual bool DisplayContents() virtual bool DisplayContents() wxOVERRIDE
{ {
return m_helpController->DisplayContents(); return m_helpController->DisplayContents();
} }
virtual bool DisplaySection(int sectionNo) virtual bool DisplaySection(int sectionNo) wxOVERRIDE
{ {
return m_helpController->DisplaySection( sectionNo ); return m_helpController->DisplaySection( sectionNo );
} }
virtual bool DisplaySection(const wxString& section) virtual bool DisplaySection(const wxString& section) wxOVERRIDE
{ {
return m_helpController->DisplaySection( section ); return m_helpController->DisplaySection( section );
} }
virtual bool DisplayBlock(long blockNo) virtual bool DisplayBlock(long blockNo) wxOVERRIDE
{ {
return m_helpController->DisplayBlock( blockNo ); return m_helpController->DisplayBlock( blockNo );
} }
virtual bool DisplayContextPopup(int contextId) virtual bool DisplayContextPopup(int contextId) wxOVERRIDE
{ {
return m_helpController->DisplayContextPopup( contextId ); return m_helpController->DisplayContextPopup( contextId );
} }
virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos) virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos) wxOVERRIDE
{ {
return m_helpController->DisplayTextPopup( text, pos ); return m_helpController->DisplayTextPopup( text, pos );
} }
virtual bool KeywordSearch(const wxString& k, virtual bool KeywordSearch(const wxString& k,
wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE
{ {
return m_helpController->KeywordSearch( k, mode ); return m_helpController->KeywordSearch( k, mode );
} }
virtual bool Quit() virtual bool Quit() wxOVERRIDE
{ {
return m_helpController->Quit(); return m_helpController->Quit();
} }
@@ -86,7 +86,7 @@ public:
virtual void SetFrameParameters(const wxString& title, virtual void SetFrameParameters(const wxString& title,
const wxSize& size, const wxSize& size,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
bool newFrameEachTime = false) bool newFrameEachTime = false) wxOVERRIDE
{ {
m_helpController->SetFrameParameters( title, size, pos, m_helpController->SetFrameParameters( title, size, pos,
newFrameEachTime ); newFrameEachTime );
@@ -95,17 +95,17 @@ public:
// Obtains the latest settings used by the help frame and the help frame. // Obtains the latest settings used by the help frame and the help frame.
virtual wxFrame *GetFrameParameters(wxSize *size = NULL, virtual wxFrame *GetFrameParameters(wxSize *size = NULL,
wxPoint *pos = NULL, wxPoint *pos = NULL,
bool *newFrameEachTime = NULL) bool *newFrameEachTime = NULL) wxOVERRIDE
{ {
return m_helpController->GetFrameParameters( size, pos, return m_helpController->GetFrameParameters( size, pos,
newFrameEachTime ); newFrameEachTime );
} }
/// Set the window that can optionally be used for the help window's parent. /// Set the window that can optionally be used for the help window's parent.
virtual void SetParentWindow(wxWindow* win) { m_helpController->SetParentWindow(win); } virtual void SetParentWindow(wxWindow* win) wxOVERRIDE { m_helpController->SetParentWindow(win); }
/// Get the window that can optionally be used for the help window's parent. /// Get the window that can optionally be used for the help window's parent.
virtual wxWindow* GetParentWindow() const { return m_helpController->GetParentWindow(); } virtual wxWindow* GetParentWindow() const wxOVERRIDE { return m_helpController->GetParentWindow(); }
protected: protected:
// Append/change extension if necessary. // Append/change extension if necessary.

22
include/wx/msw/helpchm.h
View File

@@ -21,20 +21,20 @@ public:
wxCHMHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) { } wxCHMHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) { }
// Must call this to set the filename // Must call this to set the filename
virtual bool Initialize(const wxString& file); virtual bool Initialize(const wxString& file) wxOVERRIDE;
virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); } virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) wxOVERRIDE { return Initialize( file ); }
// If file is "", reloads file given in Initialize // If file is "", reloads file given in Initialize
virtual bool LoadFile(const wxString& file = wxEmptyString); virtual bool LoadFile(const wxString& file = wxEmptyString) wxOVERRIDE;
virtual bool DisplayContents(); virtual bool DisplayContents() wxOVERRIDE;
virtual bool DisplaySection(int sectionNo); virtual bool DisplaySection(int sectionNo) wxOVERRIDE;
virtual bool DisplaySection(const wxString& section); virtual bool DisplaySection(const wxString& section) wxOVERRIDE;
virtual bool DisplayBlock(long blockNo); virtual bool DisplayBlock(long blockNo) wxOVERRIDE;
virtual bool DisplayContextPopup(int contextId); virtual bool DisplayContextPopup(int contextId) wxOVERRIDE;
virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos); virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos) wxOVERRIDE;
virtual bool KeywordSearch(const wxString& k, virtual bool KeywordSearch(const wxString& k,
wxHelpSearchMode mode = wxHELP_SEARCH_ALL); wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE;
virtual bool Quit(); virtual bool Quit() wxOVERRIDE;
wxString GetHelpFile() const { return m_helpFile; } wxString GetHelpFile() const { return m_helpFile; }

20
include/wx/msw/helpwin.h
View File

@@ -26,19 +26,19 @@ public:
virtual ~wxWinHelpController() {} virtual ~wxWinHelpController() {}
// Must call this to set the filename // Must call this to set the filename
virtual bool Initialize(const wxString& file); virtual bool Initialize(const wxString& file) wxOVERRIDE;
virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); } virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) wxOVERRIDE { return Initialize( file ); }
// If file is "", reloads file given in Initialize // If file is "", reloads file given in Initialize
virtual bool LoadFile(const wxString& file = wxEmptyString); virtual bool LoadFile(const wxString& file = wxEmptyString) wxOVERRIDE;
virtual bool DisplayContents(); virtual bool DisplayContents() wxOVERRIDE;
virtual bool DisplaySection(int sectionNo); virtual bool DisplaySection(int sectionNo) wxOVERRIDE;
virtual bool DisplaySection(const wxString& section) { return KeywordSearch(section); } virtual bool DisplaySection(const wxString& section) wxOVERRIDE { return KeywordSearch(section); }
virtual bool DisplayBlock(long blockNo); virtual bool DisplayBlock(long blockNo) wxOVERRIDE;
virtual bool DisplayContextPopup(int contextId); virtual bool DisplayContextPopup(int contextId) wxOVERRIDE;
virtual bool KeywordSearch(const wxString& k, virtual bool KeywordSearch(const wxString& k,
wxHelpSearchMode mode = wxHELP_SEARCH_ALL); wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE;
virtual bool Quit(); virtual bool Quit() wxOVERRIDE;
inline wxString GetHelpFile() const { return m_helpFile; } inline wxString GetHelpFile() const { return m_helpFile; }

10
include/wx/msw/hyperlink.h
View File

@@ -47,16 +47,16 @@ public:
// overridden base class methods // overridden base class methods
// ----------------------------- // -----------------------------
virtual void SetURL(const wxString &url); virtual void SetURL(const wxString &url) wxOVERRIDE;
virtual void SetLabel(const wxString &label); virtual void SetLabel(const wxString &label) wxOVERRIDE;
protected: protected:
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
virtual wxSize DoGetBestClientSize() const; virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
private: private:
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS( wxHyperlinkCtrl ); wxDECLARE_DYNAMIC_CLASS( wxHyperlinkCtrl );
}; };

6
include/wx/msw/icon.h
View File

@@ -29,7 +29,7 @@ public:
wxIconRefData() { } wxIconRefData() { }
virtual ~wxIconRefData() { Free(); } virtual ~wxIconRefData() { Free(); }
virtual void Free(); virtual void Free() wxOVERRIDE;
}; };
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -78,12 +78,12 @@ public:
void CopyFromBitmap(const wxBitmap& bmp); void CopyFromBitmap(const wxBitmap& bmp);
protected: protected:
virtual wxGDIImageRefData *CreateData() const virtual wxGDIImageRefData *CreateData() const wxOVERRIDE
{ {
return new wxIconRefData; return new wxIconRefData;
} }
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE;
// create from XPM data // create from XPM data
void CreateIconFromXpm(const char* const* data); void CreateIconFromXpm(const char* const* data);

44
include/wx/msw/iniconf.h
View File

@@ -51,41 +51,41 @@ public:
virtual ~wxIniConfig(); virtual ~wxIniConfig();
// implement inherited pure virtual functions // implement inherited pure virtual functions
virtual void SetPath(const wxString& strPath); virtual void SetPath(const wxString& strPath) wxOVERRIDE;
virtual const wxString& GetPath() const; virtual const wxString& GetPath() const wxOVERRIDE;
virtual bool GetFirstGroup(wxString& str, long& lIndex) const; virtual bool GetFirstGroup(wxString& str, long& lIndex) const wxOVERRIDE;
virtual bool GetNextGroup (wxString& str, long& lIndex) const; virtual bool GetNextGroup (wxString& str, long& lIndex) const wxOVERRIDE;
virtual bool GetFirstEntry(wxString& str, long& lIndex) const; virtual bool GetFirstEntry(wxString& str, long& lIndex) const wxOVERRIDE;
virtual bool GetNextEntry (wxString& str, long& lIndex) const; virtual bool GetNextEntry (wxString& str, long& lIndex) const wxOVERRIDE;
virtual size_t GetNumberOfEntries(bool bRecursive = false) const; virtual size_t GetNumberOfEntries(bool bRecursive = false) const wxOVERRIDE;
virtual size_t GetNumberOfGroups(bool bRecursive = false) const; virtual size_t GetNumberOfGroups(bool bRecursive = false) const wxOVERRIDE;
virtual bool HasGroup(const wxString& strName) const; virtual bool HasGroup(const wxString& strName) const wxOVERRIDE;
virtual bool HasEntry(const wxString& strName) const; virtual bool HasEntry(const wxString& strName) const wxOVERRIDE;
// return true if the current group is empty // return true if the current group is empty
bool IsEmpty() const; bool IsEmpty() const;
virtual bool Flush(bool bCurrentOnly = false); virtual bool Flush(bool bCurrentOnly = false) wxOVERRIDE;
virtual bool RenameEntry(const wxString& oldName, const wxString& newName); virtual bool RenameEntry(const wxString& oldName, const wxString& newName) wxOVERRIDE;
virtual bool RenameGroup(const wxString& oldName, const wxString& newName); virtual bool RenameGroup(const wxString& oldName, const wxString& newName) wxOVERRIDE;
virtual bool DeleteEntry(const wxString& Key, bool bGroupIfEmptyAlso = true); virtual bool DeleteEntry(const wxString& Key, bool bGroupIfEmptyAlso = true) wxOVERRIDE;
virtual bool DeleteGroup(const wxString& szKey); virtual bool DeleteGroup(const wxString& szKey) wxOVERRIDE;
virtual bool DeleteAll(); virtual bool DeleteAll() wxOVERRIDE;
protected: protected:
// read/write // read/write
bool DoReadString(const wxString& key, wxString *pStr) const; bool DoReadString(const wxString& key, wxString *pStr) const wxOVERRIDE;
bool DoReadLong(const wxString& key, long *plResult) const; bool DoReadLong(const wxString& key, long *plResult) const wxOVERRIDE;
bool DoReadBinary(const wxString& key, wxMemoryBuffer *buf) const; bool DoReadBinary(const wxString& key, wxMemoryBuffer *buf) const wxOVERRIDE;
bool DoWriteString(const wxString& key, const wxString& szValue); bool DoWriteString(const wxString& key, const wxString& szValue) wxOVERRIDE;
bool DoWriteLong(const wxString& key, long lValue); bool DoWriteLong(const wxString& key, long lValue) wxOVERRIDE;
bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf); bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) wxOVERRIDE;
private: private:
// helpers // helpers

54
include/wx/msw/listbox.h
View File

@@ -80,31 +80,31 @@ public:
virtual ~wxListBox(); virtual ~wxListBox();
virtual unsigned int GetCount() const; virtual unsigned int GetCount() const wxOVERRIDE;
virtual wxString GetString(unsigned int n) const; virtual wxString GetString(unsigned int n) const wxOVERRIDE;
virtual void SetString(unsigned int n, const wxString& s); virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
virtual int FindString(const wxString& s, bool bCase = false) const; virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE;
virtual bool IsSelected(int n) const; virtual bool IsSelected(int n) const wxOVERRIDE;
virtual int GetSelection() const; virtual int GetSelection() const wxOVERRIDE;
virtual int GetSelections(wxArrayInt& aSelections) const; virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE;
// return the index of the item at this position or wxNOT_FOUND // return the index of the item at this position or wxNOT_FOUND
int HitTest(const wxPoint& pt) const { return DoHitTestList(pt); } int HitTest(const wxPoint& pt) const { return DoHitTestList(pt); }
int HitTest(wxCoord x, wxCoord y) const { return DoHitTestList(wxPoint(x, y)); } int HitTest(wxCoord x, wxCoord y) const { return DoHitTestList(wxPoint(x, y)); }
virtual void EnsureVisible(int n); virtual void EnsureVisible(int n) wxOVERRIDE;
virtual int GetTopItem() const; virtual int GetTopItem() const wxOVERRIDE;
virtual int GetCountPerPage() const; virtual int GetCountPerPage() const wxOVERRIDE;
// ownerdrawn wxListBox and wxCheckListBox support // ownerdrawn wxListBox and wxCheckListBox support
#if wxUSE_OWNER_DRAWN #if wxUSE_OWNER_DRAWN
// override base class virtuals // override base class virtuals
virtual bool SetFont(const wxFont &font); virtual bool SetFont(const wxFont &font) wxOVERRIDE;
bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item); bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item) wxOVERRIDE;
bool MSWOnDraw(WXDRAWITEMSTRUCT *item); bool MSWOnDraw(WXDRAWITEMSTRUCT *item) wxOVERRIDE;
// plug-in for derived classes // plug-in for derived classes
virtual wxOwnerDrawn *CreateLboxItem(size_t n); virtual wxOwnerDrawn *CreateLboxItem(size_t n);
@@ -129,17 +129,17 @@ public:
virtual void SetHorizontalExtent(const wxString& s = wxEmptyString); virtual void SetHorizontalExtent(const wxString& s = wxEmptyString);
// Windows callbacks // Windows callbacks
bool MSWCommand(WXUINT param, WXWORD id); bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
// under XP when using "transition effect for menus and tooltips" if we // under XP when using "transition effect for menus and tooltips" if we
// return true for WM_PRINTCLIENT here then it causes noticeable slowdown // return true for WM_PRINTCLIENT here then it causes noticeable slowdown
virtual bool MSWShouldPropagatePrintChild() virtual bool MSWShouldPropagatePrintChild() wxOVERRIDE
{ {
return false; return false;
} }
virtual wxVisualAttributes GetDefaultAttributes() const virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
{ {
return GetClassDefaultAttributes(GetWindowVariant()); return GetClassDefaultAttributes(GetWindowVariant());
} }
@@ -151,25 +151,25 @@ public:
} }
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
virtual void OnInternalIdle(); virtual void OnInternalIdle() wxOVERRIDE;
protected: protected:
virtual wxSize DoGetBestClientSize() const; virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
virtual void DoClear(); virtual void DoClear() wxOVERRIDE;
virtual void DoDeleteOneItem(unsigned int n); virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
virtual void DoSetSelection(int n, bool select); virtual void DoSetSelection(int n, bool select) 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 DoSetFirstItem(int n); virtual void DoSetFirstItem(int n) 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;
// this can't be called DoHitTest() because wxWindow already has this method // this can't be called DoHitTest() because wxWindow already has this method
virtual int DoHitTestList(const wxPoint& point) const; virtual int DoHitTestList(const wxPoint& point) const;

46
include/wx/msw/listctrl.h
View File

@@ -113,23 +113,23 @@ 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;
// Header attributes // Header attributes
virtual bool SetHeaderAttr(const wxItemAttr& attr) wxOVERRIDE; virtual bool SetHeaderAttr(const wxItemAttr& attr) wxOVERRIDE;
// Gets information about this column // Gets information about this column
bool GetColumn(int col, wxListItem& item) const; bool GetColumn(int col, wxListItem& item) const wxOVERRIDE;
// Sets information about this column // Sets information about this column
bool SetColumn(int col, const wxListItem& item); bool SetColumn(int col, const wxListItem& item) 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
@@ -203,7 +203,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 { return m_colCount; } int GetColumnCount() const wxOVERRIDE { return m_colCount; }
// 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;
@@ -243,7 +243,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
@@ -252,7 +252,7 @@ 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
// N.B. There's a quirk in the Win95 list view implementation. // N.B. There's a quirk in the Win95 list view implementation.
@@ -261,8 +261,8 @@ public:
// haven't specified wxLIST_MASK_IMAGE when inserting. // haven't specified wxLIST_MASK_IMAGE when inserting.
// So you have to set a NULL small-icon image list to be sure that // So you have to set a NULL small-icon image list to be sure that
// the wxLC_LIST mode works without icons. Of course, you may want icons... // the wxLC_LIST mode works without icons. Of course, you may want icons...
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);
@@ -281,10 +281,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();
@@ -352,9 +352,9 @@ public:
bool SortItems(wxListCtrlCompare fn, wxIntPtr data); bool SortItems(wxListCtrlCompare fn, wxIntPtr data);
// IMPLEMENTATION // IMPLEMENTATION
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
virtual bool MSWShouldPreProcessMessage(WXMSG* msg); virtual bool MSWShouldPreProcessMessage(WXMSG* msg) wxOVERRIDE;
// bring the control in sync with current m_windowStyle value // bring the control in sync with current m_windowStyle value
void UpdateStyle(); void UpdateStyle();
@@ -365,9 +365,9 @@ public:
void OnPaint(wxPaintEvent& event); void OnPaint(wxPaintEvent& event);
virtual bool ShouldInheritColours() const { return false; } virtual bool ShouldInheritColours() const wxOVERRIDE { return false; }
virtual wxVisualAttributes GetDefaultAttributes() const virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
{ {
return GetClassDefaultAttributes(GetWindowVariant()); return GetClassDefaultAttributes(GetWindowVariant());
} }
@@ -376,27 +376,27 @@ public:
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
// convert our styles to Windows // convert our styles to Windows
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
// special Windows message handling // special Windows message handling
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
WXWPARAM wParam, WXWPARAM wParam,
WXLPARAM lParam); WXLPARAM lParam) wxOVERRIDE;
protected: protected:
// common part of all ctors // common part of all ctors
void Init(); void Init();
// Implement constrained best size calculation. // Implement constrained best size calculation.
virtual int DoGetBestClientHeight(int width) const virtual int DoGetBestClientHeight(int width) const wxOVERRIDE
{ return MSWGetBestViewRect(width, -1).y; } { return MSWGetBestViewRect(width, -1).y; }
virtual int DoGetBestClientWidth(int height) const virtual int DoGetBestClientWidth(int height) const wxOVERRIDE
{ return MSWGetBestViewRect(-1, height).x; } { return MSWGetBestViewRect(-1, height).x; }
wxSize MSWGetBestViewRect(int x, int y) const; wxSize MSWGetBestViewRect(int x, int y) const;
// Implement base class pure virtual methods. // Implement base class pure virtual methods.
long DoInsertColumn(long col, const wxListItem& info); long DoInsertColumn(long col, const wxListItem& info) wxOVERRIDE;
// free memory taken by all internal data // free memory taken by all internal data
void FreeAllInternalData(); void FreeAllInternalData();

68
include/wx/msw/mdi.h
View File

@@ -54,21 +54,21 @@ public:
// we don't store the active child in m_currentChild so override this // we don't store the active child in m_currentChild so override this
// function to find it dynamically // function to find it dynamically
virtual wxMDIChildFrame *GetActiveChild() const; virtual wxMDIChildFrame *GetActiveChild() const wxOVERRIDE;
virtual void Cascade(); virtual void Cascade() wxOVERRIDE;
virtual void Tile(wxOrientation orient = wxHORIZONTAL); virtual void Tile(wxOrientation orient = wxHORIZONTAL) wxOVERRIDE;
virtual void ArrangeIcons(); virtual void ArrangeIcons() wxOVERRIDE;
virtual void ActivateNext(); virtual void ActivateNext() wxOVERRIDE;
virtual void ActivatePrevious(); virtual void ActivatePrevious() wxOVERRIDE;
#if wxUSE_MENUS #if wxUSE_MENUS
virtual void SetWindowMenu(wxMenu* menu); virtual void SetWindowMenu(wxMenu* menu) wxOVERRIDE;
virtual void DoMenuUpdates(wxMenu* menu = NULL); virtual void DoMenuUpdates(wxMenu* menu = NULL) wxOVERRIDE;
// return the active child menu, if any // return the active child menu, if any
virtual WXHMENU MSWGetActiveMenu() const; virtual WXHMENU MSWGetActiveMenu() const wxOVERRIDE;
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
@@ -98,24 +98,24 @@ public:
bool HandleActivate(int state, bool minimized, WXHWND activate); bool HandleActivate(int state, bool minimized, WXHWND activate);
// override window proc for MDI-specific message processing // override window proc for MDI-specific message processing
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
virtual WXLRESULT MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM); virtual WXLRESULT MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM) wxOVERRIDE;
virtual bool MSWTranslateMessage(WXMSG* msg); virtual bool MSWTranslateMessage(WXMSG* msg) wxOVERRIDE;
#if wxUSE_MENUS #if wxUSE_MENUS
// override the menu-relayed methods to also look in the active child menu // override the menu-relayed methods to also look in the active child menu
// bar and the "Window" menu // bar and the "Window" menu
virtual wxMenuItem *FindItemInMenuBar(int menuId) const; virtual wxMenuItem *FindItemInMenuBar(int menuId) const wxOVERRIDE;
virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu); virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu) wxOVERRIDE;
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
protected: protected:
#if wxUSE_MENUS_NATIVE #if wxUSE_MENUS_NATIVE
virtual void InternalSetMenuBar(); virtual void InternalSetMenuBar() wxOVERRIDE;
#endif // wxUSE_MENUS_NATIVE #endif // wxUSE_MENUS_NATIVE
virtual WXHICON GetDefaultIcon() const; virtual WXHICON GetDefaultIcon() const wxOVERRIDE;
// set the size of the MDI client window to match the frame size // set the size of the MDI client window to match the frame size
void UpdateClientSize(); void UpdateClientSize();
@@ -190,13 +190,13 @@ public:
virtual ~wxMDIChildFrame(); virtual ~wxMDIChildFrame();
// implement MDI operations // implement MDI operations
virtual void Activate(); virtual void Activate() wxOVERRIDE;
// Override some frame operations too // Override some frame operations too
virtual void Maximize(bool maximize = true); virtual void Maximize(bool maximize = true) wxOVERRIDE;
virtual void Restore(); virtual void Restore() wxOVERRIDE;
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
// Implementation only from now on // Implementation only from now on
// ------------------------------- // -------------------------------
@@ -206,26 +206,26 @@ public:
bool HandleWindowPosChanging(void *lpPos); bool HandleWindowPosChanging(void *lpPos);
bool HandleGetMinMaxInfo(void *mmInfo); bool HandleGetMinMaxInfo(void *mmInfo);
virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
virtual WXLRESULT MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); virtual WXLRESULT MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
virtual bool MSWTranslateMessage(WXMSG *msg); virtual bool MSWTranslateMessage(WXMSG *msg) wxOVERRIDE;
virtual void MSWDestroyWindow(); virtual void MSWDestroyWindow() wxOVERRIDE;
bool ResetWindowStyle(void *vrect); bool ResetWindowStyle(void *vrect);
void OnIdle(wxIdleEvent& event); void OnIdle(wxIdleEvent& event);
protected: protected:
virtual void DoGetScreenPosition(int *x, int *y) const; virtual void DoGetScreenPosition(int *x, int *y) const wxOVERRIDE;
virtual void DoGetPosition(int *x, int *y) const; virtual void DoGetPosition(int *x, int *y) const wxOVERRIDE;
virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags); virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE;
virtual void DoSetClientSize(int width, int height); virtual void DoSetClientSize(int width, int height) wxOVERRIDE;
virtual void InternalSetMenuBar(); virtual void InternalSetMenuBar() wxOVERRIDE;
virtual bool IsMDIChild() const { return true; } virtual bool IsMDIChild() const wxOVERRIDE { return true; }
virtual void DetachMenuBar(); virtual void DetachMenuBar() wxOVERRIDE;
virtual WXHICON GetDefaultIcon() const; virtual WXHICON GetDefaultIcon() const wxOVERRIDE;
// common part of all ctors // common part of all ctors
void Init(); void Init();
@@ -248,7 +248,7 @@ public:
// Note: this is virtual, to allow overridden behaviour. // Note: this is virtual, to allow overridden behaviour.
virtual bool CreateClient(wxMDIParentFrame *parent, virtual bool CreateClient(wxMDIParentFrame *parent,
long style = wxVSCROLL | wxHSCROLL); long style = wxVSCROLL | wxHSCROLL) wxOVERRIDE;
// Explicitly call default scroll behaviour // Explicitly call default scroll behaviour
void OnScroll(wxScrollEvent& event); void OnScroll(wxScrollEvent& event);
@@ -256,7 +256,7 @@ public:
protected: protected:
virtual void DoSetSize(int x, int y, virtual void DoSetSize(int x, int y,
int width, int height, int width, int height,
int sizeFlags = wxSIZE_AUTO); int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
void Init() { m_scrollX = m_scrollY = 0; } void Init() { m_scrollX = m_scrollY = 0; }

32
include/wx/msw/menu.h
View File

@@ -40,9 +40,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;
// MSW-only methods // MSW-only methods
// ---------------- // ----------------
@@ -109,9 +109,9 @@ private:
#endif // wxUSE_OWNER_DRAWN #endif // wxUSE_OWNER_DRAWN
protected: protected:
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:
// This constructor is private, use MSWNewFromHMENU() to use it. // This constructor is private, use MSWNewFromHMENU() to use it.
@@ -177,20 +177,20 @@ 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;
// implementation from now on // implementation from now on
WXHMENU Create(); WXHMENU Create();
virtual void Detach(); virtual void Detach() wxOVERRIDE;
virtual void Attach(wxFrame *frame); virtual void Attach(wxFrame *frame) wxOVERRIDE;
#if wxUSE_ACCEL #if wxUSE_ACCEL
// update the accel table (must be called after adding/deleting a menu) // update the accel table (must be called after adding/deleting a menu)
@@ -206,7 +206,7 @@ public:
// To avoid compile warning // To avoid compile warning
void Refresh( bool eraseBackground, void Refresh( bool eraseBackground,
const wxRect *rect = (const wxRect *) NULL ) { wxWindow::Refresh(eraseBackground, rect); } const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE { wxWindow::Refresh(eraseBackground, rect); }
// Get a top level menu position or wxNOT_FOUND from its handle. // Get a top level menu position or wxNOT_FOUND from its handle.
int MSWGetTopMenuPos(WXHMENU hMenu) const; int MSWGetTopMenuPos(WXHMENU hMenu) const;

18
include/wx/msw/menuitem.h
View File

@@ -43,11 +43,11 @@ 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) wxOVERRIDE;
virtual void Check(bool bDoCheck = true); virtual void Check(bool bDoCheck = true) wxOVERRIDE;
virtual bool IsChecked() const; virtual bool IsChecked() const wxOVERRIDE;
// unfortunately needed to resolve ambiguity between // unfortunately needed to resolve ambiguity between
// wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable() // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable()
@@ -101,13 +101,13 @@ public:
int MeasureAccelWidth() const; int MeasureAccelWidth() const;
// override wxOwnerDrawn base class virtuals // override wxOwnerDrawn base class virtuals
virtual wxString GetName() const; virtual wxString GetName() const wxOVERRIDE;
virtual bool OnMeasureItem(size_t *pwidth, size_t *pheight); virtual bool OnMeasureItem(size_t *pwidth, size_t *pheight) wxOVERRIDE;
virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat); virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat) wxOVERRIDE;
protected: protected:
virtual void GetFontToUse(wxFont& font) const; virtual void GetFontToUse(wxFont& font) const wxOVERRIDE;
virtual void GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const; virtual void GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const wxOVERRIDE;
private: private:
// helper function for draw std menu check mark // helper function for draw std menu check mark

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

@@ -30,7 +30,7 @@ public:
wxMetafileRefData(); wxMetafileRefData();
virtual ~wxMetafileRefData(); virtual ~wxMetafileRefData();
virtual bool IsOk() const { return m_metafile != 0; } virtual bool IsOk() const wxOVERRIDE { return m_metafile != 0; }
public: public:
WXHANDLE m_metafile; WXHANDLE m_metafile;
@@ -69,8 +69,8 @@ public:
void SetWindowsMappingMode(int mm); void SetWindowsMappingMode(int mm);
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(wxMetafile); wxDECLARE_DYNAMIC_CLASS(wxMetafile);
@@ -85,12 +85,12 @@ public:
virtual ~wxMetafileDCImpl(); virtual ~wxMetafileDCImpl();
virtual wxMetafile *Close(); virtual wxMetafile *Close();
virtual void SetMapMode(wxMappingMode mode); virtual void SetMapMode(wxMappingMode mode) 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;
// Implementation // Implementation
wxMetafile *GetMetaFile() const { return m_metaFile; } wxMetafile *GetMetaFile() const { return m_metaFile; }
@@ -99,7 +99,7 @@ public:
void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; } void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; }
protected: protected:
virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
int m_windowsMappingMode; int m_windowsMappingMode;
wxMetafile* m_metaFile; wxMetafile* m_metaFile;
@@ -174,9 +174,9 @@ 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;
protected: protected:
wxMetafile m_metafile; wxMetafile m_metafile;

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

@@ -24,9 +24,9 @@ public:
m_hook = NULL; m_hook = NULL;
} }
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
virtual long GetEffectiveIcon() const; virtual long GetEffectiveIcon() const wxOVERRIDE;
// implementation-specific // implementation-specific
@@ -35,7 +35,7 @@ public:
protected: protected:
// Override this as task dialogs are always centered on parent. // Override this as task dialogs are always centered on parent.
virtual void DoCentre(int dir); virtual void DoCentre(int dir) wxOVERRIDE;
private: private:
// hook procedure used to adjust the message box beyond what the standard // hook procedure used to adjust the message box beyond what the standard

6
include/wx/msw/nonownedwnd.h
View File

@@ -23,10 +23,10 @@ public:
virtual ~wxNonOwnedWindow(); virtual ~wxNonOwnedWindow();
protected: protected:
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;
private: private:
wxNonOwnedWindowShapeImpl* m_shapeImpl; wxNonOwnedWindowShapeImpl* m_shapeImpl;

54
include/wx/msw/notebook.h
View File

@@ -48,19 +48,19 @@ public:
// accessors // accessors
// --------- // ---------
// get number of pages in the dialog // get number of pages in the dialog
virtual size_t GetPageCount() const; virtual size_t GetPageCount() const wxOVERRIDE;
// set the currently selected page, return the index of the previously // set the currently selected page, return the index of the previously
// selected one (or wxNOT_FOUND on error) // selected one (or wxNOT_FOUND on error)
// NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
int SetSelection(size_t nPage); int SetSelection(size_t nPage) wxOVERRIDE;
// changes selected page without sending events // changes selected page without sending events
int ChangeSelection(size_t nPage); int ChangeSelection(size_t nPage) wxOVERRIDE;
// set/get the title of a page // set/get the title of a page
bool SetPageText(size_t nPage, const wxString& strText); bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE;
wxString GetPageText(size_t nPage) const; wxString GetPageText(size_t nPage) const wxOVERRIDE;
// image list stuff: each page may have an image associated with it. All // image list stuff: each page may have an image associated with it. All
// the images belong to an image list, so you have to // the images belong to an image list, so you have to
@@ -68,26 +68,26 @@ public:
// 2) associate it with the notebook // 2) associate it with the notebook
// 3) set for each page it's image // 3) set for each page it's image
// associate image list with a control // associate image list with a control
void SetImageList(wxImageList* imageList); void SetImageList(wxImageList* imageList) wxOVERRIDE;
// sets/returns item's image index in the current image list // sets/returns item's image index in the current image list
int GetPageImage(size_t nPage) const; int GetPageImage(size_t nPage) const wxOVERRIDE;
bool SetPageImage(size_t nPage, int nImage); bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE;
// currently it's always 1 because wxGTK doesn't support multi-row // currently it's always 1 because wxGTK doesn't support multi-row
// tab controls // tab controls
int GetRowCount() const; int GetRowCount() const wxOVERRIDE;
// control the appearance of the notebook pages // control the appearance of the notebook pages
// set the size (the same for all pages) // set the size (the same for all pages)
void SetPageSize(const wxSize& size); void SetPageSize(const wxSize& size) wxOVERRIDE;
// set the padding between tabs (in pixels) // set the padding between tabs (in pixels)
void SetPadding(const wxSize& padding); void SetPadding(const wxSize& padding) wxOVERRIDE;
// operations // operations
// ---------- // ----------
// remove all pages // remove all pages
bool DeleteAllPages(); bool DeleteAllPages() wxOVERRIDE;
// inserts a new page to the notebook (it will be deleted ny the notebook, // inserts a new page to the notebook (it will be deleted ny the notebook,
// don't delete it yourself). If bSelect, this page becomes active. // don't delete it yourself). If bSelect, this page becomes active.
@@ -95,17 +95,17 @@ public:
wxNotebookPage *pPage, wxNotebookPage *pPage,
const wxString& strText, const wxString& strText,
bool bSelect = false, bool bSelect = false,
int imageId = NO_IMAGE); int imageId = NO_IMAGE) wxOVERRIDE;
// Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
// style. // style.
void SetTabSize(const wxSize& sz); void SetTabSize(const wxSize& sz) wxOVERRIDE;
// hit test // hit test
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; virtual int HitTest(const wxPoint& pt, long *flags = NULL) const wxOVERRIDE;
// calculate the size of the notebook from the size of its page // calculate the size of the notebook from the size of its page
virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE;
// callbacks // callbacks
// --------- // ---------
@@ -115,23 +115,23 @@ public:
// base class virtuals // base class virtuals
// ------------------- // -------------------
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
virtual bool MSWOnScroll(int orientation, WXWORD nSBCode, virtual bool MSWOnScroll(int orientation, WXWORD nSBCode,
WXWORD pos, WXHWND control); WXWORD pos, WXHWND control) wxOVERRIDE;
#if wxUSE_CONSTRAINTS #if wxUSE_CONSTRAINTS
virtual void SetConstraintSizes(bool recurse = true); virtual void SetConstraintSizes(bool recurse = true) wxOVERRIDE;
virtual bool DoPhase(int nPhase); virtual bool DoPhase(int nPhase) wxOVERRIDE;
#endif // wxUSE_CONSTRAINTS #endif // wxUSE_CONSTRAINTS
// Attempts to get colour for UX theme page background // Attempts to get colour for UX theme page background
wxColour GetThemeBackgroundColour() const; wxColour GetThemeBackgroundColour() const wxOVERRIDE;
// implementation only // implementation only
// ------------------- // -------------------
#if wxUSE_UXTHEME #if wxUSE_UXTHEME
virtual bool SetBackgroundColour(const wxColour& colour) virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE
{ {
if ( !wxNotebookBase::SetBackgroundColour(colour) ) if ( !wxNotebookBase::SetBackgroundColour(colour) )
return false; return false;
@@ -142,13 +142,13 @@ public:
} }
// draw child background // draw child background
virtual bool MSWPrintChild(WXHDC hDC, wxWindow *win); virtual bool MSWPrintChild(WXHDC hDC, wxWindow *win) wxOVERRIDE;
virtual bool MSWHasInheritableBackground() const { return true; } virtual bool MSWHasInheritableBackground() const wxOVERRIDE { return true; }
#endif // wxUSE_UXTHEME #endif // wxUSE_UXTHEME
// translate wxWin styles to the Windows ones // translate wxWin styles to the Windows ones
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE;
protected: protected:
// common part of all ctors // common part of all ctors
@@ -159,7 +159,7 @@ protected:
void UpdateSelection(int selNew); void UpdateSelection(int selNew);
// remove one page from the notebook, without deleting // remove one page from the notebook, without deleting
virtual wxNotebookPage *DoRemovePage(size_t nPage); virtual wxNotebookPage *DoRemovePage(size_t nPage) wxOVERRIDE;
// get the page rectangle for the current notebook size // get the page rectangle for the current notebook size
// //
@@ -171,7 +171,7 @@ protected:
#if wxUSE_UXTHEME #if wxUSE_UXTHEME
// return the themed brush for painting our children // return the themed brush for painting our children
virtual WXHBRUSH MSWGetCustomBgBrush() { return m_hbrBackground; } virtual WXHBRUSH MSWGetCustomBgBrush() wxOVERRIDE { return m_hbrBackground; }
// gets the bitmap of notebook background and returns a brush from it // gets the bitmap of notebook background and returns a brush from it
WXHBRUSH QueryBgBitmap(); WXHBRUSH QueryBgBitmap();

2
include/wx/msw/ownerdrw.h
View File

@@ -20,7 +20,7 @@ public:
virtual ~wxOwnerDrawn() {} virtual ~wxOwnerDrawn() {}
virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, virtual bool OnDrawItem(wxDC& dc, const wxRect& rc,
wxODAction act, wxODStatus stat); wxODAction act, wxODStatus stat) wxOVERRIDE;
}; };
#endif // wxUSE_OWNER_DRAWN #endif // wxUSE_OWNER_DRAWN

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

@@ -26,7 +26,7 @@ public:
bool Create(int n, bool Create(int n,
const unsigned char *red, const unsigned char *green, const unsigned char *blue); const unsigned char *red, const unsigned char *green, const unsigned char *blue);
virtual int GetColoursCount() const; virtual int GetColoursCount() const wxOVERRIDE;
int int
GetPixel(unsigned char red, unsigned char green, unsigned char blue) const; GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
@@ -40,8 +40,8 @@ public:
void SetHPALETTE(WXHPALETTE pal); void SetHPALETTE(WXHPALETTE pal);
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);

42
include/wx/msw/pen.h
View File

@@ -31,25 +31,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;
wxDash* GetDash() const; wxDash* GetDash() const;
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")
@@ -60,14 +60,14 @@ public:
// internal: wxGDIObject methods // internal: wxGDIObject methods
virtual bool RealizeResource(); virtual bool RealizeResource() wxOVERRIDE;
virtual bool FreeResource(bool force = false); virtual bool FreeResource(bool force = false) wxOVERRIDE;
virtual WXHANDLE GetResourceHandle() const; virtual WXHANDLE GetResourceHandle() const wxOVERRIDE;
virtual bool IsFree() const; virtual bool IsFree() 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;
// same as FreeResource() + RealizeResource() // same as FreeResource() + RealizeResource()
bool Recreate(); bool Recreate();

8
include/wx/msw/popupwin.h
View File

@@ -25,14 +25,14 @@ public:
bool Create(wxWindow *parent, int flags = wxBORDER_NONE); bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
virtual void SetFocus(); virtual void SetFocus() wxOVERRIDE;
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
// return the style to be used for the popup windows // return the style to be used for the popup windows
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const wxOVERRIDE;
// get the HWND to be used as parent of this window with CreateWindow() // get the HWND to be used as parent of this window with CreateWindow()
virtual WXHWND MSWGetParent() const; virtual WXHWND MSWGetParent() const wxOVERRIDE;
protected: protected:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow);

20
include/wx/msw/printdlg.h
View File

@@ -31,11 +31,11 @@ public:
wxWindowsPrintNativeData(); wxWindowsPrintNativeData();
virtual ~wxWindowsPrintNativeData(); virtual ~wxWindowsPrintNativeData();
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 Ok() const { return IsOk(); } virtual bool Ok() const wxOVERRIDE { return IsOk(); }
virtual bool IsOk() const; virtual bool IsOk() const wxOVERRIDE;
void InitializeDevMode(const wxString &printerName = wxEmptyString, WinPrinter* printer = NULL); void InitializeDevMode(const wxString &printerName = wxEmptyString, WinPrinter* printer = NULL);
void* GetDevMode() const { return m_devMode; } void* GetDevMode() const { return m_devMode; }
@@ -65,12 +65,12 @@ public:
virtual ~wxWindowsPrintDialog(); virtual ~wxWindowsPrintDialog();
bool Create(wxWindow *parent, wxPrintDialogData* data = NULL); bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; } wxPrintDialogData& GetPrintDialogData() wxOVERRIDE { return m_printDialogData; }
wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); } wxPrintData& GetPrintData() wxOVERRIDE { return m_printDialogData.GetPrintData(); }
virtual wxDC *GetPrintDC(); virtual wxDC *GetPrintDC() wxOVERRIDE;
private: private:
wxPrintDialogData m_printDialogData; wxPrintDialogData m_printDialogData;
@@ -102,11 +102,11 @@ public:
virtual ~wxWindowsPageSetupDialog(); virtual ~wxWindowsPageSetupDialog();
bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL); bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL);
virtual int ShowModal(); virtual int ShowModal() wxOVERRIDE;
bool ConvertToNative( wxPageSetupDialogData &data ); bool ConvertToNative( wxPageSetupDialogData &data );
bool ConvertFromNative( wxPageSetupDialogData &data ); bool ConvertFromNative( wxPageSetupDialogData &data );
virtual wxPageSetupDialogData& GetPageSetupDialogData() { return m_pageSetupData; } virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE { return m_pageSetupData; }
private: private:
wxPageSetupDialogData m_pageSetupData; wxPageSetupDialogData m_pageSetupData;

12
include/wx/msw/printwin.h
View File

@@ -26,10 +26,10 @@ 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;
private: private:
wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter); wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter);
@@ -51,12 +51,12 @@ public:
wxPrintData *data); wxPrintData *data);
virtual ~wxWindowsPrintPreview(); virtual ~wxWindowsPrintPreview();
virtual bool Print(bool interactive); virtual bool Print(bool interactive) wxOVERRIDE;
virtual void DetermineScaling(); virtual void DetermineScaling() wxOVERRIDE;
protected: protected:
#if wxUSE_ENH_METAFILE #if wxUSE_ENH_METAFILE
virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum); virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum) wxOVERRIDE;
#endif #endif
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview);

14
include/wx/msw/progdlg.h
View File

@@ -23,8 +23,8 @@ public:
virtual ~wxProgressDialog(); virtual ~wxProgressDialog();
virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL); virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL) wxOVERRIDE;
virtual bool Pulse(const wxString& newmsg = wxEmptyString, bool *skip = NULL); virtual bool Pulse(const wxString& newmsg = wxEmptyString, bool *skip = NULL) wxOVERRIDE;
void Resume(); void Resume();
@@ -38,15 +38,15 @@ public:
bool WasSkipped() const; bool WasSkipped() const;
bool WasCancelled() const; bool WasCancelled() const;
virtual void SetTitle(const wxString& title); virtual void SetTitle(const wxString& title) wxOVERRIDE;
virtual wxString GetTitle() const; virtual wxString GetTitle() const wxOVERRIDE;
virtual bool Show( bool show = true ); virtual bool Show( bool show = true ) wxOVERRIDE;
// Must provide overload to avoid hiding it (and warnings about it) // Must provide overload to avoid hiding it (and warnings about it)
virtual void Update() { wxGenericProgressDialog::Update(); } virtual void Update() wxOVERRIDE { wxGenericProgressDialog::Update(); }
virtual WXWidget GetHandle() const; virtual WXWidget GetHandle() const wxOVERRIDE;
private: private:
// Performs common routines to Update() and Pulse(). Requires the // Performs common routines to Update() and Pulse(). Requires the

60
include/wx/msw/radiobox.h
View File

@@ -82,41 +82,41 @@ public:
const wxString& name = wxRadioBoxNameStr); const wxString& name = wxRadioBoxNameStr);
// implement the radiobox interface // implement the radiobox interface
virtual void SetSelection(int n); virtual void SetSelection(int n) wxOVERRIDE;
virtual int GetSelection() const { return m_selectedButton; } virtual int GetSelection() const wxOVERRIDE { return m_selectedButton; }
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& label); virtual void SetString(unsigned int n, const wxString& label) wxOVERRIDE;
virtual bool Enable(unsigned int n, bool enable = true); virtual bool Enable(unsigned int n, bool enable = true) wxOVERRIDE;
virtual bool Show(unsigned int n, bool show = true); virtual bool Show(unsigned int n, bool show = true) wxOVERRIDE;
virtual bool IsItemEnabled(unsigned int n) const; virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE;
virtual bool IsItemShown(unsigned int n) const; virtual bool IsItemShown(unsigned int n) const wxOVERRIDE;
virtual int GetItemFromPoint(const wxPoint& pt) const; virtual int GetItemFromPoint(const wxPoint& pt) const wxOVERRIDE;
// override some base class methods // override some base class methods
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
virtual bool Enable(bool enable = true); virtual bool Enable(bool enable = true) wxOVERRIDE;
virtual bool CanBeFocused() const; virtual bool CanBeFocused() const wxOVERRIDE;
virtual void SetFocus(); virtual void SetFocus() wxOVERRIDE;
virtual bool SetFont(const wxFont& font); virtual bool SetFont(const wxFont& font) wxOVERRIDE;
virtual bool ContainsHWND(WXHWND hWnd) const; virtual bool ContainsHWND(WXHWND hWnd) const wxOVERRIDE;
virtual bool SetForegroundColour(const wxColour& colour); virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE;
virtual bool SetBackgroundColour(const wxColour& colour); virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE;
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
virtual bool HasToolTips() const; virtual bool HasToolTips() const wxOVERRIDE;
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
#if wxUSE_HELP #if wxUSE_HELP
// override virtual function with a platform-independent implementation // override virtual function with a platform-independent implementation
virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const wxOVERRIDE
{ {
return wxRadioBoxBase::DoGetHelpTextAtPoint( this, pt, origin ); return wxRadioBoxBase::DoGetHelpTextAtPoint( this, pt, origin );
} }
#endif // wxUSE_HELP #endif // wxUSE_HELP
virtual bool Reparent(wxWindowBase *newParent); virtual bool Reparent(wxWindowBase *newParent) wxOVERRIDE;
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
void SetLabelFont(const wxFont& WXUNUSED(font)) {} void SetLabelFont(const wxFont& WXUNUSED(font)) {}
void SetButtonFont(const wxFont& font) { SetFont(font); } void SetButtonFont(const wxFont& font) { SetFont(font); }
@@ -129,8 +129,8 @@ public:
// belongs to one of our radio boxes. If it doesn't, NULL is returned. // belongs to one of our radio boxes. If it doesn't, NULL is returned.
static wxRadioBox *GetFromRadioButtonHWND(WXHWND hwnd); static wxRadioBox *GetFromRadioButtonHWND(WXHWND hwnd);
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
void Command(wxCommandEvent& event); void Command(wxCommandEvent& event) wxOVERRIDE;
void SendNotificationEvent(); void SendNotificationEvent();
@@ -152,18 +152,18 @@ protected:
virtual void DoSetSize(int x, int y, virtual void DoSetSize(int x, int y,
int width, int height, int width, int height,
int sizeFlags = wxSIZE_AUTO); int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
virtual void DoMoveWindow(int x, int y, int width, int height); virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
virtual void DoSetItemToolTip(unsigned int n, wxToolTip * tooltip); virtual void DoSetItemToolTip(unsigned int n, wxToolTip * tooltip) wxOVERRIDE;
#endif #endif
virtual WXHRGN MSWGetRegionWithoutChildren(); virtual WXHRGN MSWGetRegionWithoutChildren() wxOVERRIDE;
// resolve ambiguity in base classes // resolve ambiguity in base classes
virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); } virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxRadioBoxBase::GetDefaultBorder(); }
// the buttons we contain // the buttons we contain
wxSubwindows *m_radioButtons; wxSubwindows *m_radioButtons;

12
include/wx/msw/radiobut.h
View File

@@ -47,16 +47,16 @@ public:
virtual bool GetValue() const; virtual bool GetValue() const;
// implementation only from now on // implementation only from now on
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event) wxOVERRIDE;
virtual bool HasTransparentBackground() { return true; } virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
protected: protected:
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
// Implement wxMSWOwnerDrawnButtonBase methods. // Implement wxMSWOwnerDrawnButtonBase methods.
virtual int MSWGetButtonStyle() const wxOVERRIDE; virtual int MSWGetButtonStyle() const wxOVERRIDE;

46
include/wx/msw/regconf.h
View File

@@ -42,36 +42,36 @@ public:
// ------------------------------------------ // ------------------------------------------
// path management // path management
virtual void SetPath(const wxString& strPath); virtual void SetPath(const wxString& strPath) wxOVERRIDE;
virtual const wxString& GetPath() const { return m_strPath; } virtual const wxString& GetPath() const wxOVERRIDE { return m_strPath; }
// entry/subgroup info // entry/subgroup info
// enumerate all of them // enumerate all of them
virtual bool GetFirstGroup(wxString& str, long& lIndex) const; virtual bool GetFirstGroup(wxString& str, long& lIndex) const wxOVERRIDE;
virtual bool GetNextGroup (wxString& str, long& lIndex) const; virtual bool GetNextGroup (wxString& str, long& lIndex) const wxOVERRIDE;
virtual bool GetFirstEntry(wxString& str, long& lIndex) const; virtual bool GetFirstEntry(wxString& str, long& lIndex) const wxOVERRIDE;
virtual bool GetNextEntry (wxString& str, long& lIndex) const; virtual bool GetNextEntry (wxString& str, long& lIndex) const wxOVERRIDE;
// tests for existence // tests for existence
virtual bool HasGroup(const wxString& strName) const; virtual bool HasGroup(const wxString& strName) const wxOVERRIDE;
virtual bool HasEntry(const wxString& strName) const; virtual bool HasEntry(const wxString& strName) const wxOVERRIDE;
virtual EntryType GetEntryType(const wxString& name) const; virtual EntryType GetEntryType(const wxString& name) const wxOVERRIDE;
// get number of entries/subgroups in the current group, with or without // get number of entries/subgroups in the current group, with or without
// it's subgroups // it's subgroups
virtual size_t GetNumberOfEntries(bool bRecursive = false) const; virtual size_t GetNumberOfEntries(bool bRecursive = false) const wxOVERRIDE;
virtual size_t GetNumberOfGroups(bool bRecursive = false) const; virtual size_t GetNumberOfGroups(bool bRecursive = false) const wxOVERRIDE;
virtual bool Flush(bool WXUNUSED(bCurrentOnly) = false) { return true; } virtual bool Flush(bool WXUNUSED(bCurrentOnly) = false) wxOVERRIDE { return true; }
// rename // rename
virtual bool RenameEntry(const wxString& oldName, const wxString& newName); virtual bool RenameEntry(const wxString& oldName, const wxString& newName) wxOVERRIDE;
virtual bool RenameGroup(const wxString& oldName, const wxString& newName); virtual bool RenameGroup(const wxString& oldName, const wxString& newName) wxOVERRIDE;
// delete // delete
virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true); virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true) wxOVERRIDE;
virtual bool DeleteGroup(const wxString& key); virtual bool DeleteGroup(const wxString& key) wxOVERRIDE;
virtual bool DeleteAll(); virtual bool DeleteAll() wxOVERRIDE;
protected: protected:
// opens the local key creating it if necessary and returns it // opens the local key creating it if necessary and returns it
@@ -89,13 +89,13 @@ protected:
} }
// implement read/write methods // implement read/write methods
virtual bool DoReadString(const wxString& key, wxString *pStr) const; virtual bool DoReadString(const wxString& key, wxString *pStr) const wxOVERRIDE;
virtual bool DoReadLong(const wxString& key, long *plResult) const; virtual bool DoReadLong(const wxString& key, long *plResult) const wxOVERRIDE;
virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const; virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const wxOVERRIDE;
virtual bool DoWriteString(const wxString& key, const wxString& szValue); virtual bool DoWriteString(const wxString& key, const wxString& szValue) wxOVERRIDE;
virtual bool DoWriteLong(const wxString& key, long lValue); virtual bool DoWriteLong(const wxString& key, long lValue) wxOVERRIDE;
virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf); virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) wxOVERRIDE;
private: private:
// these keys are opened during all lifetime of wxRegConfig object // these keys are opened during all lifetime of wxRegConfig object

20
include/wx/msw/region.h
View File

@@ -35,23 +35,23 @@ 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;
// Get internal region handle // Get internal region handle
WXHRGN GetHRGN() const; WXHRGN GetHRGN() 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;
friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator; friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;

24
include/wx/msw/scrolbar.h
View File

@@ -34,34 +34,34 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxScrollBarNameStr); const wxString& name = wxScrollBarNameStr);
int GetThumbPosition() const ; int GetThumbPosition() const wxOVERRIDE;
int GetThumbSize() const { return m_pageSize; } int GetThumbSize() const wxOVERRIDE { return m_pageSize; }
int GetPageSize() const { return m_viewSize; } int GetPageSize() const wxOVERRIDE { return m_viewSize; }
int GetRange() const { return m_objectSize; } int GetRange() const wxOVERRIDE { return m_objectSize; }
virtual void SetThumbPosition(int viewStart); virtual void SetThumbPosition(int viewStart) wxOVERRIDE;
virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize, virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
bool refresh = true); bool refresh = true) wxOVERRIDE;
// needed for RTTI // needed for RTTI
void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; } void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; }
void SetPageSize( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , GetRange() , s , true ) ; } void SetPageSize( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , GetRange() , s , true ) ; }
void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; } void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; }
void Command(wxCommandEvent& event); void Command(wxCommandEvent& event) wxOVERRIDE;
virtual bool MSWOnScroll(int orientation, WXWORD wParam, virtual bool MSWOnScroll(int orientation, WXWORD wParam,
WXWORD pos, WXHWND control); WXWORD pos, WXHWND control) wxOVERRIDE;
// override wxControl version to not use solid background here // override wxControl version to not use solid background here
virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd); virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd) wxOVERRIDE;
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
int m_pageSize; int m_pageSize;
int m_viewSize; int m_viewSize;

68
include/wx/msw/slider.h
View File

@@ -49,52 +49,52 @@ public:
virtual ~wxSlider(); virtual ~wxSlider();
// slider methods // slider methods
virtual int GetValue() const; virtual int GetValue() const wxOVERRIDE;
virtual void SetValue(int); virtual void SetValue(int) wxOVERRIDE;
void SetRange(int minValue, int maxValue); void SetRange(int minValue, int maxValue) wxOVERRIDE;
int GetMin() const { return m_rangeMin; } int GetMin() const wxOVERRIDE { return m_rangeMin; }
int GetMax() const { return m_rangeMax; } int GetMax() const wxOVERRIDE { return m_rangeMax; }
// Win32-specific slider methods // Win32-specific slider methods
int GetTickFreq() const { return m_tickFreq; } int GetTickFreq() const wxOVERRIDE { return m_tickFreq; }
void SetPageSize(int pageSize); void SetPageSize(int pageSize) wxOVERRIDE;
int GetPageSize() const; int GetPageSize() const wxOVERRIDE;
void ClearSel(); void ClearSel() wxOVERRIDE;
void ClearTicks(); void ClearTicks() wxOVERRIDE;
void SetLineSize(int lineSize); void SetLineSize(int lineSize) wxOVERRIDE;
int GetLineSize() const; int GetLineSize() const wxOVERRIDE;
int GetSelEnd() const; int GetSelEnd() const wxOVERRIDE;
int GetSelStart() const; int GetSelStart() const wxOVERRIDE;
void SetSelection(int minPos, int maxPos); void SetSelection(int minPos, int maxPos) wxOVERRIDE;
void SetThumbLength(int len); void SetThumbLength(int len) wxOVERRIDE;
int GetThumbLength() const; int GetThumbLength() const wxOVERRIDE;
void SetTick(int tickPos); void SetTick(int tickPos) wxOVERRIDE;
// implementation only from now on // implementation only from now on
WXHWND GetStaticMin() const; WXHWND GetStaticMin() const;
WXHWND GetStaticMax() const; WXHWND GetStaticMax() const;
WXHWND GetEditValue() const; WXHWND GetEditValue() const;
virtual bool ContainsHWND(WXHWND hWnd) const; virtual bool ContainsHWND(WXHWND hWnd) const wxOVERRIDE;
// we should let background show through the slider (and its labels) // we should let background show through the slider (and its labels)
virtual bool HasTransparentBackground() { return true; } virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
void Command(wxCommandEvent& event); void Command(wxCommandEvent& event) wxOVERRIDE;
virtual bool MSWOnScroll(int orientation, WXWORD wParam, virtual bool MSWOnScroll(int orientation, WXWORD wParam,
WXWORD pos, WXHWND control); WXWORD pos, WXHWND control) wxOVERRIDE;
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
virtual bool Enable(bool show = true); virtual bool Enable(bool show = true) wxOVERRIDE;
virtual bool SetFont(const wxFont& font); virtual bool SetFont(const wxFont& font) wxOVERRIDE;
virtual bool SetForegroundColour(const wxColour& colour); virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE;
virtual bool SetBackgroundColour(const wxColour& colour); virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE;
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE;
protected: protected:
// common part of all ctors // common part of all ctors
@@ -115,10 +115,10 @@ protected:
// overridden base class virtuals // overridden base class virtuals
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 wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd) wxOVERRIDE; WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd) wxOVERRIDE;
@@ -140,7 +140,7 @@ protected:
bool m_isDragging; bool m_isDragging;
// Platform-specific implementation of SetTickFreq // Platform-specific implementation of SetTickFreq
virtual void DoSetTickFreq(int freq); virtual void DoSetTickFreq(int freq) wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider);
}; };

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

@@ -36,7 +36,7 @@ protected:
bool CheckCreatedOk(); bool CheckCreatedOk();
void Free(); void Free();
virtual bool DoPlay(unsigned flags) const; virtual bool DoPlay(unsigned flags) const wxOVERRIDE;
private: private:
// data of this object // data of this object

18
include/wx/msw/spinbutt.h
View File

@@ -43,24 +43,24 @@ public:
// accessors // accessors
virtual int GetValue() const; virtual int GetValue() const wxOVERRIDE;
virtual void SetValue(int val); virtual void SetValue(int val) wxOVERRIDE;
virtual void SetRange(int minVal, int maxVal); virtual void SetRange(int minVal, int maxVal) wxOVERRIDE;
// implementation // implementation
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
virtual bool MSWOnScroll(int orientation, WXWORD wParam, virtual bool MSWOnScroll(int orientation, WXWORD wParam,
WXWORD pos, WXHWND control); WXWORD pos, WXHWND control) wxOVERRIDE;
// a wxSpinButton can't do anything useful with focus, only wxSpinCtrl can // a wxSpinButton can't do anything useful with focus, only wxSpinCtrl can
virtual bool AcceptsFocus() const { return false; } virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
// ensure that the control displays a value in the current range // ensure that the control displays a value in the current range
virtual void NormalizeValue(); virtual void NormalizeValue();

42
include/wx/msw/spinctrl.h
View File

@@ -71,22 +71,22 @@ public:
virtual ~wxSpinCtrl(); virtual ~wxSpinCtrl();
virtual void SetValue(int val); virtual void SetValue(int val) wxOVERRIDE;
virtual int GetValue() const; virtual int GetValue() const wxOVERRIDE;
virtual void SetRange(int minVal, int maxVal); virtual void SetRange(int minVal, int maxVal) wxOVERRIDE;
virtual bool SetFont(const wxFont &font); virtual bool SetFont(const wxFont &font) wxOVERRIDE;
virtual void SetFocus(); virtual void SetFocus() wxOVERRIDE;
virtual bool Enable(bool enable = true); virtual bool Enable(bool enable = true) wxOVERRIDE;
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
virtual bool Reparent(wxWindowBase *newParent); virtual bool Reparent(wxWindowBase *newParent) wxOVERRIDE;
// wxSpinButton doesn't accept focus, but we do // wxSpinButton doesn't accept focus, but we do
virtual bool AcceptsFocus() const { return wxWindow::AcceptsFocus(); } virtual bool AcceptsFocus() const wxOVERRIDE { return wxWindow::AcceptsFocus(); }
// we're like wxTextCtrl and not (default) wxButton // we're like wxTextCtrl and not (default) wxButton
virtual wxVisualAttributes GetDefaultAttributes() const virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
{ {
return GetClassDefaultAttributes(GetWindowVariant()); return GetClassDefaultAttributes(GetWindowVariant());
} }
@@ -109,24 +109,24 @@ public:
bool ProcessTextCommand(WXWORD cmd, WXWORD id); bool ProcessTextCommand(WXWORD cmd, WXWORD id);
// recognize buddy window as part of this control at wx level // recognize buddy window as part of this control at wx level
virtual bool ContainsHWND(WXHWND hWnd) const { return hWnd == m_hwndBuddy; } virtual bool ContainsHWND(WXHWND hWnd) const wxOVERRIDE { return hWnd == m_hwndBuddy; }
virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE; virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE;
protected: protected:
virtual void DoGetPosition(int *x, int *y) const; virtual void DoGetPosition(int *x, int *y) 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 wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE;
virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
virtual void DoGetClientSize(int *x, int *y) const; virtual void DoGetClientSize(int *x, int *y) const wxOVERRIDE;
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
virtual void DoSetToolTip( wxToolTip *tip ); virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE;
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
virtual bool MSWOnScroll(int orientation, WXWORD wParam, virtual bool MSWOnScroll(int orientation, WXWORD wParam,
WXWORD pos, WXHWND control); WXWORD pos, WXHWND control) wxOVERRIDE;
// handle processing of special keys // handle processing of special keys
void OnChar(wxKeyEvent& event); void OnChar(wxKeyEvent& event);
@@ -137,7 +137,7 @@ protected:
void SendSpinUpdate(int value); void SendSpinUpdate(int value);
// called to ensure that the value is in the correct range // called to ensure that the value is in the correct range
virtual void NormalizeValue(); virtual void NormalizeValue() wxOVERRIDE;
// the value of the control before the latest change (which might not have // the value of the control before the latest change (which might not have
// changed anything in fact -- this is why we need this field) // changed anything in fact -- this is why we need this field)

14
include/wx/msw/statbmp.h
View File

@@ -46,18 +46,18 @@ public:
virtual ~wxStaticBitmap() { Free(); } virtual ~wxStaticBitmap() { Free(); }
virtual void SetIcon(const wxIcon& icon) { SetImage(&icon); } virtual void SetIcon(const wxIcon& icon) wxOVERRIDE { SetImage(&icon); }
virtual void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); } virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE { SetImage(&bitmap); }
virtual wxBitmap GetBitmap() const; virtual wxBitmap GetBitmap() const wxOVERRIDE;
virtual wxIcon GetIcon() const; virtual wxIcon GetIcon() const wxOVERRIDE;
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
protected: protected:
virtual wxSize DoGetBestClientSize() const; virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
// ctor/dtor helpers // ctor/dtor helpers
void Init(); void Init();

10
include/wx/msw/statbox.h
View File

@@ -35,18 +35,18 @@ public:
const wxString& name = wxStaticBoxNameStr); const wxString& name = wxStaticBoxNameStr);
/// Implementation only /// Implementation only
virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; virtual void GetBordersForSizer(int *borderTop, int *borderOther) const wxOVERRIDE;
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
protected: protected:
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
public: public:
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
protected: protected:
// return the region with all the windows inside this static box excluded // return the region with all the windows inside this static box excluded

4
include/wx/msw/statline.h
View File

@@ -38,10 +38,10 @@ public:
const wxString &name = wxStaticLineNameStr ); const wxString &name = wxStaticLineNameStr );
// overridden base class virtuals // overridden base class virtuals
virtual bool AcceptsFocus() const { return false; } virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
// usually overridden base class virtuals // usually overridden base class virtuals
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticLine); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticLine);
}; };

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

@@ -36,19 +36,19 @@ public:
const wxString& name = wxStaticTextNameStr); const wxString& name = wxStaticTextNameStr);
// override some methods to resize the window properly // override some methods to resize the window properly
virtual void SetLabel(const wxString& label); virtual void SetLabel(const wxString& label) wxOVERRIDE;
virtual bool SetFont( const wxFont &font ); virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE;
protected: protected:
// implement/override some base class virtuals // implement/override some base class virtuals
virtual void DoSetSize(int x, int y, int w, int h, virtual void DoSetSize(int x, int y, int w, int h,
int sizeFlags = wxSIZE_AUTO); int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
virtual wxSize DoGetBestClientSize() const; virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
virtual wxString DoGetLabel() const; virtual wxString DoGetLabel() const wxOVERRIDE;
virtual void DoSetLabel(const wxString& str); virtual void DoSetLabel(const wxString& str) wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText);
}; };

30
include/wx/msw/statusbar.h
View File

@@ -40,33 +40,33 @@ public:
virtual ~wxStatusBar(); virtual ~wxStatusBar();
// implement base class methods // implement base class methods
virtual void SetFieldsCount(int number = 1, const int *widths = NULL); virtual void SetFieldsCount(int number = 1, const int *widths = NULL) wxOVERRIDE;
virtual void SetStatusWidths(int n, const int widths_field[]); virtual void SetStatusWidths(int n, const int widths_field[]) wxOVERRIDE;
virtual void SetStatusStyles(int n, const int styles[]); virtual void SetStatusStyles(int n, const int styles[]) wxOVERRIDE;
virtual void SetMinHeight(int height); virtual void SetMinHeight(int height) wxOVERRIDE;
virtual bool GetFieldRect(int i, wxRect& rect) const; virtual bool GetFieldRect(int i, wxRect& rect) const wxOVERRIDE;
virtual int GetBorderX() const; virtual int GetBorderX() const wxOVERRIDE;
virtual int GetBorderY() const; virtual int GetBorderY() const wxOVERRIDE;
// override some wxWindow virtual methods too // override some wxWindow virtual methods too
virtual bool SetFont(const wxFont& font); virtual bool SetFont(const wxFont& font) wxOVERRIDE;
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
WXWPARAM wParam, WXWPARAM wParam,
WXLPARAM lParam); WXLPARAM lParam) wxOVERRIDE;
protected: protected:
// implement base class pure virtual method // implement base class pure virtual method
virtual void DoUpdateStatusText(int number); virtual void DoUpdateStatusText(int number) wxOVERRIDE;
// override some base class virtuals // override some base class virtuals
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE;
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() 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;
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
virtual bool MSWProcessMessage(WXMSG* pMsg); virtual bool MSWProcessMessage(WXMSG* pMsg) wxOVERRIDE;
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) wxOVERRIDE;
#endif #endif
// implementation of the public SetStatusWidths() // implementation of the public SetStatusWidths()

18
include/wx/msw/stdpaths.h
View File

@@ -21,13 +21,13 @@ class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
{ {
public: public:
// implement base class pure virtuals // implement base class pure virtuals
virtual wxString GetExecutablePath() const; virtual wxString GetExecutablePath() const wxOVERRIDE;
virtual wxString GetConfigDir() const; virtual wxString GetConfigDir() const wxOVERRIDE;
virtual wxString GetUserConfigDir() const; virtual wxString GetUserConfigDir() const wxOVERRIDE;
virtual wxString GetDataDir() const; virtual wxString GetDataDir() const wxOVERRIDE;
virtual wxString GetUserDataDir() const; virtual wxString GetUserDataDir() const wxOVERRIDE;
virtual wxString GetUserLocalDataDir() const; virtual wxString GetUserLocalDataDir() const wxOVERRIDE;
virtual wxString GetPluginsDir() const; virtual wxString GetPluginsDir() const wxOVERRIDE;
virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE; virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE;
@@ -92,8 +92,8 @@ protected:
class WXDLLIMPEXP_BASE wxStandardPathsWin16 : public wxStandardPaths class WXDLLIMPEXP_BASE wxStandardPathsWin16 : public wxStandardPaths
{ {
public: public:
virtual wxString GetConfigDir() const; virtual wxString GetConfigDir() const wxOVERRIDE;
virtual wxString GetUserConfigDir() const; virtual wxString GetUserConfigDir() const wxOVERRIDE;
}; };
#endif // _WX_MSW_STDPATHS_H_ #endif // _WX_MSW_STDPATHS_H_

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

@@ -28,9 +28,9 @@ public:
bool IsIconInstalled() const { return m_iconAdded; } bool IsIconInstalled() const { return m_iconAdded; }
// Operations // Operations
bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString); bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString) wxOVERRIDE;
bool RemoveIcon(void); bool RemoveIcon(void) wxOVERRIDE;
bool PopupMenu(wxMenu *menu); bool PopupMenu(wxMenu *menu) wxOVERRIDE;
// MSW-specific class methods // MSW-specific class methods

98
include/wx/msw/textctrl.h
View File

@@ -43,58 +43,58 @@ public:
// overridden wxTextEntry methods // overridden wxTextEntry methods
// ------------------------------ // ------------------------------
virtual wxString GetValue() const; virtual wxString GetValue() const wxOVERRIDE;
virtual wxString GetRange(long from, long to) const; virtual wxString GetRange(long from, long to) const wxOVERRIDE;
virtual bool IsEmpty() const; virtual bool IsEmpty() const;
virtual void WriteText(const wxString& text); virtual void WriteText(const wxString& text) wxOVERRIDE;
virtual void AppendText(const wxString& text); virtual void AppendText(const wxString& text) wxOVERRIDE;
virtual void Clear(); virtual void Clear() wxOVERRIDE;
virtual int GetLineLength(long lineNo) const; virtual int GetLineLength(long lineNo) const wxOVERRIDE;
virtual wxString GetLineText(long lineNo) const; virtual wxString GetLineText(long lineNo) const wxOVERRIDE;
virtual int GetNumberOfLines() const; virtual int GetNumberOfLines() const wxOVERRIDE;
virtual void SetMaxLength(unsigned long len); virtual void SetMaxLength(unsigned long len) wxOVERRIDE;
virtual void GetSelection(long *from, long *to) const; virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
virtual void Redo(); virtual void Redo() wxOVERRIDE;
virtual bool CanRedo() const; virtual bool CanRedo() const 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 wxOVERRIDE;
// implement base class pure virtuals // implement base class pure virtuals
// ---------------------------------- // ----------------------------------
virtual bool IsModified() const; virtual bool IsModified() const wxOVERRIDE;
virtual void MarkDirty(); virtual void MarkDirty() wxOVERRIDE;
virtual void DiscardEdits(); virtual void DiscardEdits() wxOVERRIDE;
virtual bool EmulateKeyPress(const wxKeyEvent& event); virtual bool EmulateKeyPress(const wxKeyEvent& event) wxOVERRIDE;
#if wxUSE_RICHEDIT #if wxUSE_RICHEDIT
// apply text attribute to the range of text (only works with richedit // apply text attribute to the range of text (only works with richedit
// controls) // controls)
virtual bool SetStyle(long start, long end, const wxTextAttr& style); virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE;
virtual bool SetDefaultStyle(const wxTextAttr& style); virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE;
virtual bool GetStyle(long position, wxTextAttr& style); virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE;
#endif // wxUSE_RICHEDIT #endif // wxUSE_RICHEDIT
// translate between the position (which is just an index in the text ctrl // translate between the position (which is just an index in the text ctrl
// considering all its contents as a single strings) and (x, y) coordinates // considering all its contents as a single strings) and (x, y) coordinates
// which represent column and line. // which represent column and line.
virtual long XYToPosition(long x, long y) const; virtual long XYToPosition(long x, long y) const wxOVERRIDE;
virtual bool PositionToXY(long pos, long *x, long *y) const; virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE;
virtual void ShowPosition(long pos); virtual void ShowPosition(long pos) wxOVERRIDE;
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const; virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE;
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
wxTextCoord *col, wxTextCoord *col,
wxTextCoord *row) const wxTextCoord *row) const wxOVERRIDE
{ {
return wxTextCtrlBase::HitTest(pt, col, row); return wxTextCtrlBase::HitTest(pt, col, row);
} }
@@ -110,26 +110,26 @@ public:
// -------------------------- // --------------------------
#if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT #if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
virtual void SetDropTarget(wxDropTarget *dropTarget); virtual void SetDropTarget(wxDropTarget *dropTarget) wxOVERRIDE;
#endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT #endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
virtual void SetWindowStyleFlag(long style); virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event) wxOVERRIDE;
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd); virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd) wxOVERRIDE;
#if wxUSE_RICHEDIT #if wxUSE_RICHEDIT
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
int GetRichVersion() const { return m_verRichEdit; } int GetRichVersion() const { return m_verRichEdit; }
bool IsRich() const { return m_verRichEdit != 0; } bool IsRich() const { return m_verRichEdit != 0; }
// rich edit controls are not compatible with normal ones and we must set // rich edit controls are not compatible with normal ones and we must set
// the colours and font for them otherwise // the colours and font for them otherwise
virtual bool SetBackgroundColour(const wxColour& colour); virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE;
virtual bool SetForegroundColour(const wxColour& colour); virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE;
virtual bool SetFont(const wxFont& font); virtual bool SetFont(const wxFont& font) wxOVERRIDE;
#else #else
bool IsRich() const { return false; } bool IsRich() const { return false; }
#endif // wxUSE_RICHEDIT #endif // wxUSE_RICHEDIT
@@ -140,12 +140,12 @@ public:
bool IsInkEdit() const { return false; } bool IsInkEdit() const { return false; }
#endif #endif
virtual void AdoptAttributesFromHWND(); virtual void AdoptAttributesFromHWND() wxOVERRIDE;
virtual bool AcceptsFocusFromKeyboard() const; virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE;
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const; virtual bool CanApplyThemeBorder() const wxOVERRIDE;
// callbacks // callbacks
void OnDropFiles(wxDropFilesEvent& event); void OnDropFiles(wxDropFilesEvent& event);
@@ -184,10 +184,10 @@ public:
virtual bool MSWHandleMessage(WXLRESULT *result, virtual bool MSWHandleMessage(WXLRESULT *result,
WXUINT message, WXUINT message,
WXWPARAM wParam, WXWPARAM wParam,
WXLPARAM lParam); WXLPARAM lParam) wxOVERRIDE;
virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg); virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg) wxOVERRIDE;
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
protected: protected:
// common part of all ctors // common part of all ctors
@@ -202,9 +202,9 @@ protected:
const wxPoint& pos, const wxPoint& pos,
const wxSize& size); const wxSize& size);
virtual void DoSetValue(const wxString &value, int flags = 0); virtual void DoSetValue(const wxString &value, int flags = 0) wxOVERRIDE;
virtual wxPoint DoPositionToCoords(long pos) const; virtual wxPoint DoPositionToCoords(long pos) const wxOVERRIDE;
// return true if this control has a user-set limit on amount of text (i.e. // return true if this control has a user-set limit on amount of text (i.e.
// the limit is due to a previous call to SetMaxLength() and not built in) // the limit is due to a previous call to SetMaxLength() and not built in)
@@ -225,7 +225,7 @@ protected:
int flags = SetValue_SendEvent | SetValue_SelectionOnly); int flags = SetValue_SendEvent | SetValue_SelectionOnly);
// set the selection (possibly without scrolling the caret into view) // set the selection (possibly without scrolling the caret into view)
void DoSetSelection(long from, long to, int flags); void DoSetSelection(long from, long to, int flags) wxOVERRIDE;
// get the length of the line containing the character at the given // get the length of the line containing the character at the given
// position // position
@@ -234,8 +234,8 @@ protected:
// send TEXT_UPDATED event, return true if it was handled, false otherwise // send TEXT_UPDATED event, return true if it was handled, false otherwise
bool SendUpdateEvent(); bool SendUpdateEvent();
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE;
#if wxUSE_RICHEDIT #if wxUSE_RICHEDIT
// Apply the character-related parts of wxTextAttr to the given selection // Apply the character-related parts of wxTextAttr to the given selection
@@ -266,14 +266,14 @@ protected:
int m_updatesCount; int m_updatesCount;
private: private:
virtual void EnableTextChangedEvents(bool enable) virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE
{ {
m_updatesCount = enable ? -1 : -2; m_updatesCount = enable ? -1 : -2;
} }
// implement wxTextEntry pure virtual: it implements all the operations for // implement wxTextEntry pure virtual: it implements all the operations for
// the simple EDIT controls // the simple EDIT controls
virtual WXHWND GetEditHWND() const { return m_hWnd; } virtual WXHWND GetEditHWND() const wxOVERRIDE { return m_hWnd; }
void OnKeyDown(wxKeyEvent& event); void OnKeyDown(wxKeyEvent& event);

52
include/wx/msw/textentry.h
View File

@@ -23,39 +23,39 @@ public:
virtual ~wxTextEntry(); virtual ~wxTextEntry();
// implement wxTextEntryBase pure virtual methods // implement wxTextEntryBase pure virtual methods
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 Copy() wxOVERRIDE;
virtual void Cut(); virtual void Cut() wxOVERRIDE;
virtual void Paste(); virtual void Paste() wxOVERRIDE;
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;
virtual void SetInsertionPoint(long pos); virtual void SetInsertionPoint(long pos) wxOVERRIDE;
virtual long GetInsertionPoint() const; virtual long GetInsertionPoint() const wxOVERRIDE;
virtual long GetLastPosition() const; virtual long GetLastPosition() const wxOVERRIDE;
virtual void SetSelection(long from, long to) virtual void SetSelection(long from, long to) wxOVERRIDE
{ DoSetSelection(from, to); } { DoSetSelection(from, to); }
virtual void GetSelection(long *from, long *to) const; virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
virtual bool IsEditable() const; virtual bool IsEditable() const wxOVERRIDE;
virtual void SetEditable(bool editable); virtual void SetEditable(bool editable) wxOVERRIDE;
virtual void SetMaxLength(unsigned long len); virtual void SetMaxLength(unsigned long len) wxOVERRIDE;
virtual void ForceUpper(); virtual void ForceUpper() wxOVERRIDE;
#if wxUSE_UXTHEME #if wxUSE_UXTHEME
virtual bool SetHint(const wxString& hint); virtual bool SetHint(const wxString& hint) wxOVERRIDE;
virtual wxString GetHint() const; virtual wxString GetHint() const wxOVERRIDE;
#endif // wxUSE_UXTHEME #endif // wxUSE_UXTHEME
protected: protected:
virtual wxString DoGetValue() const; virtual wxString DoGetValue() const wxOVERRIDE;
// this is really a hook for multiline text controls as the single line // this is really a hook for multiline text controls as the single line
// ones don't need to ever scroll to show the selection but having it here // ones don't need to ever scroll to show the selection but having it here
@@ -68,17 +68,17 @@ protected:
virtual void DoSetSelection(long from, long to, int flags = SetSel_Scroll); virtual void DoSetSelection(long from, long to, int flags = SetSel_Scroll);
// margins functions // margins functions
virtual bool DoSetMargins(const wxPoint& pt); virtual bool DoSetMargins(const wxPoint& pt) wxOVERRIDE;
virtual wxPoint DoGetMargins() const; virtual wxPoint DoGetMargins() const wxOVERRIDE;
// auto-completion uses COM under Windows so they won't work without // auto-completion uses COM under Windows so they won't work without
// wxUSE_OLE as OleInitialize() is not called then // wxUSE_OLE as OleInitialize() is not called then
#if wxUSE_OLE #if wxUSE_OLE
virtual bool DoAutoCompleteStrings(const wxArrayString& choices); virtual bool DoAutoCompleteStrings(const wxArrayString& choices) wxOVERRIDE;
#if wxUSE_DYNLIB_CLASS #if wxUSE_DYNLIB_CLASS
virtual bool DoAutoCompleteFileNames(int flags); virtual bool DoAutoCompleteFileNames(int flags) wxOVERRIDE;
#endif // wxUSE_DYNLIB_CLASS #endif // wxUSE_DYNLIB_CLASS
virtual bool DoAutoCompleteCustom(wxTextCompleter *completer); virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) wxOVERRIDE;
#endif // wxUSE_OLE #endif // wxUSE_OLE
private: private:

18
include/wx/msw/tglbtn.h
View File

@@ -40,21 +40,21 @@ 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 MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event) wxOVERRIDE;
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
protected: protected:
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE;
virtual bool MSWIsPushed() const; virtual bool MSWIsPushed() const wxOVERRIDE;
void Init(); void Init();
@@ -100,7 +100,7 @@ public:
wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap), wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap),
SetBitmapLabel(bitmap); ) SetBitmapLabel(bitmap); )
// prevent virtual function hiding // prevent virtual function hiding
virtual void SetLabel(const wxString& label) { wxToggleButton::SetLabel(label); } virtual void SetLabel(const wxString& label) wxOVERRIDE { wxToggleButton::SetLabel(label); }
private: private:
wxDECLARE_DYNAMIC_CLASS(wxBitmapToggleButton); wxDECLARE_DYNAMIC_CLASS(wxBitmapToggleButton);

8
include/wx/msw/timectrl.h
View File

@@ -47,14 +47,14 @@ public:
} }
// Override MSW-specific functions used during control creation. // Override MSW-specific functions used during control creation.
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
protected: protected:
#if wxUSE_INTL #if wxUSE_INTL
virtual wxLocaleInfo MSWGetFormat() const; virtual wxLocaleInfo MSWGetFormat() const wxOVERRIDE;
#endif // wxUSE_INTL #endif // wxUSE_INTL
virtual bool MSWAllowsNone() const { return false; } virtual bool MSWAllowsNone() const wxOVERRIDE { return false; }
virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch); virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch) wxOVERRIDE;
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl);
}; };

50
include/wx/msw/toolbar.h
View File

@@ -44,47 +44,47 @@ public:
virtual ~wxToolBar(); virtual ~wxToolBar();
// override/implement base class virtuals // override/implement base class virtuals
virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE;
virtual bool Realize(); virtual bool Realize() wxOVERRIDE;
virtual void SetToolBitmapSize(const wxSize& size); virtual void SetToolBitmapSize(const wxSize& size) wxOVERRIDE;
virtual wxSize GetToolSize() const; virtual wxSize GetToolSize() const wxOVERRIDE;
virtual void SetRows(int nRows); virtual void SetRows(int nRows) wxOVERRIDE;
virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap); virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE;
virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap); virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE;
virtual void SetToolPacking(int packing); virtual void SetToolPacking(int packing) wxOVERRIDE;
// implementation only from now on // implementation only from now on
// ------------------------------- // -------------------------------
virtual void SetWindowStyleFlag(long style); virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
void OnMouseEvent(wxMouseEvent& event); void OnMouseEvent(wxMouseEvent& event);
void OnSysColourChanged(wxSysColourChangedEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event);
void OnEraseBackground(wxEraseEvent& event); void OnEraseBackground(wxEraseEvent& event);
void SetFocus() {} void SetFocus() wxOVERRIDE {}
static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height); static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
// override WndProc mainly to process WM_SIZE // override WndProc mainly to process WM_SIZE
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK #ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK
virtual bool MSWEraseBgHook(WXHDC hDC); virtual bool MSWEraseBgHook(WXHDC hDC) wxOVERRIDE;
virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, wxWindowMSW *child); virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, wxWindowMSW *child) wxOVERRIDE;
#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK #endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK
virtual wxToolBarToolBase *CreateTool(int id, virtual wxToolBarToolBase *CreateTool(int id,
@@ -94,10 +94,10 @@ public:
wxItemKind kind = wxITEM_NORMAL, wxItemKind kind = wxITEM_NORMAL,
wxObject *clientData = NULL, wxObject *clientData = NULL,
const wxString& shortHelp = wxEmptyString, const wxString& shortHelp = wxEmptyString,
const wxString& longHelp = wxEmptyString); const wxString& longHelp = wxEmptyString) wxOVERRIDE;
virtual wxToolBarToolBase *CreateTool(wxControl *control, virtual wxToolBarToolBase *CreateTool(wxControl *control,
const wxString& label); const wxString& label) wxOVERRIDE;
protected: protected:
// common part of all ctors // common part of all ctors
void Init(); void Init();
@@ -109,15 +109,15 @@ protected:
void Recreate(); void Recreate();
// implement base class pure virtuals // implement base class pure virtuals
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable); virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE;
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
// return the appropriate size and flags for the toolbar control // return the appropriate size and flags for the toolbar control
virtual wxSize DoGetBestSize() const; virtual wxSize DoGetBestSize() const wxOVERRIDE;
// handlers for various events // handlers for various events
bool HandleSize(WXWPARAM wParam, WXLPARAM lParam); bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);

54
include/wx/msw/toplevel.h
View File

@@ -45,35 +45,35 @@ public:
virtual ~wxTopLevelWindowMSW(); virtual ~wxTopLevelWindowMSW();
// implement base class pure virtuals // implement base class pure virtuals
virtual void SetTitle( const wxString& title); virtual void SetTitle( const wxString& title) wxOVERRIDE;
virtual wxString GetTitle() const; virtual wxString GetTitle() const wxOVERRIDE;
virtual void Maximize(bool maximize = true); virtual void Maximize(bool maximize = true) wxOVERRIDE;
virtual bool IsMaximized() const; virtual bool IsMaximized() const wxOVERRIDE;
virtual void Iconize(bool iconize = true); virtual void Iconize(bool iconize = true) wxOVERRIDE;
virtual bool IsIconized() const; virtual bool IsIconized() const wxOVERRIDE;
virtual void SetIcons(const wxIconBundle& icons ); virtual void SetIcons(const wxIconBundle& icons ) wxOVERRIDE;
virtual void Restore(); virtual void Restore() wxOVERRIDE;
virtual void SetLayoutDirection(wxLayoutDirection dir); virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE;
virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO) wxOVERRIDE;
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
virtual void Raise(); virtual void Raise() wxOVERRIDE;
virtual void ShowWithoutActivating(); virtual void ShowWithoutActivating() wxOVERRIDE;
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE;
virtual bool IsFullScreen() const { return m_fsIsShowing; } virtual bool IsFullScreen() const wxOVERRIDE { return m_fsIsShowing; }
// wxMSW only: EnableCloseButton(false) may be used to remove the "Close" // wxMSW only: EnableCloseButton(false) may be used to remove the "Close"
// button from the title bar // button from the title bar
virtual bool EnableCloseButton(bool enable = true); virtual bool EnableCloseButton(bool enable = true) wxOVERRIDE;
virtual bool EnableMaximizeButton(bool enable = true) wxOVERRIDE; virtual bool EnableMaximizeButton(bool enable = true) wxOVERRIDE;
virtual bool EnableMinimizeButton(bool enable = true) wxOVERRIDE; virtual bool EnableMinimizeButton(bool enable = true) wxOVERRIDE;
// Set window transparency if the platform supports it // Set window transparency if the platform supports it
virtual bool SetTransparent(wxByte alpha); virtual bool SetTransparent(wxByte alpha) wxOVERRIDE;
virtual bool CanSetTransparent(); virtual bool CanSetTransparent() wxOVERRIDE;
// MSW-specific methods // MSW-specific methods
@@ -100,16 +100,16 @@ public:
wxWindow *GetLastFocus() const { return m_winLastFocused; } wxWindow *GetLastFocus() const { return m_winLastFocused; }
// translate wxWidgets flags to Windows ones // translate wxWidgets flags to Windows ones
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const; virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const wxOVERRIDE;
// choose the right parent to use with CreateWindow() // choose the right parent to use with CreateWindow()
virtual WXHWND MSWGetParent() const; virtual WXHWND MSWGetParent() const wxOVERRIDE;
// window proc for the frames // window proc for the frames
WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
protected: protected:
// common part of all ctors // common part of all ctors
@@ -132,12 +132,12 @@ protected:
// override those to return the normal window coordinates even when the // override those to return the normal window coordinates even when the
// window is minimized // window is minimized
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;
// Top level windows have different freeze semantics on Windows // Top level windows have different freeze semantics on Windows
virtual void DoFreeze(); virtual void DoFreeze() wxOVERRIDE;
virtual void DoThaw(); virtual void DoThaw() wxOVERRIDE;
// helper of SetIcons(): calls gets the icon with the size specified by the // helper of SetIcons(): calls gets the icon with the size specified by the
// given system metrics (SM_C{X|Y}[SM]ICON) from the bundle and sets it // given system metrics (SM_C{X|Y}[SM]ICON) from the bundle and sets it
@@ -149,7 +149,7 @@ protected:
virtual void MSWGetCreateWindowCoords(const wxPoint& pos, virtual void MSWGetCreateWindowCoords(const wxPoint& pos,
const wxSize& size, const wxSize& size,
int& x, int& y, int& x, int& y,
int& w, int& h) const; int& w, int& h) const wxOVERRIDE;
// is the window currently iconized? // is the window currently iconized?

154
include/wx/msw/treectrl.h
View File

@@ -70,117 +70,117 @@ public:
// implement base class pure virtuals // implement base class pure virtuals
// ---------------------------------- // ----------------------------------
virtual unsigned int GetCount() const; virtual unsigned int GetCount() const wxOVERRIDE;
virtual unsigned int GetIndent() const; virtual unsigned int GetIndent() const wxOVERRIDE;
virtual void SetIndent(unsigned int indent); virtual void SetIndent(unsigned int indent) wxOVERRIDE;
virtual void SetImageList(wxImageList *imageList); virtual void SetImageList(wxImageList *imageList) wxOVERRIDE;
virtual void SetStateImageList(wxImageList *imageList); virtual void SetStateImageList(wxImageList *imageList) wxOVERRIDE;
virtual wxString GetItemText(const wxTreeItemId& item) const; virtual wxString GetItemText(const wxTreeItemId& item) const wxOVERRIDE;
virtual int GetItemImage(const wxTreeItemId& item, virtual int GetItemImage(const wxTreeItemId& item,
wxTreeItemIcon which = wxTreeItemIcon_Normal) const; wxTreeItemIcon which = wxTreeItemIcon_Normal) const wxOVERRIDE;
virtual wxTreeItemData *GetItemData(const wxTreeItemId& item) const; virtual wxTreeItemData *GetItemData(const wxTreeItemId& item) const wxOVERRIDE;
virtual wxColour GetItemTextColour(const wxTreeItemId& item) const; virtual wxColour GetItemTextColour(const wxTreeItemId& item) const wxOVERRIDE;
virtual wxColour GetItemBackgroundColour(const wxTreeItemId& item) const; virtual wxColour GetItemBackgroundColour(const wxTreeItemId& item) const wxOVERRIDE;
virtual wxFont GetItemFont(const wxTreeItemId& item) const; virtual wxFont GetItemFont(const wxTreeItemId& item) const wxOVERRIDE;
virtual void SetItemText(const wxTreeItemId& item, const wxString& text); virtual void SetItemText(const wxTreeItemId& item, const wxString& text) wxOVERRIDE;
virtual void SetItemImage(const wxTreeItemId& item, int image, virtual void SetItemImage(const wxTreeItemId& item, int image,
wxTreeItemIcon which = wxTreeItemIcon_Normal); wxTreeItemIcon which = wxTreeItemIcon_Normal) wxOVERRIDE;
virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data); virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data) wxOVERRIDE;
virtual void SetItemHasChildren(const wxTreeItemId& item, bool has = true); virtual void SetItemHasChildren(const wxTreeItemId& item, bool has = true) wxOVERRIDE;
virtual void SetItemBold(const wxTreeItemId& item, bool bold = true); virtual void SetItemBold(const wxTreeItemId& item, bool bold = true) wxOVERRIDE;
virtual void SetItemDropHighlight(const wxTreeItemId& item, virtual void SetItemDropHighlight(const wxTreeItemId& item,
bool highlight = true); bool highlight = true) wxOVERRIDE;
virtual void SetItemTextColour(const wxTreeItemId& item, virtual void SetItemTextColour(const wxTreeItemId& item,
const wxColour& col); const wxColour& col) wxOVERRIDE;
virtual void SetItemBackgroundColour(const wxTreeItemId& item, virtual void SetItemBackgroundColour(const wxTreeItemId& item,
const wxColour& col); const wxColour& col) wxOVERRIDE;
virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font); virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font) wxOVERRIDE;
// item status inquiries // item status inquiries
// --------------------- // ---------------------
virtual bool IsVisible(const wxTreeItemId& item) const; virtual bool IsVisible(const wxTreeItemId& item) const wxOVERRIDE;
virtual bool ItemHasChildren(const wxTreeItemId& item) const; virtual bool ItemHasChildren(const wxTreeItemId& item) const wxOVERRIDE;
virtual bool IsExpanded(const wxTreeItemId& item) const; virtual bool IsExpanded(const wxTreeItemId& item) const wxOVERRIDE;
virtual bool IsSelected(const wxTreeItemId& item) const; virtual bool IsSelected(const wxTreeItemId& item) const wxOVERRIDE;
virtual bool IsBold(const wxTreeItemId& item) const; virtual bool IsBold(const wxTreeItemId& item) const wxOVERRIDE;
virtual size_t GetChildrenCount(const wxTreeItemId& item, virtual size_t GetChildrenCount(const wxTreeItemId& item,
bool recursively = true) const; bool recursively = true) const wxOVERRIDE;
// navigation // navigation
// ---------- // ----------
virtual wxTreeItemId GetRootItem() const; virtual wxTreeItemId GetRootItem() const wxOVERRIDE;
virtual wxTreeItemId GetSelection() const; virtual wxTreeItemId GetSelection() const wxOVERRIDE;
virtual size_t GetSelections(wxArrayTreeItemIds& selections) const; virtual size_t GetSelections(wxArrayTreeItemIds& selections) const wxOVERRIDE;
virtual wxTreeItemId GetFocusedItem() const; virtual wxTreeItemId GetFocusedItem() const wxOVERRIDE;
virtual void ClearFocusedItem(); virtual void ClearFocusedItem() wxOVERRIDE;
virtual void SetFocusedItem(const wxTreeItemId& item); virtual void SetFocusedItem(const wxTreeItemId& item) wxOVERRIDE;
virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const; virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const wxOVERRIDE;
virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item, virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item,
wxTreeItemIdValue& cookie) const; wxTreeItemIdValue& cookie) const wxOVERRIDE;
virtual wxTreeItemId GetNextChild(const wxTreeItemId& item, virtual wxTreeItemId GetNextChild(const wxTreeItemId& item,
wxTreeItemIdValue& cookie) const; wxTreeItemIdValue& cookie) const wxOVERRIDE;
virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const; virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const wxOVERRIDE;
virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const; virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const wxOVERRIDE;
virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const; virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const wxOVERRIDE;
virtual wxTreeItemId GetFirstVisibleItem() const; virtual wxTreeItemId GetFirstVisibleItem() const wxOVERRIDE;
virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const; virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const wxOVERRIDE;
virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const; virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const wxOVERRIDE;
// operations // operations
// ---------- // ----------
virtual wxTreeItemId AddRoot(const wxString& text, virtual wxTreeItemId AddRoot(const wxString& text,
int image = -1, int selectedImage = -1, int image = -1, int selectedImage = -1,
wxTreeItemData *data = NULL); wxTreeItemData *data = NULL) wxOVERRIDE;
virtual void Delete(const wxTreeItemId& item); virtual void Delete(const wxTreeItemId& item) wxOVERRIDE;
virtual void DeleteChildren(const wxTreeItemId& item); virtual void DeleteChildren(const wxTreeItemId& item) wxOVERRIDE;
virtual void DeleteAllItems(); virtual void DeleteAllItems() wxOVERRIDE;
virtual void Expand(const wxTreeItemId& item); virtual void Expand(const wxTreeItemId& item) wxOVERRIDE;
virtual void Collapse(const wxTreeItemId& item); virtual void Collapse(const wxTreeItemId& item) wxOVERRIDE;
virtual void CollapseAndReset(const wxTreeItemId& item); virtual void CollapseAndReset(const wxTreeItemId& item) wxOVERRIDE;
virtual void Toggle(const wxTreeItemId& item); virtual void Toggle(const wxTreeItemId& item) wxOVERRIDE;
virtual void Unselect(); virtual void Unselect() wxOVERRIDE;
virtual void UnselectAll(); virtual void UnselectAll() wxOVERRIDE;
virtual void SelectItem(const wxTreeItemId& item, bool select = true); virtual void SelectItem(const wxTreeItemId& item, bool select = true) wxOVERRIDE;
virtual void SelectChildren(const wxTreeItemId& parent); virtual void SelectChildren(const wxTreeItemId& parent) wxOVERRIDE;
virtual void EnsureVisible(const wxTreeItemId& item); virtual void EnsureVisible(const wxTreeItemId& item) wxOVERRIDE;
virtual void ScrollTo(const wxTreeItemId& item); virtual void ScrollTo(const wxTreeItemId& item) wxOVERRIDE;
virtual wxTextCtrl *EditLabel(const wxTreeItemId& item, virtual wxTextCtrl *EditLabel(const wxTreeItemId& item,
wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)); wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)) wxOVERRIDE;
virtual wxTextCtrl *GetEditControl() const; virtual wxTextCtrl *GetEditControl() const wxOVERRIDE;
virtual void EndEditLabel(const wxTreeItemId& WXUNUSED(item), virtual void EndEditLabel(const wxTreeItemId& WXUNUSED(item),
bool discardChanges = false) bool discardChanges = false) wxOVERRIDE
{ {
DoEndEditLabel(discardChanges); DoEndEditLabel(discardChanges);
} }
virtual void SortChildren(const wxTreeItemId& item); virtual void SortChildren(const wxTreeItemId& item) wxOVERRIDE;
virtual bool GetBoundingRect(const wxTreeItemId& item, virtual bool GetBoundingRect(const wxTreeItemId& item,
wxRect& rect, wxRect& rect,
bool textOnly = false) const; bool textOnly = false) const wxOVERRIDE;
// implementation // implementation
// -------------- // --------------
virtual wxVisualAttributes GetDefaultAttributes() const virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
{ {
return GetClassDefaultAttributes(GetWindowVariant()); return GetClassDefaultAttributes(GetWindowVariant());
} }
@@ -189,27 +189,27 @@ public:
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
virtual WXLRESULT MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual WXLRESULT MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
virtual bool MSWShouldPreProcessMessage(WXMSG* msg); virtual bool MSWShouldPreProcessMessage(WXMSG* msg) wxOVERRIDE;
// override some base class virtuals // override some base class virtuals
virtual bool SetBackgroundColour(const wxColour &colour); virtual bool SetBackgroundColour(const wxColour &colour) wxOVERRIDE;
virtual bool SetForegroundColour(const wxColour &colour); virtual bool SetForegroundColour(const wxColour &colour) wxOVERRIDE;
// returns true if the platform should explicitly apply a theme border // returns true if the platform should explicitly apply a theme border
virtual bool CanApplyThemeBorder() const { return false; } virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
protected: protected:
// Implement "update locking" in a custom way for this control. // Implement "update locking" in a custom way for this control.
virtual void DoFreeze(); virtual void DoFreeze() wxOVERRIDE;
virtual void DoThaw(); virtual void DoThaw() wxOVERRIDE;
virtual void DoSetSize(int x, int y, virtual void DoSetSize(int x, int y,
int width, int height, int width, int height,
int sizeFlags = wxSIZE_AUTO); int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
// SetImageList helper // SetImageList helper
void SetAnyImageList(wxImageList *imageList, int which); void SetAnyImageList(wxImageList *imageList, int which);
@@ -220,20 +220,20 @@ protected:
// end edit label // end edit label
void DoEndEditLabel(bool discardChanges = false); void DoEndEditLabel(bool discardChanges = false);
virtual int DoGetItemState(const wxTreeItemId& item) const; virtual int DoGetItemState(const wxTreeItemId& item) const wxOVERRIDE;
virtual void DoSetItemState(const wxTreeItemId& item, int state); virtual void DoSetItemState(const wxTreeItemId& item, int state) wxOVERRIDE;
virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent, virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent,
size_t pos, size_t pos,
const wxString& text, const wxString& text,
int image, int selectedImage, int image, int selectedImage,
wxTreeItemData *data); wxTreeItemData *data) wxOVERRIDE;
virtual wxTreeItemId DoInsertAfter(const wxTreeItemId& parent, virtual wxTreeItemId DoInsertAfter(const wxTreeItemId& parent,
const wxTreeItemId& idPrevious, const wxTreeItemId& idPrevious,
const wxString& text, const wxString& text,
int image = -1, int selImage = -1, int image = -1, int selImage = -1,
wxTreeItemData *data = NULL); wxTreeItemData *data = NULL) wxOVERRIDE;
virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const; virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const wxOVERRIDE;
// obtain the user data for the lParam member of TV_ITEM // obtain the user data for the lParam member of TV_ITEM
class wxTreeItemParam *GetItemParam(const wxTreeItemId& item) const; class wxTreeItemParam *GetItemParam(const wxTreeItemId& item) const;

154
include/wx/msw/webview_ie.h
View File

@@ -60,73 +60,73 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxWebViewNameStr); const wxString& name = wxWebViewNameStr) wxOVERRIDE;
virtual void LoadURL(const wxString& url); virtual void LoadURL(const wxString& url) wxOVERRIDE;
virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item); virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item) wxOVERRIDE;
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory(); virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory() wxOVERRIDE;
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory(); virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory() wxOVERRIDE;
virtual bool CanGoForward() const; virtual bool CanGoForward() const wxOVERRIDE;
virtual bool CanGoBack() const; virtual bool CanGoBack() const wxOVERRIDE;
virtual void GoBack(); virtual void GoBack() wxOVERRIDE;
virtual void GoForward(); virtual void GoForward() wxOVERRIDE;
virtual void ClearHistory(); virtual void ClearHistory() wxOVERRIDE;
virtual void EnableHistory(bool enable = true); virtual void EnableHistory(bool enable = true) wxOVERRIDE;
virtual void Stop(); virtual void Stop() wxOVERRIDE;
virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT); virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) wxOVERRIDE;
virtual wxString GetPageSource() const; virtual wxString GetPageSource() const wxOVERRIDE;
virtual wxString GetPageText() const; virtual wxString GetPageText() const wxOVERRIDE;
virtual bool IsBusy() const; virtual bool IsBusy() const wxOVERRIDE;
virtual wxString GetCurrentURL() const; virtual wxString GetCurrentURL() const wxOVERRIDE;
virtual wxString GetCurrentTitle() const; virtual wxString GetCurrentTitle() const wxOVERRIDE;
virtual void SetZoomType(wxWebViewZoomType); virtual void SetZoomType(wxWebViewZoomType) wxOVERRIDE;
virtual wxWebViewZoomType GetZoomType() const; virtual wxWebViewZoomType GetZoomType() const wxOVERRIDE;
virtual bool CanSetZoomType(wxWebViewZoomType) const; virtual bool CanSetZoomType(wxWebViewZoomType) const wxOVERRIDE;
virtual void Print(); virtual void Print() wxOVERRIDE;
virtual wxWebViewZoom GetZoom() const; virtual wxWebViewZoom GetZoom() const wxOVERRIDE;
virtual void SetZoom(wxWebViewZoom zoom); virtual void SetZoom(wxWebViewZoom zoom) wxOVERRIDE;
//Clipboard functions //Clipboard functions
virtual bool CanCut() const; virtual bool CanCut() const wxOVERRIDE;
virtual bool CanCopy() const; virtual bool CanCopy() const wxOVERRIDE;
virtual bool CanPaste() const; virtual bool CanPaste() const wxOVERRIDE;
virtual void Cut(); virtual void Cut() wxOVERRIDE;
virtual void Copy(); virtual void Copy() wxOVERRIDE;
virtual void Paste(); virtual void Paste() wxOVERRIDE;
//Undo / redo functionality //Undo / redo functionality
virtual bool CanUndo() const; virtual bool CanUndo() const wxOVERRIDE;
virtual bool CanRedo() const; virtual bool CanRedo() const wxOVERRIDE;
virtual void Undo(); virtual void Undo() wxOVERRIDE;
virtual void Redo(); virtual void Redo() wxOVERRIDE;
//Find function //Find function
virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT); virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) wxOVERRIDE;
//Editing functions //Editing functions
virtual void SetEditable(bool enable = true); virtual void SetEditable(bool enable = true) wxOVERRIDE;
virtual bool IsEditable() const; virtual bool IsEditable() const wxOVERRIDE;
//Selection //Selection
virtual void SelectAll(); virtual void SelectAll() wxOVERRIDE;
virtual bool HasSelection() const; virtual bool HasSelection() const wxOVERRIDE;
virtual void DeleteSelection(); virtual void DeleteSelection() wxOVERRIDE;
virtual wxString GetSelectedText() const; virtual wxString GetSelectedText() const wxOVERRIDE;
virtual wxString GetSelectedSource() const; virtual wxString GetSelectedSource() const wxOVERRIDE;
virtual void ClearSelection(); virtual void ClearSelection() wxOVERRIDE;
virtual void RunScript(const wxString& javascript); virtual void RunScript(const wxString& javascript) wxOVERRIDE;
//Virtual Filesystem Support //Virtual Filesystem Support
virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler); virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler) wxOVERRIDE;
virtual void* GetNativeBackend() const { return m_webBrowser; } virtual void* GetNativeBackend() const wxOVERRIDE { return m_webBrowser; }
// ---- IE-specific methods // ---- IE-specific methods
@@ -146,7 +146,7 @@ public:
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
protected: protected:
virtual void DoSetPage(const wxString& html, const wxString& baseUrl); virtual void DoSetPage(const wxString& html, const wxString& baseUrl) wxOVERRIDE;
private: private:
wxIEContainer* m_container; wxIEContainer* m_container;
@@ -197,14 +197,14 @@ private:
class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryIE : public wxWebViewFactory class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryIE : public wxWebViewFactory
{ {
public: public:
virtual wxWebView* Create() { return new wxWebViewIE; } virtual wxWebView* Create() wxOVERRIDE { return new wxWebViewIE; }
virtual wxWebView* Create(wxWindow* parent, virtual wxWebView* Create(wxWindow* parent,
wxWindowID id, wxWindowID id,
const wxString& url = wxWebViewDefaultURLStr, const wxString& url = wxWebViewDefaultURLStr,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, long style = 0,
const wxString& name = wxWebViewNameStr) const wxString& name = wxWebViewNameStr) wxOVERRIDE
{ return new wxWebViewIE(parent, id, url, pos, size, style, name); } { return new wxWebViewIE(parent, id, url, pos, size, style, name); }
}; };
@@ -227,28 +227,28 @@ public:
//IInternetProtocolRoot //IInternetProtocolRoot
HRESULT STDMETHODCALLTYPE Abort(HRESULT WXUNUSED(hrReason), HRESULT STDMETHODCALLTYPE Abort(HRESULT WXUNUSED(hrReason),
DWORD WXUNUSED(dwOptions)) DWORD WXUNUSED(dwOptions)) wxOVERRIDE
{ return E_NOTIMPL; } { return E_NOTIMPL; }
HRESULT STDMETHODCALLTYPE Continue(wxPROTOCOLDATA *WXUNUSED(pProtocolData)) HRESULT STDMETHODCALLTYPE Continue(wxPROTOCOLDATA *WXUNUSED(pProtocolData)) wxOVERRIDE
{ return S_OK; } { return S_OK; }
HRESULT STDMETHODCALLTYPE Resume() { return S_OK; } HRESULT STDMETHODCALLTYPE Resume() wxOVERRIDE { return S_OK; }
HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl, HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl,
wxIInternetProtocolSink *pOIProtSink, wxIInternetProtocolSink *pOIProtSink,
wxIInternetBindInfo *pOIBindInfo, wxIInternetBindInfo *pOIBindInfo,
DWORD grfPI, DWORD grfPI,
HANDLE_PTR dwReserved); HANDLE_PTR dwReserved) wxOVERRIDE;
HRESULT STDMETHODCALLTYPE Suspend() { return S_OK; } HRESULT STDMETHODCALLTYPE Suspend() wxOVERRIDE { return S_OK; }
HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) { return S_OK; } HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) wxOVERRIDE { return S_OK; }
//IInternetProtocol //IInternetProtocol
HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions)) HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions)) wxOVERRIDE
{ return S_OK; } { return S_OK; }
HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead); HRESULT STDMETHODCALLTYPE Read(void *pv, ULONG cb, ULONG *pcbRead) wxOVERRIDE;
HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER WXUNUSED(dlibMove), HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER WXUNUSED(dlibMove),
DWORD WXUNUSED(dwOrigin), DWORD WXUNUSED(dwOrigin),
ULARGE_INTEGER* WXUNUSED(plibNewPosition)) ULARGE_INTEGER* WXUNUSED(plibNewPosition)) wxOVERRIDE
{ return E_FAIL; } { return E_FAIL; }
HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; } HRESULT STDMETHODCALLTYPE UnlockRequest() wxOVERRIDE { return S_OK; }
}; };
class ClassFactory : public IClassFactory class ClassFactory : public IClassFactory
@@ -262,8 +262,8 @@ public:
//IClassFactory //IClassFactory
HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter, HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter,
REFIID riid, void** ppvObject); REFIID riid, void** ppvObject) wxOVERRIDE;
HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock); HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock) wxOVERRIDE;
//IUnknown //IUnknown
DECLARE_IUNKNOWN_METHODS; DECLARE_IUNKNOWN_METHODS;
@@ -277,7 +277,7 @@ class wxIEContainer : public wxActiveXContainer
public: public:
wxIEContainer(wxWindow *parent, REFIID iid, IUnknown *pUnk, DocHostUIHandler* uiHandler = NULL); wxIEContainer(wxWindow *parent, REFIID iid, IUnknown *pUnk, DocHostUIHandler* uiHandler = NULL);
virtual ~wxIEContainer(); virtual ~wxIEContainer();
virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc); virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc) wxOVERRIDE;
private: private:
DocHostUIHandler* m_uiHandler; DocHostUIHandler* m_uiHandler;
}; };
@@ -290,48 +290,48 @@ public:
virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt, virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt,
IUnknown *pcmdtReserved, IUnknown *pcmdtReserved,
IDispatch *pdispReserved); IDispatch *pdispReserved) wxOVERRIDE;
virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo); virtual HRESULT wxSTDCALL GetHostInfo(DOCHOSTUIINFO *pInfo) wxOVERRIDE;
virtual HRESULT wxSTDCALL ShowUI(DWORD dwID, virtual HRESULT wxSTDCALL ShowUI(DWORD dwID,
IOleInPlaceActiveObject *pActiveObject, IOleInPlaceActiveObject *pActiveObject,
IOleCommandTarget *pCommandTarget, IOleCommandTarget *pCommandTarget,
IOleInPlaceFrame *pFrame, IOleInPlaceFrame *pFrame,
IOleInPlaceUIWindow *pDoc); IOleInPlaceUIWindow *pDoc) wxOVERRIDE;
virtual HRESULT wxSTDCALL HideUI(void); virtual HRESULT wxSTDCALL HideUI(void) wxOVERRIDE;
virtual HRESULT wxSTDCALL UpdateUI(void); virtual HRESULT wxSTDCALL UpdateUI(void) wxOVERRIDE;
virtual HRESULT wxSTDCALL EnableModeless(BOOL fEnable); virtual HRESULT wxSTDCALL EnableModeless(BOOL fEnable) wxOVERRIDE;
virtual HRESULT wxSTDCALL OnDocWindowActivate(BOOL fActivate); virtual HRESULT wxSTDCALL OnDocWindowActivate(BOOL fActivate) wxOVERRIDE;
virtual HRESULT wxSTDCALL OnFrameWindowActivate(BOOL fActivate); virtual HRESULT wxSTDCALL OnFrameWindowActivate(BOOL fActivate) wxOVERRIDE;
virtual HRESULT wxSTDCALL ResizeBorder(LPCRECT prcBorder, virtual HRESULT wxSTDCALL ResizeBorder(LPCRECT prcBorder,
IOleInPlaceUIWindow *pUIWindow, IOleInPlaceUIWindow *pUIWindow,
BOOL fRameWindow); BOOL fRameWindow) wxOVERRIDE;
virtual HRESULT wxSTDCALL TranslateAccelerator(LPMSG lpMsg, virtual HRESULT wxSTDCALL TranslateAccelerator(LPMSG lpMsg,
const GUID *pguidCmdGroup, const GUID *pguidCmdGroup,
DWORD nCmdID); DWORD nCmdID) wxOVERRIDE;
virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey, virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey,
DWORD dw); DWORD dw) wxOVERRIDE;
virtual HRESULT wxSTDCALL GetDropTarget(IDropTarget *pDropTarget, virtual HRESULT wxSTDCALL GetDropTarget(IDropTarget *pDropTarget,
IDropTarget **ppDropTarget); IDropTarget **ppDropTarget) wxOVERRIDE;
virtual HRESULT wxSTDCALL GetExternal(IDispatch **ppDispatch); virtual HRESULT wxSTDCALL GetExternal(IDispatch **ppDispatch) wxOVERRIDE;
virtual HRESULT wxSTDCALL TranslateUrl(DWORD dwTranslate, virtual HRESULT wxSTDCALL TranslateUrl(DWORD dwTranslate,
OLECHAR *pchURLIn, OLECHAR *pchURLIn,
OLECHAR **ppchURLOut); OLECHAR **ppchURLOut) wxOVERRIDE;
virtual HRESULT wxSTDCALL FilterDataObject(IDataObject *pDO, virtual HRESULT wxSTDCALL FilterDataObject(IDataObject *pDO,
IDataObject **ppDORet); IDataObject **ppDORet) wxOVERRIDE;
//IUnknown //IUnknown
DECLARE_IUNKNOWN_METHODS; DECLARE_IUNKNOWN_METHODS;

122
include/wx/msw/window.h
View File

@@ -55,74 +55,74 @@ public:
const wxString& name = wxPanelNameStr); const wxString& name = wxPanelNameStr);
// implement base class pure virtuals // implement base class pure virtuals
virtual void SetLabel(const wxString& label); virtual void SetLabel(const wxString& label) wxOVERRIDE;
virtual wxString GetLabel() const; virtual wxString GetLabel() const wxOVERRIDE;
virtual void Raise(); virtual void Raise() wxOVERRIDE;
virtual void Lower(); virtual void Lower() wxOVERRIDE;
#if wxUSE_DEFERRED_SIZING #if wxUSE_DEFERRED_SIZING
virtual bool BeginRepositioningChildren(); virtual bool BeginRepositioningChildren() wxOVERRIDE;
virtual void EndRepositioningChildren(); virtual void EndRepositioningChildren() wxOVERRIDE;
#endif // wxUSE_DEFERRED_SIZING #endif // wxUSE_DEFERRED_SIZING
virtual bool Show(bool show = true); virtual bool Show(bool show = true) wxOVERRIDE;
virtual bool ShowWithEffect(wxShowEffect effect, virtual bool ShowWithEffect(wxShowEffect effect,
unsigned timeout = 0) unsigned timeout = 0) wxOVERRIDE
{ {
return MSWShowWithEffect(true, effect, timeout); return MSWShowWithEffect(true, effect, timeout);
} }
virtual bool HideWithEffect(wxShowEffect effect, virtual bool HideWithEffect(wxShowEffect effect,
unsigned timeout = 0) unsigned timeout = 0) wxOVERRIDE
{ {
return MSWShowWithEffect(false, effect, timeout); return MSWShowWithEffect(false, effect, timeout);
} }
virtual void SetFocus(); virtual void SetFocus() wxOVERRIDE;
virtual void SetFocusFromKbd(); virtual void SetFocusFromKbd() wxOVERRIDE;
virtual bool Reparent(wxWindowBase *newParent); virtual bool Reparent(wxWindowBase *newParent) wxOVERRIDE;
virtual void WarpPointer(int x, int y); virtual void WarpPointer(int x, int y) wxOVERRIDE;
virtual void Refresh( bool eraseBackground = true, virtual void Refresh( bool eraseBackground = true,
const wxRect *rect = (const wxRect *) NULL ); const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE;
virtual void Update(); virtual void Update() wxOVERRIDE;
virtual void SetWindowStyleFlag(long style); virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
virtual void SetExtraStyle(long exStyle); virtual void SetExtraStyle(long exStyle) wxOVERRIDE;
virtual bool SetCursor( const wxCursor &cursor ); virtual bool SetCursor( const wxCursor &cursor ) wxOVERRIDE;
virtual bool SetFont( const wxFont &font ); virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
virtual int GetCharHeight() const; virtual int GetCharHeight() const wxOVERRIDE;
virtual int GetCharWidth() const; virtual int GetCharWidth() const wxOVERRIDE;
virtual void SetScrollbar( int orient, int pos, int thumbVisible, virtual void SetScrollbar( int orient, int pos, int thumbVisible,
int range, bool refresh = true ); int range, bool refresh = true ) wxOVERRIDE;
virtual void SetScrollPos( int orient, int pos, bool refresh = true ); virtual void SetScrollPos( int orient, int pos, bool refresh = true ) wxOVERRIDE;
virtual int GetScrollPos( int orient ) const; virtual int GetScrollPos( int orient ) const wxOVERRIDE;
virtual int GetScrollThumb( int orient ) const; virtual int GetScrollThumb( int orient ) const wxOVERRIDE;
virtual int GetScrollRange( int orient ) const; virtual int GetScrollRange( int orient ) const wxOVERRIDE;
virtual void ScrollWindow( int dx, int dy, virtual void ScrollWindow( int dx, int dy,
const wxRect* rect = NULL ); const wxRect* rect = NULL ) wxOVERRIDE;
virtual bool ScrollLines(int lines); virtual bool ScrollLines(int lines) wxOVERRIDE;
virtual bool ScrollPages(int pages); virtual bool ScrollPages(int pages) wxOVERRIDE;
virtual void SetLayoutDirection(wxLayoutDirection dir); virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE;
virtual wxLayoutDirection GetLayoutDirection() const; virtual wxLayoutDirection GetLayoutDirection() const wxOVERRIDE;
virtual wxCoord AdjustForLayoutDirection(wxCoord x, virtual wxCoord AdjustForLayoutDirection(wxCoord x,
wxCoord width, wxCoord width,
wxCoord widthTotal) const; wxCoord widthTotal) const wxOVERRIDE;
virtual void SetId(wxWindowID winid); virtual void SetId(wxWindowID winid) wxOVERRIDE;
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
virtual void SetDropTarget( wxDropTarget *dropTarget ); virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE;
#endif // wxUSE_DRAG_AND_DROP #endif // wxUSE_DRAG_AND_DROP
// Accept files for dragging // Accept files for dragging
virtual void DragAcceptFiles(bool accept); virtual void DragAcceptFiles(bool accept) wxOVERRIDE;
#ifndef __WXUNIVERSAL__ #ifndef __WXUNIVERSAL__
// Native resource loading (implemented in src/msw/nativdlg.cpp) // Native resource loading (implemented in src/msw/nativdlg.cpp)
@@ -135,8 +135,8 @@ public:
#if wxUSE_HOTKEY #if wxUSE_HOTKEY
// install and deinstall a system wide hotkey // install and deinstall a system wide hotkey
virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode); virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) wxOVERRIDE;
virtual bool UnregisterHotKey(int hotkeyId); virtual bool UnregisterHotKey(int hotkeyId) wxOVERRIDE;
#endif // wxUSE_HOTKEY #endif // wxUSE_HOTKEY
// window handle stuff // window handle stuff
@@ -144,10 +144,10 @@ public:
WXHWND GetHWND() const { return m_hWnd; } WXHWND GetHWND() const { return m_hWnd; }
void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; } void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; }
virtual WXWidget GetHandle() const { return GetHWND(); } virtual WXWidget GetHandle() const wxOVERRIDE { return GetHWND(); }
void AssociateHandle(WXWidget handle); void AssociateHandle(WXWidget handle) wxOVERRIDE;
void DissociateHandle(); void DissociateHandle() wxOVERRIDE;
// does this window have deferred position and/or size? // does this window have deferred position and/or size?
bool IsSizeDeferred() const; bool IsSizeDeferred() const;
@@ -514,7 +514,7 @@ public:
bool IsMouseInWindow() const; bool IsMouseInWindow() const;
// check if a native double-buffering applies for this window // check if a native double-buffering applies for this window
virtual bool IsDoubleBuffered() const; virtual bool IsDoubleBuffered() const wxOVERRIDE;
void SetDoubleBuffered(bool on); void SetDoubleBuffered(bool on);
@@ -523,7 +523,7 @@ public:
// virtual function for implementing internal idle // virtual function for implementing internal idle
// behaviour // behaviour
virtual void OnInternalIdle(); virtual void OnInternalIdle() wxOVERRIDE;
#if wxUSE_MENUS && !defined(__WXUNIVERSAL__) #if wxUSE_MENUS && !defined(__WXUNIVERSAL__)
virtual bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu); virtual bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
@@ -552,17 +552,17 @@ protected:
// this allows you to implement standard control borders without // this allows you to implement standard control borders without
// repeating the code in different classes that are not derived from // repeating the code in different classes that are not derived from
// wxControl // wxControl
virtual wxBorder GetDefaultBorderForControl() const; virtual wxBorder GetDefaultBorderForControl() const wxOVERRIDE;
// choose the default border for this window // choose the default border for this window
virtual wxBorder GetDefaultBorder() const; virtual wxBorder GetDefaultBorder() const wxOVERRIDE;
// Translate wxBORDER_THEME (and other border styles if necessary to the value // Translate wxBORDER_THEME (and other border styles if necessary to the value
// that makes most sense for this Windows environment // that makes most sense for this Windows environment
virtual wxBorder TranslateBorder(wxBorder border) const; virtual wxBorder TranslateBorder(wxBorder border) const;
#if wxUSE_MENUS_NATIVE #if wxUSE_MENUS_NATIVE
virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) wxOVERRIDE;
#endif // wxUSE_MENUS_NATIVE #endif // wxUSE_MENUS_NATIVE
// the window handle // the window handle
@@ -584,26 +584,26 @@ protected:
int *x, int *y, int *x, int *y,
int *descent = NULL, int *descent = NULL,
int *externalLeading = NULL, int *externalLeading = NULL,
const wxFont *font = NULL) const; const wxFont *font = NULL) const wxOVERRIDE;
virtual void DoClientToScreen( int *x, int *y ) const; virtual void DoClientToScreen( int *x, int *y ) const wxOVERRIDE;
virtual void DoScreenToClient( int *x, int *y ) const; virtual void DoScreenToClient( int *x, int *y ) const wxOVERRIDE;
virtual void DoGetPosition( int *x, int *y ) const; virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE;
virtual void DoGetSize( int *width, int *height ) const; virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
virtual void DoGetClientSize( int *width, int *height ) const; virtual void DoGetClientSize( int *width, int *height ) const wxOVERRIDE;
virtual void DoSetSize(int x, int y, virtual void DoSetSize(int x, int y,
int width, int height, int width, int height,
int sizeFlags = wxSIZE_AUTO); int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
virtual void DoSetClientSize(int width, int height); virtual void DoSetClientSize(int width, int height) wxOVERRIDE;
virtual wxSize DoGetBorderSize() const; virtual wxSize DoGetBorderSize() const wxOVERRIDE;
virtual void DoCaptureMouse(); virtual void DoCaptureMouse() wxOVERRIDE;
virtual void DoReleaseMouse(); virtual void DoReleaseMouse() wxOVERRIDE;
virtual void DoEnable(bool enable); virtual void DoEnable(bool enable) wxOVERRIDE;
virtual void DoFreeze(); virtual void DoFreeze() wxOVERRIDE;
virtual void DoThaw(); virtual void DoThaw() wxOVERRIDE;
// this simply moves/resizes the given HWND which is supposed to be our // this simply moves/resizes the given HWND which is supposed to be our
// sibling (this is useful for controls which are composite at MSW level // sibling (this is useful for controls which are composite at MSW level
@@ -617,10 +617,10 @@ protected:
// from both DoSetSize() and DoSetClientSize() and would usually just call // from both DoSetSize() and DoSetClientSize() and would usually just call
// ::MoveWindow() except for composite controls which will want to arrange // ::MoveWindow() except for composite controls which will want to arrange
// themselves inside the given rectangle // themselves inside the given rectangle
virtual void DoMoveWindow(int x, int y, int width, int height); virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
virtual void DoSetToolTip( wxToolTip *tip ); virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE;
// process TTN_NEEDTEXT message properly (i.e. fixing the bugs in // process TTN_NEEDTEXT message properly (i.e. fixing the bugs in
// comctl32.dll in our code -- see the function body for more info) // comctl32.dll in our code -- see the function body for more info)

24
src/msw/anybutton.cpp
View File

@@ -158,32 +158,32 @@ public:
} }
} }
virtual wxBitmap GetBitmap(wxAnyButton::State which) const virtual wxBitmap GetBitmap(wxAnyButton::State which) const wxOVERRIDE
{ {
return m_bitmaps[which]; return m_bitmaps[which];
} }
virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which) virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which) wxOVERRIDE
{ {
m_bitmaps[which] = bitmap; m_bitmaps[which] = bitmap;
} }
virtual wxSize GetBitmapMargins() const virtual wxSize GetBitmapMargins() const wxOVERRIDE
{ {
return m_margin; return m_margin;
} }
virtual void SetBitmapMargins(wxCoord x, wxCoord y) virtual void SetBitmapMargins(wxCoord x, wxCoord y) wxOVERRIDE
{ {
m_margin = wxSize(x, y); m_margin = wxSize(x, y);
} }
virtual wxDirection GetBitmapPosition() const virtual wxDirection GetBitmapPosition() const wxOVERRIDE
{ {
return m_dir; return m_dir;
} }
virtual void SetBitmapPosition(wxDirection dir) virtual void SetBitmapPosition(wxDirection dir) wxOVERRIDE
{ {
m_dir = dir; m_dir = dir;
} }
@@ -254,12 +254,12 @@ public:
UpdateImageInfo(); UpdateImageInfo();
} }
virtual wxBitmap GetBitmap(wxAnyButton::State which) const virtual wxBitmap GetBitmap(wxAnyButton::State which) const wxOVERRIDE
{ {
return m_iml.GetBitmap(which); return m_iml.GetBitmap(which);
} }
virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which) virtual void SetBitmap(const wxBitmap& bitmap, wxAnyButton::State which) wxOVERRIDE
{ {
m_iml.Replace(which, bitmap); m_iml.Replace(which, bitmap);
@@ -271,12 +271,12 @@ public:
UpdateImageInfo(); UpdateImageInfo();
} }
virtual wxSize GetBitmapMargins() const virtual wxSize GetBitmapMargins() const wxOVERRIDE
{ {
return wxSize(m_data.margin.left, m_data.margin.top); return wxSize(m_data.margin.left, m_data.margin.top);
} }
virtual void SetBitmapMargins(wxCoord x, wxCoord y) virtual void SetBitmapMargins(wxCoord x, wxCoord y) wxOVERRIDE
{ {
RECT& margin = m_data.margin; RECT& margin = m_data.margin;
margin.left = margin.left =
@@ -290,7 +290,7 @@ public:
} }
} }
virtual wxDirection GetBitmapPosition() const virtual wxDirection GetBitmapPosition() const wxOVERRIDE
{ {
switch ( m_data.uAlign ) switch ( m_data.uAlign )
{ {
@@ -312,7 +312,7 @@ public:
} }
} }
virtual void SetBitmapPosition(wxDirection dir) virtual void SetBitmapPosition(wxDirection dir) wxOVERRIDE
{ {
UINT alignNew; UINT alignNew;
switch ( dir ) switch ( dir )

2
src/msw/artmsw.cpp
View File

@@ -140,7 +140,7 @@ class wxWindowsArtProvider : public wxArtProvider
{ {
protected: protected:
virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client, virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client,
const wxSize& size); const wxSize& size) wxOVERRIDE;
}; };
static wxBitmap CreateFromStdIcon(const char *iconName, static wxBitmap CreateFromStdIcon(const char *iconName,

2
src/msw/bitmap.cpp
View File

@@ -69,7 +69,7 @@ public:
wxBitmapRefData(const wxBitmapRefData& data); wxBitmapRefData(const wxBitmapRefData& data);
virtual ~wxBitmapRefData() { Free(); } virtual ~wxBitmapRefData() { Free(); }
virtual void Free(); virtual void Free() wxOVERRIDE;
#if wxUSE_WXDIB #if wxUSE_WXDIB
// Creates a new bitmap (DDB or DIB) from the contents of the given DIB. // Creates a new bitmap (DDB or DIB) from the contents of the given DIB.

4
src/msw/checklst.cpp
View File

@@ -81,7 +81,7 @@ public:
wxCheckListBoxItem(wxCheckListBox *parent); wxCheckListBoxItem(wxCheckListBox *parent);
// drawing functions // drawing functions
virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat); virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat) wxOVERRIDE;
// simple accessors and operations // simple accessors and operations
wxCheckListBox *GetParent() const wxCheckListBox *GetParent() const
@@ -90,7 +90,7 @@ public:
int GetIndex() const int GetIndex() const
{ return m_parent->GetItemIndex(const_cast<wxCheckListBoxItem*>(this)); } { return m_parent->GetItemIndex(const_cast<wxCheckListBoxItem*>(this)); }
wxString GetName() const wxString GetName() const wxOVERRIDE
{ return m_parent->GetString(GetIndex()); } { return m_parent->GetString(GetIndex()); }

6
src/msw/cursor.cpp
View File

@@ -53,7 +53,7 @@ public:
virtual ~wxCursorRefData() { Free(); } virtual ~wxCursorRefData() { Free(); }
virtual void Free(); virtual void Free() wxOVERRIDE;
// return the size of the standard cursor: notice that the system only // return the size of the standard cursor: notice that the system only
@@ -89,14 +89,14 @@ static wxCursor *gs_globalCursor = NULL;
class wxCursorModule : public wxModule class wxCursorModule : public wxModule
{ {
public: public:
virtual bool OnInit() virtual bool OnInit() wxOVERRIDE
{ {
gs_globalCursor = new wxCursor; gs_globalCursor = new wxCursor;
return true; return true;
} }
virtual void OnExit() virtual void OnExit() wxOVERRIDE
{ {
wxDELETE(gs_globalCursor); wxDELETE(gs_globalCursor);
} }

8
src/msw/dc.cpp
View File

@@ -210,8 +210,8 @@ static bool gs_triedToLoadSetLayout = false;
class wxGDIDLLsCleanupModule : public wxModule class wxGDIDLLsCleanupModule : public wxModule
{ {
public: public:
virtual bool OnInit() { return true; } virtual bool OnInit() wxOVERRIDE { return true; }
virtual void OnExit() virtual void OnExit() wxOVERRIDE
{ {
wxMSIMG32DLL.Unload(); wxMSIMG32DLL.Unload();
wxGDI32DLL.Unload(); wxGDI32DLL.Unload();
@@ -2566,8 +2566,8 @@ void wxMSWDCImpl::ClearCache()
class wxDCModule : public wxModule class wxDCModule : public wxModule
{ {
public: public:
virtual bool OnInit() { return true; } virtual bool OnInit() wxOVERRIDE { return true; }
virtual void OnExit() { wxMSWDCImpl::ClearCache(); } virtual void OnExit() wxOVERRIDE { wxMSWDCImpl::ClearCache(); }
private: private:
wxDECLARE_DYNAMIC_CLASS(wxDCModule); wxDECLARE_DYNAMIC_CLASS(wxDCModule);

4
src/msw/dde.cpp
View File

@@ -120,8 +120,8 @@ class wxDDEModule : public wxModule
{ {
public: public:
wxDDEModule() {} wxDDEModule() {}
bool OnInit() { return true; } bool OnInit() wxOVERRIDE { return true; }
void OnExit() { wxDDECleanUp(); } void OnExit() wxOVERRIDE { wxDDECleanUp(); }
private: private:
wxDECLARE_DYNAMIC_CLASS(wxDDEModule); wxDECLARE_DYNAMIC_CLASS(wxDDEModule);

22
src/msw/display.cpp
View File

@@ -83,14 +83,14 @@ public:
{ {
} }
virtual wxRect GetGeometry() const; virtual wxRect GetGeometry() const wxOVERRIDE;
virtual wxRect GetClientArea() const; virtual wxRect GetClientArea() const wxOVERRIDE;
virtual wxString GetName() const; virtual wxString GetName() const wxOVERRIDE;
virtual bool IsPrimary() const; virtual bool IsPrimary() const wxOVERRIDE;
virtual wxVideoMode GetCurrentMode() const; virtual wxVideoMode GetCurrentMode() const wxOVERRIDE;
virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const; virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE;
virtual bool ChangeMode(const wxVideoMode& mode); virtual bool ChangeMode(const wxVideoMode& mode) wxOVERRIDE;
protected: protected:
// convert a DEVMODE to our wxVideoMode // convert a DEVMODE to our wxVideoMode
@@ -135,10 +135,10 @@ public:
bool IsOk() const { return !m_displays.empty(); } bool IsOk() const { return !m_displays.empty(); }
virtual wxDisplayImpl *CreateDisplay(unsigned n); virtual wxDisplayImpl *CreateDisplay(unsigned n) wxOVERRIDE;
virtual unsigned GetCount() { return unsigned(m_displays.size()); } virtual unsigned GetCount() wxOVERRIDE { return unsigned(m_displays.size()); }
virtual int GetFromPoint(const wxPoint& pt); virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE;
virtual int GetFromWindow(const wxWindow *window); virtual int GetFromWindow(const wxWindow *window) wxOVERRIDE;
// Called when we receive WM_SETTINGCHANGE to refresh the list of monitor // Called when we receive WM_SETTINGCHANGE to refresh the list of monitor
// handles. // handles.

2
src/msw/enhmeta.cpp
View File

@@ -230,7 +230,7 @@ public:
wxEnhMetaFile *Close(); wxEnhMetaFile *Close();
protected: protected:
virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
private: private:
void Create(HDC hdcRef, void Create(HDC hdcRef,

6
src/msw/fswatcher.cpp
View File

@@ -39,12 +39,12 @@ public:
void SendEvent(wxFileSystemWatcherEvent& evt); void SendEvent(wxFileSystemWatcherEvent& evt);
protected: protected:
bool Init(); bool Init() wxOVERRIDE;
// adds watch to be monitored for file system changes // adds watch to be monitored for file system changes
virtual bool DoAdd(wxSharedPtr<wxFSWatchEntryMSW> watch); virtual bool DoAdd(wxSharedPtr<wxFSWatchEntryMSW> watch) wxOVERRIDE;
virtual bool DoRemove(wxSharedPtr<wxFSWatchEntryMSW> watch); virtual bool DoRemove(wxSharedPtr<wxFSWatchEntryMSW> watch) wxOVERRIDE;
private: private:
bool DoSetUpWatch(wxFSWatchEntryMSW& watch); bool DoSetUpWatch(wxFSWatchEntryMSW& watch);

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