use wxOVERRIDE in wxMSW sources
This commit is contained in:
Paul Cornett
parent
9b477e46e5
commit
9b19a6e529
@ -28,30 +28,30 @@ public:
|
||||
virtual ~wxAnyButton();
|
||||
|
||||
// overridden base class methods
|
||||
virtual void SetLabel(const wxString& label);
|
||||
virtual bool SetBackgroundColour(const wxColour &colour);
|
||||
virtual bool SetForegroundColour(const wxColour &colour);
|
||||
virtual void SetLabel(const wxString& label) wxOVERRIDE;
|
||||
virtual bool SetBackgroundColour(const wxColour &colour) wxOVERRIDE;
|
||||
virtual bool SetForegroundColour(const wxColour &colour) wxOVERRIDE;
|
||||
|
||||
// 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
|
||||
virtual bool CanApplyThemeBorder() const { return false; }
|
||||
virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
|
||||
|
||||
protected:
|
||||
// usually overridden base class virtuals
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
|
||||
virtual wxBitmap DoGetBitmap(State which) const;
|
||||
virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
|
||||
virtual wxSize DoGetBitmapMargins() const;
|
||||
virtual void DoSetBitmapMargins(wxCoord x, wxCoord y);
|
||||
virtual void DoSetBitmapPosition(wxDirection dir);
|
||||
virtual wxBitmap DoGetBitmap(State which) const wxOVERRIDE;
|
||||
virtual void DoSetBitmap(const wxBitmap& bitmap, State which) wxOVERRIDE;
|
||||
virtual wxSize DoGetBitmapMargins() const wxOVERRIDE;
|
||||
virtual void DoSetBitmapMargins(wxCoord x, wxCoord y) wxOVERRIDE;
|
||||
virtual void DoSetBitmapPosition(wxDirection dir) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_MARKUP
|
||||
virtual bool DoSetLabelMarkup(const wxString& markup);
|
||||
virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE;
|
||||
#endif // wxUSE_MARKUP
|
||||
|
||||
// Increases the passed in size to account for the button image.
|
||||
|
||||
@ -29,12 +29,12 @@ public:
|
||||
virtual ~wxApp();
|
||||
|
||||
// override base class (pure) virtuals
|
||||
virtual bool Initialize(int& argc, wxChar **argv);
|
||||
virtual void CleanUp();
|
||||
virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE;
|
||||
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; }
|
||||
|
||||
// implementation only
|
||||
@ -43,7 +43,7 @@ public:
|
||||
void OnQueryEndSession(wxCloseEvent& event);
|
||||
|
||||
#if wxUSE_EXCEPTIONS
|
||||
virtual bool OnExceptionInMainLoop();
|
||||
virtual bool OnExceptionInMainLoop() wxOVERRIDE;
|
||||
#endif // wxUSE_EXCEPTIONS
|
||||
|
||||
// MSW-specific from now on
|
||||
|
||||
@ -18,18 +18,18 @@
|
||||
class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
|
||||
{
|
||||
public:
|
||||
virtual wxEventLoopBase *CreateEventLoop();
|
||||
virtual void *BeforeChildWaitLoop();
|
||||
virtual void AfterChildWaitLoop(void *data);
|
||||
virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE;
|
||||
virtual void *BeforeChildWaitLoop() wxOVERRIDE;
|
||||
virtual void AfterChildWaitLoop(void *data) wxOVERRIDE;
|
||||
#if wxUSE_TIMER
|
||||
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
|
||||
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE;
|
||||
#endif // wxUSE_TIMER
|
||||
#if wxUSE_THREADS
|
||||
virtual bool DoMessageFromThreadWait();
|
||||
virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);
|
||||
virtual bool DoMessageFromThreadWait() wxOVERRIDE;
|
||||
virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags) wxOVERRIDE;
|
||||
#endif // wxUSE_THREADS
|
||||
virtual bool CanUseStderr() { return true; }
|
||||
virtual bool WriteToStderr(const wxString& text);
|
||||
virtual bool CanUseStderr() wxOVERRIDE { return true; }
|
||||
virtual bool WriteToStderr(const wxString& text) wxOVERRIDE;
|
||||
};
|
||||
|
||||
#if wxUSE_GUI
|
||||
@ -39,22 +39,22 @@ public:
|
||||
class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
|
||||
{
|
||||
public:
|
||||
virtual wxEventLoopBase *CreateEventLoop();
|
||||
virtual void *BeforeChildWaitLoop();
|
||||
virtual void AfterChildWaitLoop(void *data);
|
||||
virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE;
|
||||
virtual void *BeforeChildWaitLoop() wxOVERRIDE;
|
||||
virtual void AfterChildWaitLoop(void *data) wxOVERRIDE;
|
||||
#if wxUSE_TIMER
|
||||
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
|
||||
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) wxOVERRIDE;
|
||||
#endif // wxUSE_TIMER
|
||||
#if wxUSE_THREADS
|
||||
virtual bool DoMessageFromThreadWait();
|
||||
virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);
|
||||
virtual bool DoMessageFromThreadWait() wxOVERRIDE;
|
||||
virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags) wxOVERRIDE;
|
||||
#endif // wxUSE_THREADS
|
||||
wxPortId GetToolkitVersion(int *majVer = NULL,
|
||||
int *minVer = NULL,
|
||||
int *microVer = NULL) const wxOVERRIDE;
|
||||
|
||||
virtual bool CanUseStderr();
|
||||
virtual bool WriteToStderr(const wxString& text);
|
||||
virtual bool CanUseStderr() wxOVERRIDE;
|
||||
virtual bool WriteToStderr(const wxString& text) wxOVERRIDE;
|
||||
};
|
||||
|
||||
#elif defined(__WXGTK__)
|
||||
|
||||
@ -206,8 +206,8 @@ public:
|
||||
wxDC *GetSelectedInto() const;
|
||||
|
||||
protected:
|
||||
virtual wxGDIImageRefData *CreateData() const;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
||||
virtual wxGDIImageRefData *CreateData() const wxOVERRIDE;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
|
||||
|
||||
// creates an uninitialized bitmap, called from Create()s above
|
||||
bool DoCreate(int w, int h, int depth, WXHDC hdc);
|
||||
@ -295,14 +295,14 @@ public:
|
||||
virtual bool Create(wxGDIImage *image,
|
||||
const void* data,
|
||||
wxBitmapType type,
|
||||
int width, int height, int depth = 1);
|
||||
int width, int height, int depth = 1) wxOVERRIDE;
|
||||
virtual bool Load(wxGDIImage *image,
|
||||
const wxString& name,
|
||||
wxBitmapType type,
|
||||
int desiredWidth, int desiredHeight);
|
||||
int desiredWidth, int desiredHeight) wxOVERRIDE;
|
||||
virtual bool Save(const wxGDIImage *image,
|
||||
const wxString& name,
|
||||
wxBitmapType type) const;
|
||||
wxBitmapType type) const wxOVERRIDE;
|
||||
|
||||
|
||||
// make wxBitmapHandler compatible with the wxBitmapHandler interface
|
||||
|
||||
@ -82,9 +82,9 @@ public:
|
||||
virtual ~wxBitmapComboBox();
|
||||
|
||||
// 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.
|
||||
int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap);
|
||||
@ -101,25 +101,25 @@ public:
|
||||
|
||||
protected:
|
||||
|
||||
WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
||||
virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
|
||||
virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
|
||||
WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
|
||||
virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item) wxOVERRIDE;
|
||||
virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item) wxOVERRIDE;
|
||||
|
||||
// Event handlers
|
||||
void OnSize(wxSizeEvent& event);
|
||||
|
||||
virtual wxItemContainer* GetItemContainer() { return this; }
|
||||
virtual wxWindow* GetControl() { return this; }
|
||||
virtual wxItemContainer* GetItemContainer() wxOVERRIDE { return this; }
|
||||
virtual wxWindow* GetControl() wxOVERRIDE { return this; }
|
||||
|
||||
// wxItemContainer implementation
|
||||
virtual int DoInsertItems(const wxArrayStringsAdapter & items,
|
||||
unsigned int pos,
|
||||
void **clientData, wxClientDataType type);
|
||||
virtual void DoClear();
|
||||
virtual void DoDeleteOneItem(unsigned int n);
|
||||
void **clientData, wxClientDataType type) wxOVERRIDE;
|
||||
virtual void DoClear() wxOVERRIDE;
|
||||
virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
|
||||
|
||||
virtual bool OnAddBitmap(const wxBitmap& bitmap);
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual bool OnAddBitmap(const wxBitmap& bitmap) wxOVERRIDE;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
void RecreateControl();
|
||||
|
||||
private:
|
||||
|
||||
@ -27,17 +27,17 @@ public:
|
||||
wxBrush(const wxBitmap& stipple);
|
||||
virtual ~wxBrush();
|
||||
|
||||
virtual void SetColour(const wxColour& col);
|
||||
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b);
|
||||
virtual void SetStyle(wxBrushStyle style);
|
||||
virtual void SetStipple(const wxBitmap& stipple);
|
||||
virtual void SetColour(const wxColour& col) wxOVERRIDE;
|
||||
virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE;
|
||||
virtual void SetStyle(wxBrushStyle style) wxOVERRIDE;
|
||||
virtual void SetStipple(const wxBitmap& stipple) wxOVERRIDE;
|
||||
|
||||
bool operator==(const wxBrush& brush) const;
|
||||
bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
|
||||
|
||||
wxColour GetColour() const;
|
||||
wxBrushStyle GetStyle() const;
|
||||
wxBitmap *GetStipple() const;
|
||||
wxColour GetColour() const wxOVERRIDE;
|
||||
wxBrushStyle GetStyle() const wxOVERRIDE;
|
||||
wxBitmap *GetStipple() const wxOVERRIDE;
|
||||
|
||||
|
||||
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
|
||||
@ -47,11 +47,11 @@ public:
|
||||
void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
|
||||
|
||||
// return the HBRUSH for this brush
|
||||
virtual WXHANDLE GetResourceHandle() const;
|
||||
virtual WXHANDLE GetResourceHandle() const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
virtual wxGDIRefData *CreateGDIRefData() const;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
||||
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS(wxBrush);
|
||||
|
||||
@ -44,14 +44,14 @@ public:
|
||||
|
||||
virtual ~wxButton();
|
||||
|
||||
virtual wxWindow *SetDefault();
|
||||
virtual wxWindow *SetDefault() wxOVERRIDE;
|
||||
|
||||
// implementation from now on
|
||||
virtual void Command(wxCommandEvent& event);
|
||||
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id);
|
||||
virtual void Command(wxCommandEvent& event) wxOVERRIDE;
|
||||
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
|
||||
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:
|
||||
// send a notification event, return true if processed
|
||||
@ -64,8 +64,8 @@ protected:
|
||||
// set or unset BS_DEFPUSHBUTTON style
|
||||
static void SetDefaultStyle(wxButton *btn, bool on);
|
||||
|
||||
virtual bool DoGetAuthNeeded() const;
|
||||
virtual void DoSetAuthNeeded(bool show);
|
||||
virtual bool DoGetAuthNeeded() const wxOVERRIDE;
|
||||
virtual void DoSetAuthNeeded(bool show) wxOVERRIDE;
|
||||
|
||||
// true if the UAC symbol is shown
|
||||
bool m_authNeeded;
|
||||
|
||||
@ -34,30 +34,30 @@ public:
|
||||
long style = wxCAL_SHOW_HOLIDAYS,
|
||||
const wxString& name = wxCalendarNameStr);
|
||||
|
||||
virtual bool SetDate(const wxDateTime& date);
|
||||
virtual wxDateTime GetDate() const;
|
||||
virtual bool SetDate(const wxDateTime& date) wxOVERRIDE;
|
||||
virtual wxDateTime GetDate() const wxOVERRIDE;
|
||||
|
||||
virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime,
|
||||
const wxDateTime& upperdate = wxDefaultDateTime);
|
||||
virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const;
|
||||
const wxDateTime& upperdate = wxDefaultDateTime) wxOVERRIDE;
|
||||
virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const wxOVERRIDE;
|
||||
|
||||
virtual bool EnableMonthChange(bool enable = true);
|
||||
virtual bool EnableMonthChange(bool enable = true) wxOVERRIDE;
|
||||
|
||||
virtual void Mark(size_t day, bool mark);
|
||||
virtual void SetHoliday(size_t day);
|
||||
virtual void Mark(size_t day, bool mark) wxOVERRIDE;
|
||||
virtual void SetHoliday(size_t day) wxOVERRIDE;
|
||||
|
||||
virtual wxCalendarHitTestResult HitTest(const wxPoint& pos,
|
||||
wxDateTime *date = NULL,
|
||||
wxDateTime::WeekDay *wd = NULL);
|
||||
wxDateTime::WeekDay *wd = NULL) wxOVERRIDE;
|
||||
|
||||
virtual void SetWindowStyleFlag(long style);
|
||||
virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
|
||||
|
||||
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 MSWOnDoubleClick(wxMouseEvent& event);
|
||||
@ -73,10 +73,10 @@ private:
|
||||
void UpdateFirstDayOfWeek();
|
||||
|
||||
// reset holiday information
|
||||
virtual void ResetHolidayAttrs() { m_holidays = 0; }
|
||||
virtual void ResetHolidayAttrs() wxOVERRIDE { m_holidays = 0; }
|
||||
|
||||
// redisplay holidays
|
||||
virtual void RefreshHolidays() { UpdateMarks(); }
|
||||
virtual void RefreshHolidays() wxOVERRIDE { UpdateMarks(); }
|
||||
|
||||
|
||||
// current date, we need to store it instead of simply retrieving it from
|
||||
|
||||
@ -32,8 +32,8 @@ public:
|
||||
}
|
||||
|
||||
// process wxWindow notifications
|
||||
virtual void OnSetFocus();
|
||||
virtual void OnKillFocus();
|
||||
virtual void OnSetFocus() wxOVERRIDE;
|
||||
virtual void OnKillFocus() wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
void Init()
|
||||
@ -44,10 +44,10 @@ protected:
|
||||
}
|
||||
|
||||
// override base class virtuals
|
||||
virtual void DoMove();
|
||||
virtual void DoShow();
|
||||
virtual void DoHide();
|
||||
virtual void DoSize();
|
||||
virtual void DoMove() wxOVERRIDE;
|
||||
virtual void DoShow() wxOVERRIDE;
|
||||
virtual void DoHide() wxOVERRIDE;
|
||||
virtual void DoSize() wxOVERRIDE;
|
||||
|
||||
// helper function which creates the system caret
|
||||
bool MSWCreateCaret();
|
||||
|
||||
@ -39,26 +39,26 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxCheckBoxNameStr);
|
||||
|
||||
virtual void SetValue(bool value);
|
||||
virtual bool GetValue() const;
|
||||
virtual void SetValue(bool value) wxOVERRIDE;
|
||||
virtual bool GetValue() const wxOVERRIDE;
|
||||
|
||||
// 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 void Command(wxCommandEvent& event);
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
|
||||
virtual void Command(wxCommandEvent& event) wxOVERRIDE;
|
||||
|
||||
// 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
|
||||
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
|
||||
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestClientSize() const;
|
||||
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
|
||||
|
||||
virtual void DoSet3StateValue(wxCheckBoxState value);
|
||||
virtual wxCheckBoxState DoGet3StateValue() const;
|
||||
virtual void DoSet3StateValue(wxCheckBoxState value) wxOVERRIDE;
|
||||
virtual wxCheckBoxState DoGet3StateValue() const wxOVERRIDE;
|
||||
|
||||
// Implement wxMSWOwnerDrawnButtonBase methods.
|
||||
virtual int MSWGetButtonStyle() const wxOVERRIDE;
|
||||
|
||||
@ -55,14 +55,14 @@ public:
|
||||
const wxString& name = wxListBoxNameStr);
|
||||
|
||||
// items may be checked
|
||||
virtual bool IsChecked(unsigned int uiIndex) const;
|
||||
virtual void Check(unsigned int uiIndex, bool bCheck = true);
|
||||
virtual bool IsChecked(unsigned int uiIndex) const wxOVERRIDE;
|
||||
virtual void Check(unsigned int uiIndex, bool bCheck = true) wxOVERRIDE;
|
||||
virtual void Toggle(unsigned int uiIndex);
|
||||
|
||||
// we create our items ourselves and they have non-standard size,
|
||||
// so we need to override these functions
|
||||
virtual wxOwnerDrawn *CreateLboxItem(size_t n);
|
||||
virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
|
||||
virtual wxOwnerDrawn *CreateLboxItem(size_t n) wxOVERRIDE;
|
||||
virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
// pressing space or clicking the check box toggles the item
|
||||
@ -79,7 +79,7 @@ protected:
|
||||
ProcessCommand(event);
|
||||
}
|
||||
|
||||
wxSize DoGetBestClientSize() const;
|
||||
wxSize DoGetBestClientSize() const wxOVERRIDE;
|
||||
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckListBox);
|
||||
|
||||
@ -67,20 +67,20 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
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 int GetSelection() const;
|
||||
virtual int GetCurrentSelection() const;
|
||||
virtual void SetSelection(int n);
|
||||
virtual unsigned int GetCount() const wxOVERRIDE;
|
||||
virtual int GetSelection() const wxOVERRIDE;
|
||||
virtual int GetCurrentSelection() const wxOVERRIDE;
|
||||
virtual void SetSelection(int n) wxOVERRIDE;
|
||||
|
||||
virtual int FindString(const wxString& s, bool bCase = false) const;
|
||||
virtual wxString GetString(unsigned int n) const;
|
||||
virtual void SetString(unsigned int n, const wxString& s);
|
||||
virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE;
|
||||
virtual wxString GetString(unsigned int n) const wxOVERRIDE;
|
||||
virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
|
||||
|
||||
virtual wxVisualAttributes GetDefaultAttributes() const
|
||||
virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
|
||||
{
|
||||
return GetClassDefaultAttributes(GetWindowVariant());
|
||||
}
|
||||
@ -89,18 +89,18 @@ public:
|
||||
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
|
||||
|
||||
// MSW only
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id);
|
||||
WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
||||
virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd);
|
||||
virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg);
|
||||
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
|
||||
WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
|
||||
virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd) wxOVERRIDE;
|
||||
virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg) wxOVERRIDE;
|
||||
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
|
||||
|
||||
// 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:
|
||||
// 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
|
||||
void Init()
|
||||
@ -110,24 +110,24 @@ protected:
|
||||
m_heightOwn = wxDefaultCoord;
|
||||
}
|
||||
|
||||
virtual void DoDeleteOneItem(unsigned int n);
|
||||
virtual void DoClear();
|
||||
virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
|
||||
virtual void DoClear() wxOVERRIDE;
|
||||
|
||||
virtual int DoInsertItems(const wxArrayStringsAdapter& items,
|
||||
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 DoSetItemClientData(unsigned int n, void* clientData);
|
||||
virtual void* DoGetItemClientData(unsigned int n) const;
|
||||
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
|
||||
virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE;
|
||||
virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE;
|
||||
|
||||
// MSW implementation
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual void DoGetSize(int *w, int *h) const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
virtual void DoGetSize(int *w, int *h) const wxOVERRIDE;
|
||||
virtual void DoSetSize(int x, int y,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
|
||||
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
|
||||
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE;
|
||||
|
||||
// Show or hide the popup part of the control.
|
||||
void MSWDoPopupOrDismiss(bool show);
|
||||
@ -155,7 +155,7 @@ protected:
|
||||
int SetHeightSimpleComboBox(int nItems) const;
|
||||
|
||||
#if wxUSE_DEFERRED_SIZING
|
||||
virtual void MSWEndDeferWindowPos();
|
||||
virtual void MSWEndDeferWindowPos() wxOVERRIDE;
|
||||
#endif // wxUSE_DEFERRED_SIZING
|
||||
|
||||
// These variables are only used while the drop down is opened.
|
||||
|
||||
@ -49,33 +49,33 @@ public:
|
||||
virtual ~wxClipboard();
|
||||
|
||||
// open the clipboard before SetData() and GetData()
|
||||
virtual bool Open();
|
||||
virtual bool Open() wxOVERRIDE;
|
||||
|
||||
// close the clipboard after SetData() and GetData()
|
||||
virtual void Close();
|
||||
virtual void Close() wxOVERRIDE;
|
||||
|
||||
// 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.
|
||||
virtual bool SetData( wxDataObject *data );
|
||||
virtual bool SetData( wxDataObject *data ) wxOVERRIDE;
|
||||
|
||||
// add to the clipboard data.
|
||||
virtual bool AddData( wxDataObject *data );
|
||||
virtual bool AddData( wxDataObject *data ) wxOVERRIDE;
|
||||
|
||||
// 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)
|
||||
virtual bool GetData( wxDataObject& data );
|
||||
virtual bool GetData( wxDataObject& data ) wxOVERRIDE;
|
||||
|
||||
// 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
|
||||
// clipboard will stay available even after the application exits (possibly
|
||||
// eating memory), otherwise the clipboard will be emptied on exit
|
||||
virtual bool Flush();
|
||||
virtual bool Flush() wxOVERRIDE;
|
||||
|
||||
private:
|
||||
IDataObject *m_lastDataObject;
|
||||
|
||||
@ -33,10 +33,10 @@ public:
|
||||
wxColourData& GetColourData() { return m_colourData; }
|
||||
|
||||
// override some base class virtuals
|
||||
virtual void SetTitle(const wxString& title);
|
||||
virtual wxString GetTitle() const;
|
||||
virtual void SetTitle(const wxString& title) wxOVERRIDE;
|
||||
virtual wxString GetTitle() const wxOVERRIDE;
|
||||
|
||||
virtual int ShowModal();
|
||||
virtual int ShowModal() wxOVERRIDE;
|
||||
|
||||
// wxMSW-specific implementation from now on
|
||||
// -----------------------------------------
|
||||
@ -48,11 +48,11 @@ protected:
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
||||
virtual void DoGetPosition( int *x, int *y ) const;
|
||||
virtual void DoGetSize(int *width, int *height) const;
|
||||
virtual void DoGetClientSize(int *width, int *height) const;
|
||||
virtual void DoMoveWindow(int x, int y, int width, int height);
|
||||
virtual void DoCentre(int dir);
|
||||
virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE;
|
||||
virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
|
||||
virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
|
||||
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
|
||||
virtual void DoCentre(int dir) wxOVERRIDE;
|
||||
|
||||
wxColourData m_colourData;
|
||||
wxString m_title;
|
||||
|
||||
@ -27,12 +27,12 @@ public:
|
||||
// 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 Green() const { return m_green; }
|
||||
unsigned char Blue() const { return m_blue; }
|
||||
unsigned char Alpha() const { return m_alpha ; }
|
||||
unsigned char Red() const wxOVERRIDE { return m_red; }
|
||||
unsigned char Green() const wxOVERRIDE { return m_green; }
|
||||
unsigned char Blue() const wxOVERRIDE { return m_blue; }
|
||||
unsigned char Alpha() const wxOVERRIDE { return m_alpha ; }
|
||||
|
||||
// comparison
|
||||
bool operator==(const wxColour& colour) const
|
||||
@ -56,7 +56,7 @@ protected:
|
||||
void Init();
|
||||
|
||||
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:
|
||||
bool m_isInit;
|
||||
|
||||
@ -64,8 +64,8 @@ public:
|
||||
|
||||
virtual ~wxComboCtrl();
|
||||
|
||||
virtual void PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const;
|
||||
virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const;
|
||||
virtual void PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const wxOVERRIDE;
|
||||
virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const wxOVERRIDE;
|
||||
|
||||
static int GetFeatures() { return wxComboCtrlFeatures::All; }
|
||||
|
||||
@ -75,23 +75,23 @@ public:
|
||||
protected:
|
||||
void DoTimerEvent();
|
||||
|
||||
virtual bool AnimateShow( const wxRect& rect, int flags );
|
||||
virtual bool AnimateShow( const wxRect& rect, int flags ) wxOVERRIDE;
|
||||
#endif // wxUSE_COMBOCTRL_POPUP_ANIMATION
|
||||
|
||||
protected:
|
||||
|
||||
// Dummy method - we override all functions that call this
|
||||
virtual WXHWND GetEditHWND() const { return NULL; }
|
||||
virtual WXHWND GetEditHWND() const wxOVERRIDE { return NULL; }
|
||||
|
||||
// customization
|
||||
virtual void OnResize();
|
||||
virtual wxCoord GetNativeTextIndent() const;
|
||||
virtual void OnResize() wxOVERRIDE;
|
||||
virtual wxCoord GetNativeTextIndent() const wxOVERRIDE;
|
||||
|
||||
// event handlers
|
||||
void OnPaintEvent( wxPaintEvent& event );
|
||||
void OnMouseEvent( wxMouseEvent& event );
|
||||
|
||||
virtual bool HasTransparentBackground() { return IsDoubleBuffered(); }
|
||||
virtual bool HasTransparentBackground() wxOVERRIDE { return IsDoubleBuffered(); }
|
||||
|
||||
private:
|
||||
void Init();
|
||||
|
||||
@ -80,27 +80,27 @@ public:
|
||||
|
||||
// resolve ambiguities among virtual functions inherited from both base
|
||||
// classes
|
||||
virtual void Clear();
|
||||
virtual wxString GetValue() const;
|
||||
virtual void SetValue(const wxString& value);
|
||||
virtual wxString GetStringSelection() const
|
||||
virtual void Clear() wxOVERRIDE;
|
||||
virtual wxString GetValue() const wxOVERRIDE;
|
||||
virtual void SetValue(const wxString& value) wxOVERRIDE;
|
||||
virtual wxString GetStringSelection() const wxOVERRIDE
|
||||
{ return wxChoice::GetStringSelection(); }
|
||||
virtual void Popup() { MSWDoPopupOrDismiss(true); }
|
||||
virtual void Dismiss() { MSWDoPopupOrDismiss(false); }
|
||||
virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
|
||||
virtual void SetSelection(long from, long to)
|
||||
virtual void SetSelection(int n) wxOVERRIDE { wxChoice::SetSelection(n); }
|
||||
virtual void SetSelection(long from, long to) wxOVERRIDE
|
||||
{ wxTextEntry::SetSelection(from, to); }
|
||||
virtual int GetSelection() const { return wxChoice::GetSelection(); }
|
||||
virtual bool ContainsHWND(WXHWND hWnd) const;
|
||||
virtual void GetSelection(long *from, long *to) const;
|
||||
virtual int GetSelection() const wxOVERRIDE { return wxChoice::GetSelection(); }
|
||||
virtual bool ContainsHWND(WXHWND hWnd) const wxOVERRIDE;
|
||||
virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
|
||||
|
||||
virtual bool IsEditable() const;
|
||||
virtual bool IsEditable() const wxOVERRIDE;
|
||||
|
||||
// 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);
|
||||
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
||||
bool MSWShouldPreProcessMessage(WXMSG *pMsg);
|
||||
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
|
||||
bool MSWShouldPreProcessMessage(WXMSG *pMsg) wxOVERRIDE;
|
||||
|
||||
// Standard event handling
|
||||
void OnCut(wxCommandEvent& event);
|
||||
@ -119,24 +119,24 @@ public:
|
||||
void OnUpdateDelete(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
|
||||
// override wxTextEntry method to work around Windows bug
|
||||
virtual bool SetHint(const wxString& hint);
|
||||
virtual bool SetHint(const wxString& hint) wxOVERRIDE;
|
||||
#endif // wxUSE_UXTHEME
|
||||
|
||||
virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
#if wxUSE_TOOLTIPS
|
||||
virtual void DoSetToolTip(wxToolTip *tip);
|
||||
virtual void DoSetToolTip(wxToolTip *tip) wxOVERRIDE;
|
||||
#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.
|
||||
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
|
||||
// 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
|
||||
WXHWND GetEditHWNDIfAvailable() const;
|
||||
|
||||
virtual void EnableTextChangedEvents(bool enable)
|
||||
virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE
|
||||
{
|
||||
m_allowTextEvents = enable;
|
||||
}
|
||||
@ -155,8 +155,8 @@ protected:
|
||||
private:
|
||||
// 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
|
||||
virtual wxWindow *GetEditableWindow();
|
||||
virtual WXHWND GetEditHWND() const;
|
||||
virtual wxWindow *GetEditableWindow() wxOVERRIDE;
|
||||
virtual WXHWND GetEditHWND() const wxOVERRIDE;
|
||||
|
||||
// common part of all ctors
|
||||
void Init()
|
||||
|
||||
@ -51,20 +51,20 @@ public:
|
||||
// -----------------------------
|
||||
|
||||
// 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'));
|
||||
}
|
||||
|
||||
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:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
|
||||
virtual bool HasNativeBitmap() const;
|
||||
virtual bool HasNativeBitmap() const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxCommandLinkButton);
|
||||
|
||||
@ -36,13 +36,13 @@ public:
|
||||
|
||||
|
||||
// Simulates an event
|
||||
virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
|
||||
virtual void Command(wxCommandEvent& event) wxOVERRIDE { ProcessCommand(event); }
|
||||
|
||||
|
||||
// implementation from now on
|
||||
// --------------------------
|
||||
|
||||
virtual wxVisualAttributes GetDefaultAttributes() const
|
||||
virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
|
||||
{
|
||||
return GetClassDefaultAttributes(GetWindowVariant());
|
||||
}
|
||||
@ -54,7 +54,7 @@ public:
|
||||
bool ProcessCommand(wxCommandEvent& event);
|
||||
|
||||
// MSW-specific
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
|
||||
|
||||
// For ownerdraw items
|
||||
virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return false; }
|
||||
@ -67,14 +67,14 @@ public:
|
||||
virtual WXHBRUSH MSWControlColor(WXHDC pDC, WXHWND hWnd);
|
||||
|
||||
// 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:
|
||||
// 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)
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
|
||||
// create the control of the given Windows class: this is typically called
|
||||
// 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);
|
||||
|
||||
// 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
|
||||
|
||||
@ -39,7 +39,7 @@ public:
|
||||
protected:
|
||||
void InitFromStock(wxStockCursor);
|
||||
|
||||
virtual wxGDIImageRefData *CreateData() const;
|
||||
virtual wxGDIImageRefData *CreateData() const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS(wxCursor);
|
||||
|
||||
@ -43,22 +43,22 @@ public:
|
||||
const wxString& name = wxDatePickerCtrlNameStr);
|
||||
|
||||
// Override this one to add date-specific (and time-ignoring) checks.
|
||||
virtual void SetValue(const wxDateTime& dt);
|
||||
virtual wxDateTime GetValue() const;
|
||||
virtual void SetValue(const wxDateTime& dt) wxOVERRIDE;
|
||||
virtual wxDateTime GetValue() const wxOVERRIDE;
|
||||
|
||||
// Implement the base class pure virtuals.
|
||||
virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2);
|
||||
virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const;
|
||||
virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) wxOVERRIDE;
|
||||
virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const wxOVERRIDE;
|
||||
|
||||
// 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:
|
||||
#if wxUSE_INTL
|
||||
virtual wxLocaleInfo MSWGetFormat() const;
|
||||
virtual wxLocaleInfo MSWGetFormat() const wxOVERRIDE;
|
||||
#endif // wxUSE_INTL
|
||||
virtual bool MSWAllowsNone() const { return HasFlag(wxDP_ALLOWNONE); }
|
||||
virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch);
|
||||
virtual bool MSWAllowsNone() const wxOVERRIDE { return HasFlag(wxDP_ALLOWNONE); }
|
||||
virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxDateTime MSWGetControlValue() const;
|
||||
|
||||
@ -23,17 +23,17 @@ class WXDLLIMPEXP_ADV wxDateTimePickerCtrl : public wxDateTimePickerCtrlBase
|
||||
{
|
||||
public:
|
||||
// set/get the date
|
||||
virtual void SetValue(const wxDateTime& dt);
|
||||
virtual wxDateTime GetValue() const;
|
||||
virtual void SetValue(const wxDateTime& dt) wxOVERRIDE;
|
||||
virtual wxDateTime GetValue() const wxOVERRIDE;
|
||||
|
||||
// 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:
|
||||
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
|
||||
// Helper for the derived classes Create(): creates a native control with
|
||||
// the specified attributes.
|
||||
|
||||
@ -51,49 +51,49 @@ public:
|
||||
// implement base class pure virtuals
|
||||
// ----------------------------------
|
||||
|
||||
virtual void Clear();
|
||||
virtual void Clear() wxOVERRIDE;
|
||||
|
||||
virtual bool StartDoc(const wxString& message);
|
||||
virtual void EndDoc();
|
||||
virtual bool StartDoc(const wxString& message) wxOVERRIDE;
|
||||
virtual void EndDoc() wxOVERRIDE;
|
||||
|
||||
virtual void StartPage();
|
||||
virtual void EndPage();
|
||||
virtual void StartPage() wxOVERRIDE;
|
||||
virtual void EndPage() wxOVERRIDE;
|
||||
|
||||
virtual void SetFont(const wxFont& font);
|
||||
virtual void SetPen(const wxPen& pen);
|
||||
virtual void SetBrush(const wxBrush& brush);
|
||||
virtual void SetBackground(const wxBrush& brush);
|
||||
virtual void SetBackgroundMode(int mode);
|
||||
virtual void SetFont(const wxFont& font) wxOVERRIDE;
|
||||
virtual void SetPen(const wxPen& pen) wxOVERRIDE;
|
||||
virtual void SetBrush(const wxBrush& brush) wxOVERRIDE;
|
||||
virtual void SetBackground(const wxBrush& brush) wxOVERRIDE;
|
||||
virtual void SetBackgroundMode(int mode) wxOVERRIDE;
|
||||
#if wxUSE_PALETTE
|
||||
virtual void SetPalette(const wxPalette& palette);
|
||||
virtual void SetPalette(const wxPalette& palette) wxOVERRIDE;
|
||||
#endif // wxUSE_PALETTE
|
||||
|
||||
virtual void DestroyClippingRegion();
|
||||
virtual void DestroyClippingRegion() wxOVERRIDE;
|
||||
|
||||
virtual wxCoord GetCharHeight() const;
|
||||
virtual wxCoord GetCharWidth() const;
|
||||
virtual wxCoord GetCharHeight() const wxOVERRIDE;
|
||||
virtual wxCoord GetCharWidth() const wxOVERRIDE;
|
||||
|
||||
virtual bool CanDrawBitmap() const;
|
||||
virtual bool CanGetTextExtent() const;
|
||||
virtual int GetDepth() const;
|
||||
virtual wxSize GetPPI() const;
|
||||
virtual bool CanDrawBitmap() const wxOVERRIDE;
|
||||
virtual bool CanGetTextExtent() const wxOVERRIDE;
|
||||
virtual int GetDepth() const wxOVERRIDE;
|
||||
virtual wxSize GetPPI() const wxOVERRIDE;
|
||||
|
||||
|
||||
virtual void SetMapMode(wxMappingMode mode);
|
||||
virtual void SetUserScale(double x, double y);
|
||||
virtual void SetLogicalScale(double x, double y);
|
||||
virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
|
||||
virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
|
||||
virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
|
||||
virtual void SetMapMode(wxMappingMode mode) wxOVERRIDE;
|
||||
virtual void SetUserScale(double x, double y) wxOVERRIDE;
|
||||
virtual void SetLogicalScale(double x, double y) wxOVERRIDE;
|
||||
virtual void SetLogicalOrigin(wxCoord x, wxCoord y) wxOVERRIDE;
|
||||
virtual void SetDeviceOrigin(wxCoord x, wxCoord y) wxOVERRIDE;
|
||||
virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_DC_TRANSFORM_MATRIX
|
||||
virtual bool CanUseTransformMatrix() const;
|
||||
virtual bool SetTransformMatrix(const wxAffineMatrix2D& matrix);
|
||||
virtual wxAffineMatrix2D GetTransformMatrix() const;
|
||||
virtual void ResetTransformMatrix();
|
||||
virtual bool CanUseTransformMatrix() const wxOVERRIDE;
|
||||
virtual bool SetTransformMatrix(const wxAffineMatrix2D& matrix) wxOVERRIDE;
|
||||
virtual wxAffineMatrix2D GetTransformMatrix() const wxOVERRIDE;
|
||||
virtual void ResetTransformMatrix() wxOVERRIDE;
|
||||
#endif // wxUSE_DC_TRANSFORM_MATRIX
|
||||
|
||||
virtual void SetLogicalFunction(wxRasterOperationMode function);
|
||||
virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE;
|
||||
|
||||
// implementation from now on
|
||||
// --------------------------
|
||||
@ -124,10 +124,10 @@ public:
|
||||
m_isClipBoxValid = false;
|
||||
}
|
||||
|
||||
void* GetHandle() const { return (void*)GetHDC(); }
|
||||
void* GetHandle() const wxOVERRIDE { return (void*)GetHDC(); }
|
||||
|
||||
const wxBitmap& GetSelectedBitmap() const { return m_selectedBitmap; }
|
||||
wxBitmap& GetSelectedBitmap() { return m_selectedBitmap; }
|
||||
const wxBitmap& GetSelectedBitmap() const wxOVERRIDE { return m_selectedBitmap; }
|
||||
wxBitmap& GetSelectedBitmap() wxOVERRIDE { return m_selectedBitmap; }
|
||||
|
||||
// update the internal clip box variables
|
||||
void UpdateClipBox();
|
||||
@ -146,8 +146,8 @@ public:
|
||||
|
||||
// get or change the layout direction (LTR or RTL) for this dc,
|
||||
// wxLayout_Default is returned if layout direction is not supported
|
||||
virtual wxLayoutDirection GetLayoutDirection() const;
|
||||
virtual void SetLayoutDirection(wxLayoutDirection dir);
|
||||
virtual wxLayoutDirection GetLayoutDirection() const wxOVERRIDE;
|
||||
virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
void Init()
|
||||
@ -178,59 +178,59 @@ public:
|
||||
int *descent,
|
||||
int *internalLeading,
|
||||
int *externalLeading,
|
||||
int *averageWidth) const;
|
||||
int *averageWidth) const wxOVERRIDE;
|
||||
virtual void DoGetTextExtent(const wxString& string,
|
||||
wxCoord *x, wxCoord *y,
|
||||
wxCoord *descent = NULL,
|
||||
wxCoord *externalLeading = NULL,
|
||||
const wxFont *theFont = NULL) const;
|
||||
virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
|
||||
const wxFont *theFont = NULL) const wxOVERRIDE;
|
||||
virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const wxOVERRIDE;
|
||||
|
||||
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,
|
||||
const wxColour& initialColour,
|
||||
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 DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
|
||||
virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE;
|
||||
virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE;
|
||||
|
||||
virtual void DoDrawArc(wxCoord x1, wxCoord y1,
|
||||
wxCoord x2, wxCoord y2,
|
||||
wxCoord xc, wxCoord yc);
|
||||
wxCoord xc, wxCoord yc) wxOVERRIDE;
|
||||
virtual void 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,
|
||||
double sa, double ea);
|
||||
double sa, double ea) wxOVERRIDE;
|
||||
|
||||
virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
|
||||
virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
|
||||
virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
|
||||
wxCoord width, wxCoord height,
|
||||
double radius);
|
||||
virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
|
||||
double radius) wxOVERRIDE;
|
||||
virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_SPLINES
|
||||
virtual void DoDrawSpline(const wxPointList *points);
|
||||
virtual void DoDrawSpline(const wxPointList *points) wxOVERRIDE;
|
||||
#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,
|
||||
bool useMask = false);
|
||||
bool useMask = false) wxOVERRIDE;
|
||||
|
||||
virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
|
||||
virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE;
|
||||
virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
|
||||
double angle);
|
||||
double angle) wxOVERRIDE;
|
||||
|
||||
virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
|
||||
wxDC *source, wxCoord xsrc, wxCoord ysrc,
|
||||
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,
|
||||
wxCoord dstWidth, wxCoord dstHeight,
|
||||
@ -238,25 +238,25 @@ public:
|
||||
wxCoord xsrc, wxCoord ysrc,
|
||||
wxCoord srcWidth, wxCoord srcHeight,
|
||||
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,
|
||||
wxCoord width, wxCoord height);
|
||||
virtual void DoSetDeviceClippingRegion(const wxRegion& region);
|
||||
wxCoord width, wxCoord height) wxOVERRIDE;
|
||||
virtual void DoSetDeviceClippingRegion(const wxRegion& region) wxOVERRIDE;
|
||||
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[],
|
||||
wxCoord xoffset, wxCoord yoffset);
|
||||
wxCoord xoffset, wxCoord yoffset) wxOVERRIDE;
|
||||
virtual void DoDrawPolygon(int n, const wxPoint points[],
|
||||
wxCoord xoffset, wxCoord yoffset,
|
||||
wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
|
||||
wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE;
|
||||
virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[],
|
||||
wxCoord xoffset, wxCoord yoffset,
|
||||
wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
|
||||
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
|
||||
wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE;
|
||||
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE
|
||||
{
|
||||
return subrect == NULL ? GetSelectedBitmap()
|
||||
: GetSelectedBitmap().GetSubBitmap(*subrect);
|
||||
@ -351,7 +351,7 @@ public:
|
||||
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(),
|
||||
wxT("size of this DC hadn't been set and is unknown") );
|
||||
|
||||
@ -34,7 +34,7 @@ public:
|
||||
// Create a DC corresponding to the whole window
|
||||
wxWindowDCImpl( wxDC *owner, wxWindow *win );
|
||||
|
||||
virtual void DoGetSize(int *width, int *height) const;
|
||||
virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
// initialize the newly created DC
|
||||
@ -55,7 +55,7 @@ public:
|
||||
|
||||
virtual ~wxClientDCImpl();
|
||||
|
||||
virtual void DoGetSize(int *width, int *height) const;
|
||||
virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
void InitDC();
|
||||
|
||||
@ -22,11 +22,11 @@ public:
|
||||
wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); // Create compatible DC
|
||||
|
||||
// override some base class virtuals
|
||||
virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
|
||||
virtual void DoGetSize(int* width, int* height) const;
|
||||
virtual void DoSelect(const wxBitmap& bitmap);
|
||||
virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
|
||||
virtual void DoGetSize(int* width, int* height) const wxOVERRIDE;
|
||||
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() );}
|
||||
|
||||
protected:
|
||||
|
||||
@ -29,22 +29,22 @@ public:
|
||||
wxPrinterDCImpl( wxPrinterDC *owner, WXHDC theDC );
|
||||
|
||||
// override some base class virtuals
|
||||
virtual bool StartDoc(const wxString& message);
|
||||
virtual void EndDoc();
|
||||
virtual void StartPage();
|
||||
virtual void EndPage();
|
||||
virtual bool StartDoc(const wxString& message) wxOVERRIDE;
|
||||
virtual void EndDoc() wxOVERRIDE;
|
||||
virtual void StartPage() wxOVERRIDE;
|
||||
virtual void EndPage() wxOVERRIDE;
|
||||
|
||||
virtual wxRect GetPaperRect() const;
|
||||
virtual wxRect GetPaperRect() const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
|
||||
bool useMask = false);
|
||||
bool useMask = false) wxOVERRIDE;
|
||||
virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
|
||||
wxCoord width, wxCoord height,
|
||||
wxDC *source, wxCoord xsrc, wxCoord ysrc,
|
||||
wxRasterOperationMode rop = wxCOPY, bool useMask = false,
|
||||
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
|
||||
virtual void DoGetSize(int *w, int *h) const
|
||||
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE;
|
||||
virtual void DoGetSize(int *w, int *h) const wxOVERRIDE
|
||||
{
|
||||
GetDeviceSize(w, h);
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@ public:
|
||||
wxScreenDCImpl( wxScreenDC *owner );
|
||||
|
||||
// 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_NO_COPY_CLASS(wxScreenDCImpl);
|
||||
|
||||
@ -50,17 +50,17 @@ public:
|
||||
// implement base class pure virtual methods
|
||||
virtual const void *Request(const wxString& item,
|
||||
size_t *size = NULL,
|
||||
wxIPCFormat format = wxIPC_TEXT);
|
||||
virtual bool StartAdvise(const wxString& item);
|
||||
virtual bool StopAdvise(const wxString& item);
|
||||
virtual bool Disconnect();
|
||||
wxIPCFormat format = wxIPC_TEXT) wxOVERRIDE;
|
||||
virtual bool StartAdvise(const wxString& item) wxOVERRIDE;
|
||||
virtual bool StopAdvise(const wxString& item) wxOVERRIDE;
|
||||
virtual bool Disconnect() wxOVERRIDE;
|
||||
|
||||
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,
|
||||
wxIPCFormat format);
|
||||
wxIPCFormat format) wxOVERRIDE;
|
||||
virtual bool DoAdvise(const wxString& item, const void *data, size_t size,
|
||||
wxIPCFormat format);
|
||||
wxIPCFormat format) wxOVERRIDE;
|
||||
|
||||
public:
|
||||
wxString m_topicName;
|
||||
@ -80,10 +80,10 @@ class WXDLLIMPEXP_BASE wxDDEServer : public wxServerBase
|
||||
{
|
||||
public:
|
||||
wxDDEServer();
|
||||
bool Create(const wxString& server_name);
|
||||
bool Create(const wxString& server_name) wxOVERRIDE;
|
||||
virtual ~wxDDEServer();
|
||||
|
||||
virtual wxConnectionBase *OnAcceptConnection(const wxString& topic);
|
||||
virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE;
|
||||
|
||||
// Find/delete wxDDEConnection corresponding to the HCONV
|
||||
wxDDEConnection *FindConnection(WXHCONV conv);
|
||||
@ -107,15 +107,15 @@ public:
|
||||
wxDDEClient();
|
||||
virtual ~wxDDEClient();
|
||||
|
||||
bool ValidHost(const wxString& host);
|
||||
bool ValidHost(const wxString& host) wxOVERRIDE;
|
||||
|
||||
// Call this to make a connection. Returns NULL if cannot.
|
||||
virtual wxConnectionBase *MakeConnection(const wxString& host,
|
||||
const wxString& server,
|
||||
const wxString& topic);
|
||||
const wxString& topic) wxOVERRIDE;
|
||||
|
||||
// Tailor this to return own connection.
|
||||
virtual wxConnectionBase *OnMakeConnection();
|
||||
virtual wxConnectionBase *OnMakeConnection() wxOVERRIDE;
|
||||
|
||||
// Find/delete wxDDEConnection corresponding to the HCONV
|
||||
wxDDEConnection *FindConnection(WXHCONV conv);
|
||||
|
||||
@ -46,24 +46,24 @@ public:
|
||||
virtual ~wxDialog();
|
||||
|
||||
// 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()
|
||||
virtual int ShowModal();
|
||||
virtual int ShowModal() wxOVERRIDE;
|
||||
|
||||
// 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
|
||||
// -------------------------------
|
||||
|
||||
// override some base class virtuals
|
||||
virtual bool Show(bool show = true);
|
||||
virtual void SetWindowStyleFlag(long style);
|
||||
virtual bool Show(bool show = true) wxOVERRIDE;
|
||||
virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
|
||||
|
||||
// Windows callbacks
|
||||
WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
|
||||
WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
// common part of all ctors
|
||||
|
||||
@ -22,9 +22,9 @@ public:
|
||||
const wxSize& size = wxDefaultSize,
|
||||
const wxString& name = wxDirDialogNameStr);
|
||||
|
||||
void SetPath(const wxString& path);
|
||||
void SetPath(const wxString& path) wxOVERRIDE;
|
||||
|
||||
virtual int ShowModal();
|
||||
virtual int ShowModal() wxOVERRIDE;
|
||||
|
||||
private:
|
||||
// The real implementations of ShowModal(), used for Windows versions
|
||||
|
||||
@ -39,7 +39,7 @@ public:
|
||||
bool Play(wxDC *dc, wxRect *rectBound = NULL);
|
||||
|
||||
// accessors
|
||||
virtual bool IsOk() const { return m_hMF != 0; }
|
||||
virtual bool IsOk() const wxOVERRIDE { return m_hMF != 0; }
|
||||
|
||||
wxSize GetSize() const;
|
||||
int GetWidth() const { return GetSize().x; }
|
||||
@ -71,8 +71,8 @@ protected:
|
||||
|
||||
// we don't use these functions (but probably should) but have to implement
|
||||
// them as they're pure virtual in the base class
|
||||
virtual wxGDIRefData *CreateGDIRefData() const;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
||||
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxString m_filename;
|
||||
@ -133,13 +133,13 @@ public:
|
||||
{ return m_metafile; }
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual wxDataFormat GetPreferredFormat(Direction dir) const;
|
||||
virtual size_t GetFormatCount(Direction dir) const;
|
||||
virtual void GetAllFormats(wxDataFormat *formats, Direction dir) const;
|
||||
virtual size_t GetDataSize(const wxDataFormat& format) const;
|
||||
virtual bool GetDataHere(const wxDataFormat& format, void *buf) const;
|
||||
virtual wxDataFormat GetPreferredFormat(Direction dir) const wxOVERRIDE;
|
||||
virtual size_t GetFormatCount(Direction dir) const wxOVERRIDE;
|
||||
virtual void GetAllFormats(wxDataFormat *formats, Direction dir) const wxOVERRIDE;
|
||||
virtual size_t GetDataSize(const wxDataFormat& format) const wxOVERRIDE;
|
||||
virtual bool GetDataHere(const wxDataFormat& format, void *buf) const wxOVERRIDE;
|
||||
virtual bool SetData(const wxDataFormat& format, size_t len,
|
||||
const void *buf);
|
||||
const void *buf) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
wxEnhMetaFile m_metafile;
|
||||
@ -171,17 +171,17 @@ public:
|
||||
{ return m_metafile; }
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual size_t GetDataSize() const;
|
||||
virtual bool GetDataHere(void *buf) const;
|
||||
virtual bool SetData(size_t len, const void *buf);
|
||||
virtual size_t GetDataSize() const wxOVERRIDE;
|
||||
virtual bool GetDataHere(void *buf) const wxOVERRIDE;
|
||||
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(); }
|
||||
virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
|
||||
void *buf) const
|
||||
void *buf) const wxOVERRIDE
|
||||
{ return GetDataHere(buf); }
|
||||
virtual bool SetData(const wxDataFormat& WXUNUSED(format),
|
||||
size_t len, const void *buf)
|
||||
size_t len, const void *buf) wxOVERRIDE
|
||||
{ return SetData(len, buf); }
|
||||
|
||||
protected:
|
||||
|
||||
@ -51,13 +51,13 @@ public:
|
||||
}
|
||||
|
||||
// override/implement base class virtuals
|
||||
virtual bool Dispatch();
|
||||
virtual int DispatchTimeout(unsigned long timeout);
|
||||
virtual void WakeUp();
|
||||
virtual bool Dispatch() wxOVERRIDE;
|
||||
virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE;
|
||||
virtual void WakeUp() wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
virtual void OnNextIteration();
|
||||
virtual void DoYieldFor(long eventsToProcess);
|
||||
virtual void OnNextIteration() wxOVERRIDE;
|
||||
virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
// check if the given window is a child of ms_winCritical (which must be
|
||||
|
||||
@ -17,7 +17,7 @@ public:
|
||||
wxMSWEventLoopBase();
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual bool Pending() const;
|
||||
virtual bool Pending() const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
// get the next message from queue and return true or return false if we
|
||||
@ -37,15 +37,15 @@ public:
|
||||
wxConsoleEventLoop() { }
|
||||
|
||||
// override/implement base class virtuals
|
||||
virtual bool Dispatch();
|
||||
virtual int DispatchTimeout(unsigned long timeout);
|
||||
virtual void WakeUp();
|
||||
virtual bool Dispatch() wxOVERRIDE;
|
||||
virtual int DispatchTimeout(unsigned long timeout) wxOVERRIDE;
|
||||
virtual void WakeUp() wxOVERRIDE;
|
||||
|
||||
// Windows-specific function to process a single message
|
||||
virtual void ProcessMessage(WXMSG *msg);
|
||||
|
||||
protected:
|
||||
virtual void DoYieldFor(long eventsToProcess);
|
||||
virtual void DoYieldFor(long eventsToProcess) wxOVERRIDE;
|
||||
};
|
||||
|
||||
#endif // wxUSE_CONSOLE_EVENTLOOP
|
||||
|
||||
@ -37,16 +37,16 @@ public:
|
||||
wxFindReplaceDialogImpl *GetImpl() const { return m_impl; }
|
||||
|
||||
// override some base class virtuals
|
||||
virtual bool Show(bool show = true);
|
||||
virtual void SetTitle( const wxString& title);
|
||||
virtual wxString GetTitle() const;
|
||||
virtual bool Show(bool show = true) wxOVERRIDE;
|
||||
virtual void SetTitle( const wxString& title) wxOVERRIDE;
|
||||
virtual wxString GetTitle() const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
virtual void DoGetSize(int *width, int *height) const;
|
||||
virtual void DoGetClientSize(int *width, int *height) const;
|
||||
virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
|
||||
virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
|
||||
virtual void DoSetSize(int x, int y,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
|
||||
|
||||
void Init();
|
||||
|
||||
|
||||
@ -28,12 +28,12 @@ public:
|
||||
const wxSize& sz = wxDefaultSize,
|
||||
const wxString& name = wxFileDialogNameStr);
|
||||
|
||||
virtual void GetPaths(wxArrayString& paths) const;
|
||||
virtual void GetFilenames(wxArrayString& files) const;
|
||||
virtual bool SupportsExtraControl() const { return true; }
|
||||
virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE;
|
||||
virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE;
|
||||
virtual bool SupportsExtraControl() const wxOVERRIDE { return true; }
|
||||
void MSWOnInitDialogHook(WXHWND hwnd);
|
||||
|
||||
virtual int ShowModal();
|
||||
virtual int ShowModal() wxOVERRIDE;
|
||||
|
||||
// wxMSW-specific implementation from now on
|
||||
// -----------------------------------------
|
||||
@ -46,10 +46,10 @@ public:
|
||||
|
||||
protected:
|
||||
|
||||
virtual void DoMoveWindow(int x, int y, int width, int height);
|
||||
virtual void DoCentre(int dir);
|
||||
virtual void DoGetSize( int *width, int *height ) const;
|
||||
virtual void DoGetPosition( int *x, int *y ) const;
|
||||
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
|
||||
virtual void DoCentre(int dir) wxOVERRIDE;
|
||||
virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
|
||||
virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxArrayString m_fileNames;
|
||||
|
||||
@ -85,30 +85,30 @@ public:
|
||||
virtual ~wxFont();
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual int GetPointSize() const;
|
||||
virtual wxSize GetPixelSize() const;
|
||||
virtual bool IsUsingSizeInPixels() const;
|
||||
virtual wxFontStyle GetStyle() const;
|
||||
virtual wxFontWeight GetWeight() const;
|
||||
virtual bool GetUnderlined() const;
|
||||
virtual bool GetStrikethrough() const;
|
||||
virtual wxString GetFaceName() const;
|
||||
virtual wxFontEncoding GetEncoding() const;
|
||||
virtual const wxNativeFontInfo *GetNativeFontInfo() const;
|
||||
virtual int GetPointSize() const wxOVERRIDE;
|
||||
virtual wxSize GetPixelSize() const wxOVERRIDE;
|
||||
virtual bool IsUsingSizeInPixels() const wxOVERRIDE;
|
||||
virtual wxFontStyle GetStyle() const wxOVERRIDE;
|
||||
virtual wxFontWeight GetWeight() const wxOVERRIDE;
|
||||
virtual bool GetUnderlined() const wxOVERRIDE;
|
||||
virtual bool GetStrikethrough() const wxOVERRIDE;
|
||||
virtual wxString GetFaceName() const wxOVERRIDE;
|
||||
virtual wxFontEncoding GetEncoding() const wxOVERRIDE;
|
||||
virtual const wxNativeFontInfo *GetNativeFontInfo() const wxOVERRIDE;
|
||||
|
||||
virtual void SetPointSize(int pointSize);
|
||||
virtual void SetPixelSize(const wxSize& pixelSize);
|
||||
virtual void SetFamily(wxFontFamily family);
|
||||
virtual void SetStyle(wxFontStyle style);
|
||||
virtual void SetWeight(wxFontWeight weight);
|
||||
virtual bool SetFaceName(const wxString& faceName);
|
||||
virtual void SetUnderlined(bool underlined);
|
||||
virtual void SetStrikethrough(bool strikethrough);
|
||||
virtual void SetEncoding(wxFontEncoding encoding);
|
||||
virtual void SetPointSize(int pointSize) wxOVERRIDE;
|
||||
virtual void SetPixelSize(const wxSize& pixelSize) wxOVERRIDE;
|
||||
virtual void SetFamily(wxFontFamily family) wxOVERRIDE;
|
||||
virtual void SetStyle(wxFontStyle style) wxOVERRIDE;
|
||||
virtual void SetWeight(wxFontWeight weight) wxOVERRIDE;
|
||||
virtual bool SetFaceName(const wxString& faceName) wxOVERRIDE;
|
||||
virtual void SetUnderlined(bool underlined) wxOVERRIDE;
|
||||
virtual void SetStrikethrough(bool strikethrough) wxOVERRIDE;
|
||||
virtual void SetEncoding(wxFontEncoding encoding) wxOVERRIDE;
|
||||
|
||||
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")
|
||||
wxFont(int size,
|
||||
@ -138,10 +138,10 @@ public:
|
||||
// implementation only from now on
|
||||
// -------------------------------
|
||||
|
||||
virtual bool IsFree() const;
|
||||
virtual bool RealizeResource();
|
||||
virtual WXHANDLE GetResourceHandle() const;
|
||||
virtual bool FreeResource(bool force = false);
|
||||
virtual bool IsFree() const wxOVERRIDE;
|
||||
virtual bool RealizeResource() wxOVERRIDE;
|
||||
virtual WXHANDLE GetResourceHandle() const wxOVERRIDE;
|
||||
virtual bool FreeResource(bool force = false) wxOVERRIDE;
|
||||
|
||||
// for consistency with other wxMSW classes
|
||||
WXHFONT GetHFONT() const;
|
||||
@ -158,12 +158,12 @@ protected:
|
||||
const wxString& face = wxEmptyString,
|
||||
wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
|
||||
|
||||
virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
|
||||
virtual wxFontFamily DoGetFamily() const;
|
||||
virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info) wxOVERRIDE;
|
||||
virtual wxFontFamily DoGetFamily() const wxOVERRIDE;
|
||||
|
||||
// implement wxObject virtuals which are used by AllocExclusive()
|
||||
virtual wxGDIRefData *CreateGDIRefData() const;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
||||
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS(wxFont);
|
||||
|
||||
@ -24,7 +24,7 @@ public:
|
||||
wxFontDialog(wxWindow *parent, const wxFontData& data)
|
||||
: wxFontDialogBase(parent, data) { Create(parent, data); }
|
||||
|
||||
virtual int ShowModal();
|
||||
virtual int ShowModal() wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog);
|
||||
|
||||
@ -43,7 +43,7 @@ public:
|
||||
virtual ~wxFrame();
|
||||
|
||||
// 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
|
||||
// -------------------------------
|
||||
@ -55,7 +55,7 @@ public:
|
||||
#if wxUSE_TOOLBAR
|
||||
virtual wxToolBar* CreateToolBar(long style = -1,
|
||||
wxWindowID id = wxID_ANY,
|
||||
const wxString& name = wxToolBarNameStr);
|
||||
const wxString& name = wxToolBarNameStr) wxOVERRIDE;
|
||||
#endif // wxUSE_TOOLBAR
|
||||
|
||||
// Status bar
|
||||
@ -63,7 +63,7 @@ public:
|
||||
virtual wxStatusBar* OnCreateStatusBar(int number = 1,
|
||||
long style = wxSTB_DEFAULT_STYLE,
|
||||
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
|
||||
// native one for the platforms which support it (Win32), the generic one
|
||||
@ -87,12 +87,12 @@ public:
|
||||
#endif // tooltips
|
||||
|
||||
// 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
|
||||
virtual bool MSWTranslateMessage(WXMSG *msg)
|
||||
virtual bool MSWTranslateMessage(WXMSG *msg) wxOVERRIDE
|
||||
{
|
||||
return MSWDoTranslateMessage(this, msg);
|
||||
}
|
||||
@ -100,18 +100,18 @@ public:
|
||||
// window proc for the frames
|
||||
virtual WXLRESULT MSWWindowProc(WXUINT message,
|
||||
WXWPARAM wParam,
|
||||
WXLPARAM lParam);
|
||||
WXLPARAM lParam) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_MENUS
|
||||
// get the currently active menu: this is the same as the frame menu for
|
||||
// normal frames but is overridden by wxMDIParentFrame
|
||||
virtual WXHMENU MSWGetActiveMenu() const { return m_hMenu; }
|
||||
|
||||
virtual bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
|
||||
virtual bool DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu);
|
||||
virtual bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu) wxOVERRIDE;
|
||||
virtual bool DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu) wxOVERRIDE;
|
||||
|
||||
// Look up the menu in the menu bar.
|
||||
virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu);
|
||||
virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu) wxOVERRIDE;
|
||||
#endif // wxUSE_MENUS
|
||||
|
||||
#if wxUSE_TASKBARBUTTON
|
||||
@ -128,12 +128,12 @@ protected:
|
||||
void Init();
|
||||
|
||||
// override base class virtuals
|
||||
virtual void DoGetClientSize(int *width, int *height) const;
|
||||
virtual void DoSetClientSize(int width, int height);
|
||||
virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
|
||||
virtual void DoSetClientSize(int width, int height) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_MENUS_NATIVE
|
||||
// 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
|
||||
// the menubar is set
|
||||
@ -153,11 +153,11 @@ protected:
|
||||
virtual WXHICON GetDefaultIcon() const;
|
||||
|
||||
#if wxUSE_TOOLBAR
|
||||
virtual void PositionToolBar();
|
||||
virtual void PositionToolBar() wxOVERRIDE;
|
||||
#endif // wxUSE_TOOLBAR
|
||||
|
||||
#if wxUSE_STATUSBAR
|
||||
virtual void PositionStatusBar();
|
||||
virtual void PositionStatusBar() wxOVERRIDE;
|
||||
|
||||
static bool m_useNativeStatusBar;
|
||||
#endif // wxUSE_STATUSBAR
|
||||
|
||||
@ -26,7 +26,7 @@ public:
|
||||
// implementation for it using the platform native support for watching the
|
||||
// entire directory trees.
|
||||
virtual bool AddTree(const wxFileName& path, int events = wxFSW_EVENT_ALL,
|
||||
const wxString& filter = wxEmptyString);
|
||||
const wxString& filter = wxEmptyString) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
bool Init();
|
||||
|
||||
@ -45,22 +45,22 @@ public:
|
||||
const wxString& name = wxGaugeNameStr);
|
||||
|
||||
// set gauge range/value
|
||||
virtual void SetRange(int range);
|
||||
virtual void SetValue(int pos);
|
||||
virtual void SetRange(int range) wxOVERRIDE;
|
||||
virtual void SetValue(int pos) wxOVERRIDE;
|
||||
|
||||
// overridden base class virtuals
|
||||
virtual bool SetForegroundColour(const wxColour& col);
|
||||
virtual bool SetBackgroundColour(const wxColour& col);
|
||||
virtual bool SetForegroundColour(const wxColour& col) wxOVERRIDE;
|
||||
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
|
||||
virtual bool CanApplyThemeBorder() const { return false; }
|
||||
virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
// returns true if the control is currently in indeterminate (a.k.a.
|
||||
|
||||
@ -50,7 +50,7 @@ public:
|
||||
}
|
||||
|
||||
// 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; }
|
||||
|
||||
@ -130,19 +130,19 @@ public:
|
||||
void SetSize(const wxSize& size) { SetSize(size.x, size.y); }
|
||||
|
||||
// forward some of base class virtuals to wxGDIImageRefData
|
||||
bool FreeResource(bool force = false);
|
||||
virtual WXHANDLE GetResourceHandle() const;
|
||||
bool FreeResource(bool force = false) wxOVERRIDE;
|
||||
virtual WXHANDLE GetResourceHandle() const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
// create the data for the derived class here
|
||||
virtual wxGDIImageRefData *CreateData() const = 0;
|
||||
|
||||
// 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
|
||||
virtual wxGDIRefData *
|
||||
CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const
|
||||
CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const wxOVERRIDE
|
||||
{
|
||||
wxFAIL_MSG( wxT("must be implemented if used") );
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@ public:
|
||||
const wxGLContextAttrs *ctxAttrs = NULL);
|
||||
virtual ~wxGLContext();
|
||||
|
||||
virtual bool SetCurrent(const wxGLCanvas& win) const;
|
||||
virtual bool SetCurrent(const wxGLCanvas& win) const wxOVERRIDE;
|
||||
|
||||
HGLRC GetGLRC() const { return m_glContext; }
|
||||
|
||||
@ -88,7 +88,7 @@ public:
|
||||
virtual ~wxGLCanvas();
|
||||
|
||||
// implement wxGLCanvasBase methods
|
||||
virtual bool SwapBuffers();
|
||||
virtual bool SwapBuffers() wxOVERRIDE;
|
||||
|
||||
|
||||
// MSW-specific helpers
|
||||
@ -109,7 +109,7 @@ public:
|
||||
#if wxUSE_PALETTE
|
||||
// palette stuff
|
||||
bool SetupPalette(const wxPalette& palette);
|
||||
virtual wxPalette CreateDefaultPalette();
|
||||
virtual wxPalette CreateDefaultPalette() wxOVERRIDE;
|
||||
void OnQueryNewPalette(wxQueryNewPaletteEvent& event);
|
||||
void OnPaletteChanged(wxPaletteChangedEvent& event);
|
||||
#endif // wxUSE_PALETTE
|
||||
|
||||
@ -54,25 +54,25 @@ public:
|
||||
|
||||
protected:
|
||||
// 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,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
// implement base class pure virtuals
|
||||
virtual void DoSetCount(unsigned int count);
|
||||
virtual unsigned int DoGetCount() const;
|
||||
virtual void DoUpdate(unsigned int idx);
|
||||
virtual void DoSetCount(unsigned int count) wxOVERRIDE;
|
||||
virtual unsigned int DoGetCount() const wxOVERRIDE;
|
||||
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 wxArrayInt DoGetColumnsOrder() const;
|
||||
virtual void DoSetColumnsOrder(const wxArrayInt& order) wxOVERRIDE;
|
||||
virtual wxArrayInt DoGetColumnsOrder() const wxOVERRIDE;
|
||||
|
||||
// override MSW-specific methods needed for new control
|
||||
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
|
||||
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
|
||||
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
||||
@ -32,52 +32,52 @@ public:
|
||||
virtual ~wxBestHelpController() { delete m_helpController; }
|
||||
|
||||
// Must call this to set the filename
|
||||
virtual bool Initialize(const wxString& file);
|
||||
virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); }
|
||||
virtual bool Initialize(const wxString& file) wxOVERRIDE;
|
||||
virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) wxOVERRIDE { return Initialize( file ); }
|
||||
|
||||
// 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 ) );
|
||||
}
|
||||
|
||||
virtual bool DisplayContents()
|
||||
virtual bool DisplayContents() wxOVERRIDE
|
||||
{
|
||||
return m_helpController->DisplayContents();
|
||||
}
|
||||
|
||||
virtual bool DisplaySection(int sectionNo)
|
||||
virtual bool DisplaySection(int sectionNo) wxOVERRIDE
|
||||
{
|
||||
return m_helpController->DisplaySection( sectionNo );
|
||||
}
|
||||
|
||||
virtual bool DisplaySection(const wxString& section)
|
||||
virtual bool DisplaySection(const wxString& section) wxOVERRIDE
|
||||
{
|
||||
return m_helpController->DisplaySection( section );
|
||||
}
|
||||
|
||||
virtual bool DisplayBlock(long blockNo)
|
||||
virtual bool DisplayBlock(long blockNo) wxOVERRIDE
|
||||
{
|
||||
return m_helpController->DisplayBlock( blockNo );
|
||||
}
|
||||
|
||||
virtual bool DisplayContextPopup(int contextId)
|
||||
virtual bool DisplayContextPopup(int contextId) wxOVERRIDE
|
||||
{
|
||||
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 );
|
||||
}
|
||||
|
||||
virtual bool KeywordSearch(const wxString& k,
|
||||
wxHelpSearchMode mode = wxHELP_SEARCH_ALL)
|
||||
wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE
|
||||
{
|
||||
return m_helpController->KeywordSearch( k, mode );
|
||||
}
|
||||
|
||||
virtual bool Quit()
|
||||
virtual bool Quit() wxOVERRIDE
|
||||
{
|
||||
return m_helpController->Quit();
|
||||
}
|
||||
@ -86,7 +86,7 @@ public:
|
||||
virtual void SetFrameParameters(const wxString& title,
|
||||
const wxSize& size,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
bool newFrameEachTime = false)
|
||||
bool newFrameEachTime = false) wxOVERRIDE
|
||||
{
|
||||
m_helpController->SetFrameParameters( title, size, pos,
|
||||
newFrameEachTime );
|
||||
@ -95,17 +95,17 @@ public:
|
||||
// Obtains the latest settings used by the help frame and the help frame.
|
||||
virtual wxFrame *GetFrameParameters(wxSize *size = NULL,
|
||||
wxPoint *pos = NULL,
|
||||
bool *newFrameEachTime = NULL)
|
||||
bool *newFrameEachTime = NULL) wxOVERRIDE
|
||||
{
|
||||
return m_helpController->GetFrameParameters( size, pos,
|
||||
newFrameEachTime );
|
||||
}
|
||||
|
||||
/// 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.
|
||||
virtual wxWindow* GetParentWindow() const { return m_helpController->GetParentWindow(); }
|
||||
virtual wxWindow* GetParentWindow() const wxOVERRIDE { return m_helpController->GetParentWindow(); }
|
||||
|
||||
protected:
|
||||
// Append/change extension if necessary.
|
||||
|
||||
@ -21,20 +21,20 @@ public:
|
||||
wxCHMHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) { }
|
||||
|
||||
// Must call this to set the filename
|
||||
virtual bool Initialize(const wxString& file);
|
||||
virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); }
|
||||
virtual bool Initialize(const wxString& file) wxOVERRIDE;
|
||||
virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) wxOVERRIDE { return Initialize( file ); }
|
||||
|
||||
// If file is "", reloads file given in Initialize
|
||||
virtual bool LoadFile(const wxString& file = wxEmptyString);
|
||||
virtual bool DisplayContents();
|
||||
virtual bool DisplaySection(int sectionNo);
|
||||
virtual bool DisplaySection(const wxString& section);
|
||||
virtual bool DisplayBlock(long blockNo);
|
||||
virtual bool DisplayContextPopup(int contextId);
|
||||
virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos);
|
||||
virtual bool LoadFile(const wxString& file = wxEmptyString) wxOVERRIDE;
|
||||
virtual bool DisplayContents() wxOVERRIDE;
|
||||
virtual bool DisplaySection(int sectionNo) wxOVERRIDE;
|
||||
virtual bool DisplaySection(const wxString& section) wxOVERRIDE;
|
||||
virtual bool DisplayBlock(long blockNo) wxOVERRIDE;
|
||||
virtual bool DisplayContextPopup(int contextId) wxOVERRIDE;
|
||||
virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos) wxOVERRIDE;
|
||||
virtual bool KeywordSearch(const wxString& k,
|
||||
wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
|
||||
virtual bool Quit();
|
||||
wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE;
|
||||
virtual bool Quit() wxOVERRIDE;
|
||||
|
||||
wxString GetHelpFile() const { return m_helpFile; }
|
||||
|
||||
|
||||
@ -26,19 +26,19 @@ public:
|
||||
virtual ~wxWinHelpController() {}
|
||||
|
||||
// Must call this to set the filename
|
||||
virtual bool Initialize(const wxString& file);
|
||||
virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); }
|
||||
virtual bool Initialize(const wxString& file) wxOVERRIDE;
|
||||
virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) wxOVERRIDE { return Initialize( file ); }
|
||||
|
||||
// If file is "", reloads file given in Initialize
|
||||
virtual bool LoadFile(const wxString& file = wxEmptyString);
|
||||
virtual bool DisplayContents();
|
||||
virtual bool DisplaySection(int sectionNo);
|
||||
virtual bool DisplaySection(const wxString& section) { return KeywordSearch(section); }
|
||||
virtual bool DisplayBlock(long blockNo);
|
||||
virtual bool DisplayContextPopup(int contextId);
|
||||
virtual bool LoadFile(const wxString& file = wxEmptyString) wxOVERRIDE;
|
||||
virtual bool DisplayContents() wxOVERRIDE;
|
||||
virtual bool DisplaySection(int sectionNo) wxOVERRIDE;
|
||||
virtual bool DisplaySection(const wxString& section) wxOVERRIDE { return KeywordSearch(section); }
|
||||
virtual bool DisplayBlock(long blockNo) wxOVERRIDE;
|
||||
virtual bool DisplayContextPopup(int contextId) wxOVERRIDE;
|
||||
virtual bool KeywordSearch(const wxString& k,
|
||||
wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
|
||||
virtual bool Quit();
|
||||
wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE;
|
||||
virtual bool Quit() wxOVERRIDE;
|
||||
|
||||
inline wxString GetHelpFile() const { return m_helpFile; }
|
||||
|
||||
|
||||
@ -47,16 +47,16 @@ public:
|
||||
// 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:
|
||||
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
||||
virtual wxSize DoGetBestClientSize() const;
|
||||
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
|
||||
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS( wxHyperlinkCtrl );
|
||||
};
|
||||
|
||||
@ -29,7 +29,7 @@ public:
|
||||
wxIconRefData() { }
|
||||
virtual ~wxIconRefData() { Free(); }
|
||||
|
||||
virtual void Free();
|
||||
virtual void Free() wxOVERRIDE;
|
||||
};
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
@ -78,12 +78,12 @@ public:
|
||||
void CopyFromBitmap(const wxBitmap& bmp);
|
||||
|
||||
protected:
|
||||
virtual wxGDIImageRefData *CreateData() const
|
||||
virtual wxGDIImageRefData *CreateData() const wxOVERRIDE
|
||||
{
|
||||
return new wxIconRefData;
|
||||
}
|
||||
|
||||
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
|
||||
virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE;
|
||||
|
||||
// create from XPM data
|
||||
void CreateIconFromXpm(const char* const* data);
|
||||
|
||||
@ -51,41 +51,41 @@ public:
|
||||
virtual ~wxIniConfig();
|
||||
|
||||
// implement inherited pure virtual functions
|
||||
virtual void SetPath(const wxString& strPath);
|
||||
virtual const wxString& GetPath() const;
|
||||
virtual void SetPath(const wxString& strPath) wxOVERRIDE;
|
||||
virtual const wxString& GetPath() const wxOVERRIDE;
|
||||
|
||||
virtual bool GetFirstGroup(wxString& str, long& lIndex) const;
|
||||
virtual bool GetNextGroup (wxString& str, long& lIndex) const;
|
||||
virtual bool GetFirstEntry(wxString& str, long& lIndex) const;
|
||||
virtual bool GetNextEntry (wxString& str, long& lIndex) const;
|
||||
virtual bool GetFirstGroup(wxString& str, long& lIndex) const wxOVERRIDE;
|
||||
virtual bool GetNextGroup (wxString& str, long& lIndex) const wxOVERRIDE;
|
||||
virtual bool GetFirstEntry(wxString& str, long& lIndex) const wxOVERRIDE;
|
||||
virtual bool GetNextEntry (wxString& str, long& lIndex) const wxOVERRIDE;
|
||||
|
||||
virtual size_t GetNumberOfEntries(bool bRecursive = false) const;
|
||||
virtual size_t GetNumberOfGroups(bool bRecursive = false) const;
|
||||
virtual size_t GetNumberOfEntries(bool bRecursive = false) const wxOVERRIDE;
|
||||
virtual size_t GetNumberOfGroups(bool bRecursive = false) const wxOVERRIDE;
|
||||
|
||||
virtual bool HasGroup(const wxString& strName) const;
|
||||
virtual bool HasEntry(const wxString& strName) const;
|
||||
virtual bool HasGroup(const wxString& strName) const wxOVERRIDE;
|
||||
virtual bool HasEntry(const wxString& strName) const wxOVERRIDE;
|
||||
|
||||
// return true if the current group is empty
|
||||
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 RenameGroup(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) wxOVERRIDE;
|
||||
|
||||
virtual bool DeleteEntry(const wxString& Key, bool bGroupIfEmptyAlso = true);
|
||||
virtual bool DeleteGroup(const wxString& szKey);
|
||||
virtual bool DeleteAll();
|
||||
virtual bool DeleteEntry(const wxString& Key, bool bGroupIfEmptyAlso = true) wxOVERRIDE;
|
||||
virtual bool DeleteGroup(const wxString& szKey) wxOVERRIDE;
|
||||
virtual bool DeleteAll() wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
// read/write
|
||||
bool DoReadString(const wxString& key, wxString *pStr) const;
|
||||
bool DoReadLong(const wxString& key, long *plResult) const;
|
||||
bool DoReadBinary(const wxString& key, wxMemoryBuffer *buf) const;
|
||||
bool DoReadString(const wxString& key, wxString *pStr) const wxOVERRIDE;
|
||||
bool DoReadLong(const wxString& key, long *plResult) const wxOVERRIDE;
|
||||
bool DoReadBinary(const wxString& key, wxMemoryBuffer *buf) const wxOVERRIDE;
|
||||
|
||||
bool DoWriteString(const wxString& key, const wxString& szValue);
|
||||
bool DoWriteLong(const wxString& key, long lValue);
|
||||
bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf);
|
||||
bool DoWriteString(const wxString& key, const wxString& szValue) wxOVERRIDE;
|
||||
bool DoWriteLong(const wxString& key, long lValue) wxOVERRIDE;
|
||||
bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
// helpers
|
||||
|
||||
@ -80,31 +80,31 @@ public:
|
||||
|
||||
virtual ~wxListBox();
|
||||
|
||||
virtual unsigned int GetCount() const;
|
||||
virtual wxString GetString(unsigned int n) const;
|
||||
virtual void SetString(unsigned int n, const wxString& s);
|
||||
virtual int FindString(const wxString& s, bool bCase = false) const;
|
||||
virtual unsigned int GetCount() const wxOVERRIDE;
|
||||
virtual wxString GetString(unsigned int n) const wxOVERRIDE;
|
||||
virtual void SetString(unsigned int n, const wxString& s) wxOVERRIDE;
|
||||
virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE;
|
||||
|
||||
virtual bool IsSelected(int n) const;
|
||||
virtual int GetSelection() const;
|
||||
virtual int GetSelections(wxArrayInt& aSelections) const;
|
||||
virtual bool IsSelected(int n) const wxOVERRIDE;
|
||||
virtual int GetSelection() const wxOVERRIDE;
|
||||
virtual int GetSelections(wxArrayInt& aSelections) const wxOVERRIDE;
|
||||
|
||||
// return the index of the item at this position or wxNOT_FOUND
|
||||
int HitTest(const wxPoint& pt) const { return DoHitTestList(pt); }
|
||||
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 GetCountPerPage() const;
|
||||
virtual int GetTopItem() const wxOVERRIDE;
|
||||
virtual int GetCountPerPage() const wxOVERRIDE;
|
||||
|
||||
// ownerdrawn wxListBox and wxCheckListBox support
|
||||
#if wxUSE_OWNER_DRAWN
|
||||
// override base class virtuals
|
||||
virtual bool SetFont(const wxFont &font);
|
||||
virtual bool SetFont(const wxFont &font) wxOVERRIDE;
|
||||
|
||||
bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
|
||||
bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
|
||||
bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item) wxOVERRIDE;
|
||||
bool MSWOnDraw(WXDRAWITEMSTRUCT *item) wxOVERRIDE;
|
||||
|
||||
// plug-in for derived classes
|
||||
virtual wxOwnerDrawn *CreateLboxItem(size_t n);
|
||||
@ -129,17 +129,17 @@ public:
|
||||
virtual void SetHorizontalExtent(const wxString& s = wxEmptyString);
|
||||
|
||||
// Windows callbacks
|
||||
bool MSWCommand(WXUINT param, WXWORD id);
|
||||
WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
||||
bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
|
||||
WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
|
||||
|
||||
// under XP when using "transition effect for menus and tooltips" if we
|
||||
// return true for WM_PRINTCLIENT here then it causes noticeable slowdown
|
||||
virtual bool MSWShouldPropagatePrintChild()
|
||||
virtual bool MSWShouldPropagatePrintChild() wxOVERRIDE
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
virtual wxVisualAttributes GetDefaultAttributes() const
|
||||
virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
|
||||
{
|
||||
return GetClassDefaultAttributes(GetWindowVariant());
|
||||
}
|
||||
@ -151,25 +151,25 @@ public:
|
||||
}
|
||||
|
||||
// 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:
|
||||
virtual wxSize DoGetBestClientSize() const;
|
||||
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
|
||||
|
||||
virtual void DoClear();
|
||||
virtual void DoDeleteOneItem(unsigned int n);
|
||||
virtual void DoClear() wxOVERRIDE;
|
||||
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,
|
||||
unsigned int pos,
|
||||
void **clientData, wxClientDataType type);
|
||||
void **clientData, wxClientDataType type) wxOVERRIDE;
|
||||
|
||||
virtual void DoSetFirstItem(int n);
|
||||
virtual void DoSetItemClientData(unsigned int n, void* clientData);
|
||||
virtual void* DoGetItemClientData(unsigned int n) const;
|
||||
virtual void DoSetFirstItem(int n) wxOVERRIDE;
|
||||
virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE;
|
||||
virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE;
|
||||
|
||||
// this can't be called DoHitTest() because wxWindow already has this method
|
||||
virtual int DoHitTestList(const wxPoint& point) const;
|
||||
|
||||
@ -113,23 +113,23 @@ public:
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// Set the control colours
|
||||
bool SetForegroundColour(const wxColour& col);
|
||||
bool SetBackgroundColour(const wxColour& col);
|
||||
bool SetForegroundColour(const wxColour& col) wxOVERRIDE;
|
||||
bool SetBackgroundColour(const wxColour& col) wxOVERRIDE;
|
||||
|
||||
// Header attributes
|
||||
virtual bool SetHeaderAttr(const wxItemAttr& attr) wxOVERRIDE;
|
||||
|
||||
// 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
|
||||
bool SetColumn(int col, const wxListItem& item);
|
||||
bool SetColumn(int col, const wxListItem& item) wxOVERRIDE;
|
||||
|
||||
// Gets the column width
|
||||
int GetColumnWidth(int col) const;
|
||||
int GetColumnWidth(int col) const wxOVERRIDE;
|
||||
|
||||
// Sets the column width
|
||||
bool SetColumnWidth(int col, int width);
|
||||
bool SetColumnWidth(int col, int width) wxOVERRIDE;
|
||||
|
||||
|
||||
// Gets the column order from its index or index from its order
|
||||
@ -203,7 +203,7 @@ public:
|
||||
int GetItemCount() const;
|
||||
|
||||
// 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
|
||||
wxSize GetItemSpacing() const;
|
||||
@ -243,7 +243,7 @@ public:
|
||||
void SetSingleStyle(long style, bool add = true);
|
||||
|
||||
// Set the whole window style
|
||||
void SetWindowStyleFlag(long style);
|
||||
void SetWindowStyleFlag(long style) wxOVERRIDE;
|
||||
|
||||
// Searches for an item, starting from 'item'.
|
||||
// item can be -1 to find the first item that matches the
|
||||
@ -252,7 +252,7 @@ public:
|
||||
long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const;
|
||||
|
||||
// Gets one of the three image lists
|
||||
wxImageList *GetImageList(int which) const;
|
||||
wxImageList *GetImageList(int which) const wxOVERRIDE;
|
||||
|
||||
// Sets the image list
|
||||
// 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.
|
||||
// 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...
|
||||
void SetImageList(wxImageList *imageList, int which);
|
||||
void AssignImageList(wxImageList *imageList, int which);
|
||||
void SetImageList(wxImageList *imageList, int which) wxOVERRIDE;
|
||||
void AssignImageList(wxImageList *imageList, int which) wxOVERRIDE;
|
||||
|
||||
// refresh items selectively (only useful for virtual list controls)
|
||||
void RefreshItem(long item);
|
||||
@ -281,10 +281,10 @@ public:
|
||||
bool DeleteAllItems();
|
||||
|
||||
// Deletes a column
|
||||
bool DeleteColumn(int col);
|
||||
bool DeleteColumn(int col) wxOVERRIDE;
|
||||
|
||||
// Deletes all columns
|
||||
bool DeleteAllColumns();
|
||||
bool DeleteAllColumns() wxOVERRIDE;
|
||||
|
||||
// Clears items, and columns if there are any.
|
||||
void ClearAll();
|
||||
@ -352,9 +352,9 @@ public:
|
||||
bool SortItems(wxListCtrlCompare fn, wxIntPtr data);
|
||||
|
||||
// IMPLEMENTATION
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id);
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
|
||||
virtual bool MSWShouldPreProcessMessage(WXMSG* msg);
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
|
||||
virtual bool MSWShouldPreProcessMessage(WXMSG* msg) wxOVERRIDE;
|
||||
|
||||
// bring the control in sync with current m_windowStyle value
|
||||
void UpdateStyle();
|
||||
@ -365,9 +365,9 @@ public:
|
||||
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());
|
||||
}
|
||||
@ -376,27 +376,27 @@ public:
|
||||
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
|
||||
|
||||
// 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
|
||||
virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
|
||||
WXWPARAM wParam,
|
||||
WXLPARAM lParam);
|
||||
WXLPARAM lParam) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
||||
// Implement constrained best size calculation.
|
||||
virtual int DoGetBestClientHeight(int width) const
|
||||
virtual int DoGetBestClientHeight(int width) const wxOVERRIDE
|
||||
{ return MSWGetBestViewRect(width, -1).y; }
|
||||
virtual int DoGetBestClientWidth(int height) const
|
||||
virtual int DoGetBestClientWidth(int height) const wxOVERRIDE
|
||||
{ return MSWGetBestViewRect(-1, height).x; }
|
||||
|
||||
wxSize MSWGetBestViewRect(int x, int y) const;
|
||||
|
||||
// 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
|
||||
void FreeAllInternalData();
|
||||
|
||||
@ -54,21 +54,21 @@ public:
|
||||
|
||||
// we don't store the active child in m_currentChild so override this
|
||||
// function to find it dynamically
|
||||
virtual wxMDIChildFrame *GetActiveChild() const;
|
||||
virtual wxMDIChildFrame *GetActiveChild() const wxOVERRIDE;
|
||||
|
||||
virtual void Cascade();
|
||||
virtual void Tile(wxOrientation orient = wxHORIZONTAL);
|
||||
virtual void ArrangeIcons();
|
||||
virtual void ActivateNext();
|
||||
virtual void ActivatePrevious();
|
||||
virtual void Cascade() wxOVERRIDE;
|
||||
virtual void Tile(wxOrientation orient = wxHORIZONTAL) wxOVERRIDE;
|
||||
virtual void ArrangeIcons() wxOVERRIDE;
|
||||
virtual void ActivateNext() wxOVERRIDE;
|
||||
virtual void ActivatePrevious() wxOVERRIDE;
|
||||
|
||||
#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
|
||||
virtual WXHMENU MSWGetActiveMenu() const;
|
||||
virtual WXHMENU MSWGetActiveMenu() const wxOVERRIDE;
|
||||
#endif // wxUSE_MENUS
|
||||
|
||||
|
||||
@ -98,24 +98,24 @@ public:
|
||||
bool HandleActivate(int state, bool minimized, WXHWND activate);
|
||||
|
||||
// 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 bool MSWTranslateMessage(WXMSG* msg);
|
||||
virtual WXLRESULT MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM) wxOVERRIDE;
|
||||
virtual bool MSWTranslateMessage(WXMSG* msg) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_MENUS
|
||||
// override the menu-relayed methods to also look in the active child menu
|
||||
// bar and the "Window" menu
|
||||
virtual wxMenuItem *FindItemInMenuBar(int menuId) const;
|
||||
virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu);
|
||||
virtual wxMenuItem *FindItemInMenuBar(int menuId) const wxOVERRIDE;
|
||||
virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu) wxOVERRIDE;
|
||||
#endif // wxUSE_MENUS
|
||||
|
||||
protected:
|
||||
#if wxUSE_MENUS_NATIVE
|
||||
virtual void InternalSetMenuBar();
|
||||
virtual void InternalSetMenuBar() wxOVERRIDE;
|
||||
#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
|
||||
void UpdateClientSize();
|
||||
@ -190,13 +190,13 @@ public:
|
||||
virtual ~wxMDIChildFrame();
|
||||
|
||||
// implement MDI operations
|
||||
virtual void Activate();
|
||||
virtual void Activate() wxOVERRIDE;
|
||||
|
||||
// Override some frame operations too
|
||||
virtual void Maximize(bool maximize = true);
|
||||
virtual void Restore();
|
||||
virtual void Maximize(bool maximize = true) wxOVERRIDE;
|
||||
virtual void Restore() wxOVERRIDE;
|
||||
|
||||
virtual bool Show(bool show = true);
|
||||
virtual bool Show(bool show = true) wxOVERRIDE;
|
||||
|
||||
// Implementation only from now on
|
||||
// -------------------------------
|
||||
@ -206,26 +206,26 @@ public:
|
||||
bool HandleWindowPosChanging(void *lpPos);
|
||||
bool HandleGetMinMaxInfo(void *mmInfo);
|
||||
|
||||
virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
|
||||
virtual WXLRESULT MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
|
||||
virtual bool MSWTranslateMessage(WXMSG *msg);
|
||||
virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
|
||||
virtual WXLRESULT MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
|
||||
virtual bool MSWTranslateMessage(WXMSG *msg) wxOVERRIDE;
|
||||
|
||||
virtual void MSWDestroyWindow();
|
||||
virtual void MSWDestroyWindow() wxOVERRIDE;
|
||||
|
||||
bool ResetWindowStyle(void *vrect);
|
||||
|
||||
void OnIdle(wxIdleEvent& event);
|
||||
|
||||
protected:
|
||||
virtual void DoGetScreenPosition(int *x, int *y) const;
|
||||
virtual void DoGetPosition(int *x, int *y) const;
|
||||
virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags);
|
||||
virtual void DoSetClientSize(int width, int height);
|
||||
virtual void InternalSetMenuBar();
|
||||
virtual bool IsMDIChild() const { return true; }
|
||||
virtual void DetachMenuBar();
|
||||
virtual void DoGetScreenPosition(int *x, int *y) const wxOVERRIDE;
|
||||
virtual void DoGetPosition(int *x, int *y) const wxOVERRIDE;
|
||||
virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE;
|
||||
virtual void DoSetClientSize(int width, int height) wxOVERRIDE;
|
||||
virtual void InternalSetMenuBar() wxOVERRIDE;
|
||||
virtual bool IsMDIChild() const wxOVERRIDE { return true; }
|
||||
virtual void DetachMenuBar() wxOVERRIDE;
|
||||
|
||||
virtual WXHICON GetDefaultIcon() const;
|
||||
virtual WXHICON GetDefaultIcon() const wxOVERRIDE;
|
||||
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
@ -248,7 +248,7 @@ public:
|
||||
|
||||
// Note: this is virtual, to allow overridden behaviour.
|
||||
virtual bool CreateClient(wxMDIParentFrame *parent,
|
||||
long style = wxVSCROLL | wxHSCROLL);
|
||||
long style = wxVSCROLL | wxHSCROLL) wxOVERRIDE;
|
||||
|
||||
// Explicitly call default scroll behaviour
|
||||
void OnScroll(wxScrollEvent& event);
|
||||
@ -256,7 +256,7 @@ public:
|
||||
protected:
|
||||
virtual void DoSetSize(int x, int y,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
|
||||
|
||||
void Init() { m_scrollX = m_scrollY = 0; }
|
||||
|
||||
|
||||
@ -40,9 +40,9 @@ public:
|
||||
|
||||
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
|
||||
// ----------------
|
||||
@ -109,9 +109,9 @@ private:
|
||||
#endif // wxUSE_OWNER_DRAWN
|
||||
|
||||
protected:
|
||||
virtual wxMenuItem* DoAppend(wxMenuItem *item);
|
||||
virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
|
||||
virtual wxMenuItem* DoRemove(wxMenuItem *item);
|
||||
virtual wxMenuItem* DoAppend(wxMenuItem *item) wxOVERRIDE;
|
||||
virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item) wxOVERRIDE;
|
||||
virtual wxMenuItem* DoRemove(wxMenuItem *item) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
// This constructor is private, use MSWNewFromHMENU() to use it.
|
||||
@ -177,20 +177,20 @@ public:
|
||||
virtual ~wxMenuBar();
|
||||
|
||||
// menubar construction
|
||||
virtual bool Append( wxMenu *menu, const wxString &title );
|
||||
virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
|
||||
virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
|
||||
virtual wxMenu *Remove(size_t pos);
|
||||
virtual bool Append( wxMenu *menu, const wxString &title ) wxOVERRIDE;
|
||||
virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE;
|
||||
virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title) wxOVERRIDE;
|
||||
virtual wxMenu *Remove(size_t pos) wxOVERRIDE;
|
||||
|
||||
virtual void EnableTop( size_t pos, bool flag );
|
||||
virtual bool IsEnabledTop(size_t pos) const;
|
||||
virtual void SetMenuLabel( size_t pos, const wxString& label );
|
||||
virtual wxString GetMenuLabel( size_t pos ) const;
|
||||
virtual void EnableTop( size_t pos, bool flag ) wxOVERRIDE;
|
||||
virtual bool IsEnabledTop(size_t pos) const wxOVERRIDE;
|
||||
virtual void SetMenuLabel( size_t pos, const wxString& label ) wxOVERRIDE;
|
||||
virtual wxString GetMenuLabel( size_t pos ) const wxOVERRIDE;
|
||||
|
||||
// implementation from now on
|
||||
WXHMENU Create();
|
||||
virtual void Detach();
|
||||
virtual void Attach(wxFrame *frame);
|
||||
virtual void Detach() wxOVERRIDE;
|
||||
virtual void Attach(wxFrame *frame) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_ACCEL
|
||||
// update the accel table (must be called after adding/deleting a menu)
|
||||
@ -206,7 +206,7 @@ public:
|
||||
|
||||
// To avoid compile warning
|
||||
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.
|
||||
int MSWGetTopMenuPos(WXHMENU hMenu) const;
|
||||
|
||||
@ -43,11 +43,11 @@ public:
|
||||
virtual ~wxMenuItem();
|
||||
|
||||
// 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 Check(bool bDoCheck = true);
|
||||
virtual bool IsChecked() const;
|
||||
virtual void Enable(bool bDoEnable = true) wxOVERRIDE;
|
||||
virtual void Check(bool bDoCheck = true) wxOVERRIDE;
|
||||
virtual bool IsChecked() const wxOVERRIDE;
|
||||
|
||||
// unfortunately needed to resolve ambiguity between
|
||||
// wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable()
|
||||
@ -101,13 +101,13 @@ public:
|
||||
int MeasureAccelWidth() const;
|
||||
|
||||
// override wxOwnerDrawn base class virtuals
|
||||
virtual wxString GetName() const;
|
||||
virtual bool OnMeasureItem(size_t *pwidth, size_t *pheight);
|
||||
virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
|
||||
virtual wxString GetName() const wxOVERRIDE;
|
||||
virtual bool OnMeasureItem(size_t *pwidth, size_t *pheight) wxOVERRIDE;
|
||||
virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
virtual void GetFontToUse(wxFont& font) const;
|
||||
virtual void GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const;
|
||||
virtual void GetFontToUse(wxFont& font) const wxOVERRIDE;
|
||||
virtual void GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& colBack) const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
// helper function for draw std menu check mark
|
||||
|
||||
@ -30,7 +30,7 @@ public:
|
||||
wxMetafileRefData();
|
||||
virtual ~wxMetafileRefData();
|
||||
|
||||
virtual bool IsOk() const { return m_metafile != 0; }
|
||||
virtual bool IsOk() const wxOVERRIDE { return m_metafile != 0; }
|
||||
|
||||
public:
|
||||
WXHANDLE m_metafile;
|
||||
@ -69,8 +69,8 @@ public:
|
||||
void SetWindowsMappingMode(int mm);
|
||||
|
||||
protected:
|
||||
virtual wxGDIRefData *CreateGDIRefData() const;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
||||
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS(wxMetafile);
|
||||
@ -85,12 +85,12 @@ public:
|
||||
virtual ~wxMetafileDCImpl();
|
||||
|
||||
virtual wxMetafile *Close();
|
||||
virtual void SetMapMode(wxMappingMode mode);
|
||||
virtual void SetMapMode(wxMappingMode mode) wxOVERRIDE;
|
||||
virtual void DoGetTextExtent(const wxString& string,
|
||||
wxCoord *x, wxCoord *y,
|
||||
wxCoord *descent = NULL,
|
||||
wxCoord *externalLeading = NULL,
|
||||
const wxFont *theFont = NULL) const;
|
||||
const wxFont *theFont = NULL) const wxOVERRIDE;
|
||||
|
||||
// Implementation
|
||||
wxMetafile *GetMetaFile() const { return m_metaFile; }
|
||||
@ -99,7 +99,7 @@ public:
|
||||
void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; }
|
||||
|
||||
protected:
|
||||
virtual void DoGetSize(int *width, int *height) const;
|
||||
virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
|
||||
|
||||
int m_windowsMappingMode;
|
||||
wxMetafile* m_metaFile;
|
||||
@ -174,9 +174,9 @@ public:
|
||||
{ return m_metafile; }
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual size_t GetDataSize() const;
|
||||
virtual bool GetDataHere(void *buf) const;
|
||||
virtual bool SetData(size_t len, const void *buf);
|
||||
virtual size_t GetDataSize() const wxOVERRIDE;
|
||||
virtual bool GetDataHere(void *buf) const wxOVERRIDE;
|
||||
virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
wxMetafile m_metafile;
|
||||
|
||||
@ -24,9 +24,9 @@ public:
|
||||
m_hook = NULL;
|
||||
}
|
||||
|
||||
virtual int ShowModal();
|
||||
virtual int ShowModal() wxOVERRIDE;
|
||||
|
||||
virtual long GetEffectiveIcon() const;
|
||||
virtual long GetEffectiveIcon() const wxOVERRIDE;
|
||||
|
||||
// implementation-specific
|
||||
|
||||
@ -35,7 +35,7 @@ public:
|
||||
|
||||
protected:
|
||||
// Override this as task dialogs are always centered on parent.
|
||||
virtual void DoCentre(int dir);
|
||||
virtual void DoCentre(int dir) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
// hook procedure used to adjust the message box beyond what the standard
|
||||
|
||||
@ -23,10 +23,10 @@ public:
|
||||
virtual ~wxNonOwnedWindow();
|
||||
|
||||
protected:
|
||||
virtual bool DoClearShape();
|
||||
virtual bool DoSetRegionShape(const wxRegion& region);
|
||||
virtual bool DoClearShape() wxOVERRIDE;
|
||||
virtual bool DoSetRegionShape(const wxRegion& region) wxOVERRIDE;
|
||||
#if wxUSE_GRAPHICS_CONTEXT
|
||||
virtual bool DoSetPathShape(const wxGraphicsPath& path);
|
||||
virtual bool DoSetPathShape(const wxGraphicsPath& path) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxNonOwnedWindowShapeImpl* m_shapeImpl;
|
||||
|
||||
@ -48,19 +48,19 @@ public:
|
||||
// accessors
|
||||
// ---------
|
||||
// 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
|
||||
// selected one (or wxNOT_FOUND on error)
|
||||
// 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
|
||||
int ChangeSelection(size_t nPage);
|
||||
int ChangeSelection(size_t nPage) wxOVERRIDE;
|
||||
|
||||
// set/get the title of a page
|
||||
bool SetPageText(size_t nPage, const wxString& strText);
|
||||
wxString GetPageText(size_t nPage) const;
|
||||
bool SetPageText(size_t nPage, const wxString& strText) wxOVERRIDE;
|
||||
wxString GetPageText(size_t nPage) const wxOVERRIDE;
|
||||
|
||||
// image list stuff: each page may have an image associated with it. All
|
||||
// the images belong to an image list, so you have to
|
||||
@ -68,26 +68,26 @@ public:
|
||||
// 2) associate it with the notebook
|
||||
// 3) set for each page it's image
|
||||
// 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
|
||||
int GetPageImage(size_t nPage) const;
|
||||
bool SetPageImage(size_t nPage, int nImage);
|
||||
int GetPageImage(size_t nPage) const wxOVERRIDE;
|
||||
bool SetPageImage(size_t nPage, int nImage) wxOVERRIDE;
|
||||
|
||||
// currently it's always 1 because wxGTK doesn't support multi-row
|
||||
// tab controls
|
||||
int GetRowCount() const;
|
||||
int GetRowCount() const wxOVERRIDE;
|
||||
|
||||
// control the appearance of the notebook 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)
|
||||
void SetPadding(const wxSize& padding);
|
||||
void SetPadding(const wxSize& padding) wxOVERRIDE;
|
||||
|
||||
// operations
|
||||
// ----------
|
||||
// remove all pages
|
||||
bool DeleteAllPages();
|
||||
bool DeleteAllPages() wxOVERRIDE;
|
||||
|
||||
// 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.
|
||||
@ -95,17 +95,17 @@ public:
|
||||
wxNotebookPage *pPage,
|
||||
const wxString& strText,
|
||||
bool bSelect = false,
|
||||
int imageId = NO_IMAGE);
|
||||
int imageId = NO_IMAGE) wxOVERRIDE;
|
||||
|
||||
// Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
|
||||
// style.
|
||||
void SetTabSize(const wxSize& sz);
|
||||
void SetTabSize(const wxSize& sz) wxOVERRIDE;
|
||||
|
||||
// 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
|
||||
virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
|
||||
virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const wxOVERRIDE;
|
||||
|
||||
// callbacks
|
||||
// ---------
|
||||
@ -115,23 +115,23 @@ public:
|
||||
// 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,
|
||||
WXWORD pos, WXHWND control);
|
||||
WXWORD pos, WXHWND control) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_CONSTRAINTS
|
||||
virtual void SetConstraintSizes(bool recurse = true);
|
||||
virtual bool DoPhase(int nPhase);
|
||||
virtual void SetConstraintSizes(bool recurse = true) wxOVERRIDE;
|
||||
virtual bool DoPhase(int nPhase) wxOVERRIDE;
|
||||
#endif // wxUSE_CONSTRAINTS
|
||||
|
||||
// Attempts to get colour for UX theme page background
|
||||
wxColour GetThemeBackgroundColour() const;
|
||||
wxColour GetThemeBackgroundColour() const wxOVERRIDE;
|
||||
|
||||
// implementation only
|
||||
// -------------------
|
||||
|
||||
#if wxUSE_UXTHEME
|
||||
virtual bool SetBackgroundColour(const wxColour& colour)
|
||||
virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE
|
||||
{
|
||||
if ( !wxNotebookBase::SetBackgroundColour(colour) )
|
||||
return false;
|
||||
@ -142,13 +142,13 @@ public:
|
||||
}
|
||||
|
||||
// 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
|
||||
|
||||
// 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:
|
||||
// common part of all ctors
|
||||
@ -159,7 +159,7 @@ protected:
|
||||
void UpdateSelection(int selNew);
|
||||
|
||||
// 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
|
||||
//
|
||||
@ -171,7 +171,7 @@ protected:
|
||||
|
||||
#if wxUSE_UXTHEME
|
||||
// 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
|
||||
WXHBRUSH QueryBgBitmap();
|
||||
|
||||
@ -20,7 +20,7 @@ public:
|
||||
virtual ~wxOwnerDrawn() {}
|
||||
|
||||
virtual bool OnDrawItem(wxDC& dc, const wxRect& rc,
|
||||
wxODAction act, wxODStatus stat);
|
||||
wxODAction act, wxODStatus stat) wxOVERRIDE;
|
||||
};
|
||||
|
||||
#endif // wxUSE_OWNER_DRAWN
|
||||
|
||||
@ -26,7 +26,7 @@ public:
|
||||
bool Create(int n,
|
||||
const unsigned char *red, const unsigned char *green, const unsigned char *blue);
|
||||
|
||||
virtual int GetColoursCount() const;
|
||||
virtual int GetColoursCount() const wxOVERRIDE;
|
||||
|
||||
int
|
||||
GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
|
||||
@ -40,8 +40,8 @@ public:
|
||||
void SetHPALETTE(WXHPALETTE pal);
|
||||
|
||||
protected:
|
||||
virtual wxGDIRefData *CreateGDIRefData() const;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
||||
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS(wxPalette);
|
||||
|
||||
@ -31,25 +31,25 @@ public:
|
||||
bool operator!=(const wxPen& pen) const { return !(*this == pen); }
|
||||
|
||||
// Override in order to recreate the pen
|
||||
void SetColour(const wxColour& col);
|
||||
void SetColour(unsigned char r, unsigned char g, unsigned char b);
|
||||
void SetColour(const wxColour& col) wxOVERRIDE;
|
||||
void SetColour(unsigned char r, unsigned char g, unsigned char b) wxOVERRIDE;
|
||||
|
||||
void SetWidth(int width);
|
||||
void SetStyle(wxPenStyle style);
|
||||
void SetStipple(const wxBitmap& stipple);
|
||||
void SetDashes(int nb_dashes, const wxDash *dash);
|
||||
void SetJoin(wxPenJoin join);
|
||||
void SetCap(wxPenCap cap);
|
||||
void SetWidth(int width) wxOVERRIDE;
|
||||
void SetStyle(wxPenStyle style) wxOVERRIDE;
|
||||
void SetStipple(const wxBitmap& stipple) wxOVERRIDE;
|
||||
void SetDashes(int nb_dashes, const wxDash *dash) wxOVERRIDE;
|
||||
void SetJoin(wxPenJoin join) wxOVERRIDE;
|
||||
void SetCap(wxPenCap cap) wxOVERRIDE;
|
||||
|
||||
wxColour GetColour() const;
|
||||
int GetWidth() const;
|
||||
wxPenStyle GetStyle() const;
|
||||
wxPenJoin GetJoin() const;
|
||||
wxPenCap GetCap() const;
|
||||
int GetDashes(wxDash** ptr) const;
|
||||
wxColour GetColour() const wxOVERRIDE;
|
||||
int GetWidth() const wxOVERRIDE;
|
||||
wxPenStyle GetStyle() const wxOVERRIDE;
|
||||
wxPenJoin GetJoin() const wxOVERRIDE;
|
||||
wxPenCap GetCap() const wxOVERRIDE;
|
||||
int GetDashes(wxDash** ptr) const wxOVERRIDE;
|
||||
wxDash* GetDash() const;
|
||||
int GetDashCount() const;
|
||||
wxBitmap* GetStipple() const;
|
||||
wxBitmap* GetStipple() const wxOVERRIDE;
|
||||
|
||||
|
||||
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
|
||||
@ -60,14 +60,14 @@ public:
|
||||
|
||||
|
||||
// internal: wxGDIObject methods
|
||||
virtual bool RealizeResource();
|
||||
virtual bool FreeResource(bool force = false);
|
||||
virtual WXHANDLE GetResourceHandle() const;
|
||||
virtual bool IsFree() const;
|
||||
virtual bool RealizeResource() wxOVERRIDE;
|
||||
virtual bool FreeResource(bool force = false) wxOVERRIDE;
|
||||
virtual WXHANDLE GetResourceHandle() const wxOVERRIDE;
|
||||
virtual bool IsFree() const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
virtual wxGDIRefData* CreateGDIRefData() const;
|
||||
virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
|
||||
virtual wxGDIRefData* CreateGDIRefData() const wxOVERRIDE;
|
||||
virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const wxOVERRIDE;
|
||||
|
||||
// same as FreeResource() + RealizeResource()
|
||||
bool Recreate();
|
||||
|
||||
@ -25,14 +25,14 @@ public:
|
||||
|
||||
bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
|
||||
|
||||
virtual void SetFocus();
|
||||
virtual bool Show(bool show = true);
|
||||
virtual void SetFocus() wxOVERRIDE;
|
||||
virtual bool Show(bool show = true) wxOVERRIDE;
|
||||
|
||||
// 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()
|
||||
virtual WXHWND MSWGetParent() const;
|
||||
virtual WXHWND MSWGetParent() const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow);
|
||||
|
||||
@ -31,11 +31,11 @@ public:
|
||||
wxWindowsPrintNativeData();
|
||||
virtual ~wxWindowsPrintNativeData();
|
||||
|
||||
virtual bool TransferTo( wxPrintData &data );
|
||||
virtual bool TransferFrom( const wxPrintData &data );
|
||||
virtual bool TransferTo( wxPrintData &data ) wxOVERRIDE;
|
||||
virtual bool TransferFrom( const wxPrintData &data ) wxOVERRIDE;
|
||||
|
||||
virtual bool Ok() const { return IsOk(); }
|
||||
virtual bool IsOk() const;
|
||||
virtual bool Ok() const wxOVERRIDE { return IsOk(); }
|
||||
virtual bool IsOk() const wxOVERRIDE;
|
||||
|
||||
void InitializeDevMode(const wxString &printerName = wxEmptyString, WinPrinter* printer = NULL);
|
||||
void* GetDevMode() const { return m_devMode; }
|
||||
@ -65,12 +65,12 @@ public:
|
||||
virtual ~wxWindowsPrintDialog();
|
||||
|
||||
bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
|
||||
virtual int ShowModal();
|
||||
virtual int ShowModal() wxOVERRIDE;
|
||||
|
||||
wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
|
||||
wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
|
||||
wxPrintDialogData& GetPrintDialogData() wxOVERRIDE { return m_printDialogData; }
|
||||
wxPrintData& GetPrintData() wxOVERRIDE { return m_printDialogData.GetPrintData(); }
|
||||
|
||||
virtual wxDC *GetPrintDC();
|
||||
virtual wxDC *GetPrintDC() wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxPrintDialogData m_printDialogData;
|
||||
@ -102,11 +102,11 @@ public:
|
||||
virtual ~wxWindowsPageSetupDialog();
|
||||
|
||||
bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL);
|
||||
virtual int ShowModal();
|
||||
virtual int ShowModal() wxOVERRIDE;
|
||||
bool ConvertToNative( wxPageSetupDialogData &data );
|
||||
bool ConvertFromNative( wxPageSetupDialogData &data );
|
||||
|
||||
virtual wxPageSetupDialogData& GetPageSetupDialogData() { return m_pageSetupData; }
|
||||
virtual wxPageSetupDialogData& GetPageSetupDialogData() wxOVERRIDE { return m_pageSetupData; }
|
||||
|
||||
private:
|
||||
wxPageSetupDialogData m_pageSetupData;
|
||||
|
||||
@ -26,10 +26,10 @@ public:
|
||||
|
||||
virtual bool Print(wxWindow *parent,
|
||||
wxPrintout *printout,
|
||||
bool prompt = true);
|
||||
bool prompt = true) wxOVERRIDE;
|
||||
|
||||
virtual wxDC *PrintDialog(wxWindow *parent);
|
||||
virtual bool Setup(wxWindow *parent);
|
||||
virtual wxDC *PrintDialog(wxWindow *parent) wxOVERRIDE;
|
||||
virtual bool Setup(wxWindow *parent) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter);
|
||||
@ -51,12 +51,12 @@ public:
|
||||
wxPrintData *data);
|
||||
virtual ~wxWindowsPrintPreview();
|
||||
|
||||
virtual bool Print(bool interactive);
|
||||
virtual void DetermineScaling();
|
||||
virtual bool Print(bool interactive) wxOVERRIDE;
|
||||
virtual void DetermineScaling() wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
#if wxUSE_ENH_METAFILE
|
||||
virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum);
|
||||
virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum) wxOVERRIDE;
|
||||
#endif
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview);
|
||||
|
||||
@ -23,8 +23,8 @@ public:
|
||||
|
||||
virtual ~wxProgressDialog();
|
||||
|
||||
virtual bool Update(int value, const wxString& newmsg = wxEmptyString, bool *skip = NULL);
|
||||
virtual bool Pulse(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) wxOVERRIDE;
|
||||
|
||||
void Resume();
|
||||
|
||||
@ -38,15 +38,15 @@ public:
|
||||
bool WasSkipped() const;
|
||||
bool WasCancelled() const;
|
||||
|
||||
virtual void SetTitle(const wxString& title);
|
||||
virtual wxString GetTitle() const;
|
||||
virtual void SetTitle(const wxString& title) wxOVERRIDE;
|
||||
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)
|
||||
virtual void Update() { wxGenericProgressDialog::Update(); }
|
||||
virtual void Update() wxOVERRIDE { wxGenericProgressDialog::Update(); }
|
||||
|
||||
virtual WXWidget GetHandle() const;
|
||||
virtual WXWidget GetHandle() const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
// Performs common routines to Update() and Pulse(). Requires the
|
||||
|
||||
@ -82,41 +82,41 @@ public:
|
||||
const wxString& name = wxRadioBoxNameStr);
|
||||
|
||||
// implement the radiobox interface
|
||||
virtual void SetSelection(int n);
|
||||
virtual int GetSelection() const { return m_selectedButton; }
|
||||
virtual unsigned int GetCount() const;
|
||||
virtual wxString GetString(unsigned int n) const;
|
||||
virtual void SetString(unsigned int n, const wxString& label);
|
||||
virtual bool Enable(unsigned int n, bool enable = true);
|
||||
virtual bool Show(unsigned int n, bool show = true);
|
||||
virtual bool IsItemEnabled(unsigned int n) const;
|
||||
virtual bool IsItemShown(unsigned int n) const;
|
||||
virtual int GetItemFromPoint(const wxPoint& pt) const;
|
||||
virtual void SetSelection(int n) wxOVERRIDE;
|
||||
virtual int GetSelection() const wxOVERRIDE { return m_selectedButton; }
|
||||
virtual unsigned int GetCount() const wxOVERRIDE;
|
||||
virtual wxString GetString(unsigned int n) const wxOVERRIDE;
|
||||
virtual void SetString(unsigned int n, const wxString& label) wxOVERRIDE;
|
||||
virtual bool Enable(unsigned int n, bool enable = true) wxOVERRIDE;
|
||||
virtual bool Show(unsigned int n, bool show = true) wxOVERRIDE;
|
||||
virtual bool IsItemEnabled(unsigned int n) const wxOVERRIDE;
|
||||
virtual bool IsItemShown(unsigned int n) const wxOVERRIDE;
|
||||
virtual int GetItemFromPoint(const wxPoint& pt) const wxOVERRIDE;
|
||||
|
||||
// override some base class methods
|
||||
virtual bool Show(bool show = true);
|
||||
virtual bool Enable(bool enable = true);
|
||||
virtual bool CanBeFocused() const;
|
||||
virtual void SetFocus();
|
||||
virtual bool SetFont(const wxFont& font);
|
||||
virtual bool ContainsHWND(WXHWND hWnd) const;
|
||||
virtual bool SetForegroundColour(const wxColour& colour);
|
||||
virtual bool SetBackgroundColour(const wxColour& colour);
|
||||
virtual bool Show(bool show = true) wxOVERRIDE;
|
||||
virtual bool Enable(bool enable = true) wxOVERRIDE;
|
||||
virtual bool CanBeFocused() const wxOVERRIDE;
|
||||
virtual void SetFocus() wxOVERRIDE;
|
||||
virtual bool SetFont(const wxFont& font) wxOVERRIDE;
|
||||
virtual bool ContainsHWND(WXHWND hWnd) const wxOVERRIDE;
|
||||
virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE;
|
||||
virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE;
|
||||
#if wxUSE_TOOLTIPS
|
||||
virtual bool HasToolTips() const;
|
||||
virtual bool HasToolTips() const wxOVERRIDE;
|
||||
#endif // wxUSE_TOOLTIPS
|
||||
#if wxUSE_HELP
|
||||
// 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 );
|
||||
}
|
||||
#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
|
||||
virtual bool CanApplyThemeBorder() const { return false; }
|
||||
virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
|
||||
|
||||
void SetLabelFont(const wxFont& WXUNUSED(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.
|
||||
static wxRadioBox *GetFromRadioButtonHWND(WXHWND hwnd);
|
||||
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id);
|
||||
void Command(wxCommandEvent& event);
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
|
||||
void Command(wxCommandEvent& event) wxOVERRIDE;
|
||||
|
||||
void SendNotificationEvent();
|
||||
|
||||
@ -152,18 +152,18 @@ protected:
|
||||
|
||||
virtual void DoSetSize(int x, int y,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
virtual void DoMoveWindow(int x, int y, int width, int height);
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
|
||||
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
|
||||
#if wxUSE_TOOLTIPS
|
||||
virtual void DoSetItemToolTip(unsigned int n, wxToolTip * tooltip);
|
||||
virtual void DoSetItemToolTip(unsigned int n, wxToolTip * tooltip) wxOVERRIDE;
|
||||
#endif
|
||||
|
||||
virtual WXHRGN MSWGetRegionWithoutChildren();
|
||||
virtual WXHRGN MSWGetRegionWithoutChildren() wxOVERRIDE;
|
||||
|
||||
// resolve ambiguity in base classes
|
||||
virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); }
|
||||
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxRadioBoxBase::GetDefaultBorder(); }
|
||||
|
||||
// the buttons we contain
|
||||
wxSubwindows *m_radioButtons;
|
||||
|
||||
@ -47,16 +47,16 @@ public:
|
||||
virtual bool GetValue() const;
|
||||
|
||||
// implementation only from now on
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id);
|
||||
virtual void Command(wxCommandEvent& event);
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
|
||||
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:
|
||||
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
|
||||
// Implement wxMSWOwnerDrawnButtonBase methods.
|
||||
virtual int MSWGetButtonStyle() const wxOVERRIDE;
|
||||
|
||||
@ -42,36 +42,36 @@ public:
|
||||
// ------------------------------------------
|
||||
|
||||
// path management
|
||||
virtual void SetPath(const wxString& strPath);
|
||||
virtual const wxString& GetPath() const { return m_strPath; }
|
||||
virtual void SetPath(const wxString& strPath) wxOVERRIDE;
|
||||
virtual const wxString& GetPath() const wxOVERRIDE { return m_strPath; }
|
||||
|
||||
// entry/subgroup info
|
||||
// enumerate all of them
|
||||
virtual bool GetFirstGroup(wxString& str, long& lIndex) const;
|
||||
virtual bool GetNextGroup (wxString& str, long& lIndex) const;
|
||||
virtual bool GetFirstEntry(wxString& str, long& lIndex) const;
|
||||
virtual bool GetNextEntry (wxString& str, long& lIndex) const;
|
||||
virtual bool GetFirstGroup(wxString& str, long& lIndex) const wxOVERRIDE;
|
||||
virtual bool GetNextGroup (wxString& str, long& lIndex) const wxOVERRIDE;
|
||||
virtual bool GetFirstEntry(wxString& str, long& lIndex) const wxOVERRIDE;
|
||||
virtual bool GetNextEntry (wxString& str, long& lIndex) const wxOVERRIDE;
|
||||
|
||||
// tests for existence
|
||||
virtual bool HasGroup(const wxString& strName) const;
|
||||
virtual bool HasEntry(const wxString& strName) const;
|
||||
virtual EntryType GetEntryType(const wxString& name) const;
|
||||
virtual bool HasGroup(const wxString& strName) const wxOVERRIDE;
|
||||
virtual bool HasEntry(const wxString& strName) const wxOVERRIDE;
|
||||
virtual EntryType GetEntryType(const wxString& name) const wxOVERRIDE;
|
||||
|
||||
// get number of entries/subgroups in the current group, with or without
|
||||
// it's subgroups
|
||||
virtual size_t GetNumberOfEntries(bool bRecursive = false) const;
|
||||
virtual size_t GetNumberOfGroups(bool bRecursive = false) const;
|
||||
virtual size_t GetNumberOfEntries(bool bRecursive = false) const wxOVERRIDE;
|
||||
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
|
||||
virtual bool RenameEntry(const wxString& oldName, const wxString& newName);
|
||||
virtual bool RenameGroup(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) wxOVERRIDE;
|
||||
|
||||
// delete
|
||||
virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true);
|
||||
virtual bool DeleteGroup(const wxString& key);
|
||||
virtual bool DeleteAll();
|
||||
virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true) wxOVERRIDE;
|
||||
virtual bool DeleteGroup(const wxString& key) wxOVERRIDE;
|
||||
virtual bool DeleteAll() wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
// opens the local key creating it if necessary and returns it
|
||||
@ -89,13 +89,13 @@ protected:
|
||||
}
|
||||
|
||||
// implement read/write methods
|
||||
virtual bool DoReadString(const wxString& key, wxString *pStr) const;
|
||||
virtual bool DoReadLong(const wxString& key, long *plResult) const;
|
||||
virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const;
|
||||
virtual bool DoReadString(const wxString& key, wxString *pStr) const wxOVERRIDE;
|
||||
virtual bool DoReadLong(const wxString& key, long *plResult) const wxOVERRIDE;
|
||||
virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const wxOVERRIDE;
|
||||
|
||||
virtual bool DoWriteString(const wxString& key, const wxString& szValue);
|
||||
virtual bool DoWriteLong(const wxString& key, long lValue);
|
||||
virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf);
|
||||
virtual bool DoWriteString(const wxString& key, const wxString& szValue) wxOVERRIDE;
|
||||
virtual bool DoWriteLong(const wxString& key, long lValue) wxOVERRIDE;
|
||||
virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
// these keys are opened during all lifetime of wxRegConfig object
|
||||
|
||||
@ -35,23 +35,23 @@ public:
|
||||
virtual ~wxRegion();
|
||||
|
||||
// wxRegionBase methods
|
||||
virtual void Clear();
|
||||
virtual bool IsEmpty() const;
|
||||
virtual void Clear() wxOVERRIDE;
|
||||
virtual bool IsEmpty() const wxOVERRIDE;
|
||||
|
||||
// Get internal region handle
|
||||
WXHRGN GetHRGN() const;
|
||||
|
||||
protected:
|
||||
virtual wxGDIRefData *CreateGDIRefData() const;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
|
||||
virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
|
||||
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
|
||||
|
||||
virtual bool DoIsEqual(const wxRegion& region) const;
|
||||
virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
|
||||
virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
|
||||
virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
|
||||
virtual bool DoIsEqual(const wxRegion& region) const wxOVERRIDE;
|
||||
virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const wxOVERRIDE;
|
||||
virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const wxOVERRIDE;
|
||||
virtual wxRegionContain DoContainsRect(const wxRect& rect) const wxOVERRIDE;
|
||||
|
||||
virtual bool DoOffset(wxCoord x, wxCoord y);
|
||||
virtual bool DoCombine(const wxRegion& region, wxRegionOp op);
|
||||
virtual bool DoOffset(wxCoord x, wxCoord y) wxOVERRIDE;
|
||||
virtual bool DoCombine(const wxRegion& region, wxRegionOp op) wxOVERRIDE;
|
||||
|
||||
friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
|
||||
|
||||
|
||||
@ -34,34 +34,34 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxScrollBarNameStr);
|
||||
|
||||
int GetThumbPosition() const ;
|
||||
int GetThumbSize() const { return m_pageSize; }
|
||||
int GetPageSize() const { return m_viewSize; }
|
||||
int GetRange() const { return m_objectSize; }
|
||||
int GetThumbPosition() const wxOVERRIDE;
|
||||
int GetThumbSize() const wxOVERRIDE { return m_pageSize; }
|
||||
int GetPageSize() const wxOVERRIDE { return m_viewSize; }
|
||||
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,
|
||||
bool refresh = true);
|
||||
bool refresh = true) wxOVERRIDE;
|
||||
|
||||
// needed for RTTI
|
||||
void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; }
|
||||
void SetPageSize( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , GetRange() , s , 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,
|
||||
WXWORD pos, WXHWND control);
|
||||
WXWORD pos, WXHWND control) wxOVERRIDE;
|
||||
|
||||
// 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
|
||||
virtual bool CanApplyThemeBorder() const { return false; }
|
||||
virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
|
||||
int m_pageSize;
|
||||
int m_viewSize;
|
||||
|
||||
@ -49,52 +49,52 @@ public:
|
||||
virtual ~wxSlider();
|
||||
|
||||
// slider methods
|
||||
virtual int GetValue() const;
|
||||
virtual void SetValue(int);
|
||||
virtual int GetValue() const wxOVERRIDE;
|
||||
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 GetMax() const { return m_rangeMax; }
|
||||
int GetMin() const wxOVERRIDE { return m_rangeMin; }
|
||||
int GetMax() const wxOVERRIDE { return m_rangeMax; }
|
||||
|
||||
// Win32-specific slider methods
|
||||
int GetTickFreq() const { return m_tickFreq; }
|
||||
void SetPageSize(int pageSize);
|
||||
int GetPageSize() const;
|
||||
void ClearSel();
|
||||
void ClearTicks();
|
||||
void SetLineSize(int lineSize);
|
||||
int GetLineSize() const;
|
||||
int GetSelEnd() const;
|
||||
int GetSelStart() const;
|
||||
void SetSelection(int minPos, int maxPos);
|
||||
void SetThumbLength(int len);
|
||||
int GetThumbLength() const;
|
||||
void SetTick(int tickPos);
|
||||
int GetTickFreq() const wxOVERRIDE { return m_tickFreq; }
|
||||
void SetPageSize(int pageSize) wxOVERRIDE;
|
||||
int GetPageSize() const wxOVERRIDE;
|
||||
void ClearSel() wxOVERRIDE;
|
||||
void ClearTicks() wxOVERRIDE;
|
||||
void SetLineSize(int lineSize) wxOVERRIDE;
|
||||
int GetLineSize() const wxOVERRIDE;
|
||||
int GetSelEnd() const wxOVERRIDE;
|
||||
int GetSelStart() const wxOVERRIDE;
|
||||
void SetSelection(int minPos, int maxPos) wxOVERRIDE;
|
||||
void SetThumbLength(int len) wxOVERRIDE;
|
||||
int GetThumbLength() const wxOVERRIDE;
|
||||
void SetTick(int tickPos) wxOVERRIDE;
|
||||
|
||||
// implementation only from now on
|
||||
WXHWND GetStaticMin() const;
|
||||
WXHWND GetStaticMax() 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)
|
||||
virtual bool HasTransparentBackground() { return true; }
|
||||
virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
|
||||
|
||||
// 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,
|
||||
WXWORD pos, WXHWND control);
|
||||
WXWORD pos, WXHWND control) wxOVERRIDE;
|
||||
|
||||
virtual bool Show(bool show = true);
|
||||
virtual bool Enable(bool show = true);
|
||||
virtual bool SetFont(const wxFont& font);
|
||||
virtual bool SetForegroundColour(const wxColour& colour);
|
||||
virtual bool SetBackgroundColour(const wxColour& colour);
|
||||
virtual bool Show(bool show = true) wxOVERRIDE;
|
||||
virtual bool Enable(bool show = true) wxOVERRIDE;
|
||||
virtual bool SetFont(const wxFont& font) wxOVERRIDE;
|
||||
virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE;
|
||||
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:
|
||||
// common part of all ctors
|
||||
@ -115,10 +115,10 @@ protected:
|
||||
|
||||
|
||||
// overridden base class virtuals
|
||||
virtual void DoGetPosition(int *x, int *y) const;
|
||||
virtual void DoGetSize(int *width, int *height) const;
|
||||
virtual void DoMoveWindow(int x, int y, int width, int height);
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual void DoGetPosition(int *x, int *y) const wxOVERRIDE;
|
||||
virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
|
||||
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
|
||||
WXHBRUSH DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd) wxOVERRIDE;
|
||||
|
||||
@ -140,7 +140,7 @@ protected:
|
||||
bool m_isDragging;
|
||||
|
||||
// Platform-specific implementation of SetTickFreq
|
||||
virtual void DoSetTickFreq(int freq);
|
||||
virtual void DoSetTickFreq(int freq) wxOVERRIDE;
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider);
|
||||
};
|
||||
|
||||
@ -36,7 +36,7 @@ protected:
|
||||
bool CheckCreatedOk();
|
||||
void Free();
|
||||
|
||||
virtual bool DoPlay(unsigned flags) const;
|
||||
virtual bool DoPlay(unsigned flags) const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
// data of this object
|
||||
|
||||
@ -43,24 +43,24 @@ public:
|
||||
|
||||
|
||||
// accessors
|
||||
virtual int GetValue() const;
|
||||
virtual void SetValue(int val);
|
||||
virtual void SetRange(int minVal, int maxVal);
|
||||
virtual int GetValue() const wxOVERRIDE;
|
||||
virtual void SetValue(int val) wxOVERRIDE;
|
||||
virtual void SetRange(int minVal, int maxVal) wxOVERRIDE;
|
||||
|
||||
// implementation
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id);
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
|
||||
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
|
||||
virtual bool AcceptsFocus() const { return false; }
|
||||
virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
|
||||
|
||||
// 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:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
|
||||
// ensure that the control displays a value in the current range
|
||||
virtual void NormalizeValue();
|
||||
|
||||
@ -71,22 +71,22 @@ public:
|
||||
|
||||
virtual ~wxSpinCtrl();
|
||||
|
||||
virtual void SetValue(int val);
|
||||
virtual int GetValue() const;
|
||||
virtual void SetRange(int minVal, int maxVal);
|
||||
virtual bool SetFont(const wxFont &font);
|
||||
virtual void SetFocus();
|
||||
virtual void SetValue(int val) wxOVERRIDE;
|
||||
virtual int GetValue() const wxOVERRIDE;
|
||||
virtual void SetRange(int minVal, int maxVal) wxOVERRIDE;
|
||||
virtual bool SetFont(const wxFont &font) wxOVERRIDE;
|
||||
virtual void SetFocus() wxOVERRIDE;
|
||||
|
||||
virtual bool Enable(bool enable = true);
|
||||
virtual bool Show(bool show = true);
|
||||
virtual bool Enable(bool enable = true) wxOVERRIDE;
|
||||
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
|
||||
virtual bool AcceptsFocus() const { return wxWindow::AcceptsFocus(); }
|
||||
virtual bool AcceptsFocus() const wxOVERRIDE { return wxWindow::AcceptsFocus(); }
|
||||
|
||||
// we're like wxTextCtrl and not (default) wxButton
|
||||
virtual wxVisualAttributes GetDefaultAttributes() const
|
||||
virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
|
||||
{
|
||||
return GetClassDefaultAttributes(GetWindowVariant());
|
||||
}
|
||||
@ -109,24 +109,24 @@ public:
|
||||
bool ProcessTextCommand(WXWORD cmd, WXWORD id);
|
||||
|
||||
// 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;
|
||||
|
||||
protected:
|
||||
virtual void DoGetPosition(int *x, int *y) const;
|
||||
virtual void DoMoveWindow(int x, int y, int width, int height);
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
|
||||
virtual void DoGetSize(int *width, int *height) const;
|
||||
virtual void DoGetClientSize(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) wxOVERRIDE;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE;
|
||||
virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
|
||||
virtual void DoGetClientSize(int *x, int *y) const wxOVERRIDE;
|
||||
#if wxUSE_TOOLTIPS
|
||||
virtual void DoSetToolTip( wxToolTip *tip );
|
||||
virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE;
|
||||
#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,
|
||||
WXWORD pos, WXHWND control);
|
||||
WXWORD pos, WXHWND control) wxOVERRIDE;
|
||||
|
||||
// handle processing of special keys
|
||||
void OnChar(wxKeyEvent& event);
|
||||
@ -137,7 +137,7 @@ protected:
|
||||
void SendSpinUpdate(int value);
|
||||
|
||||
// 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
|
||||
// changed anything in fact -- this is why we need this field)
|
||||
|
||||
@ -46,18 +46,18 @@ public:
|
||||
|
||||
virtual ~wxStaticBitmap() { Free(); }
|
||||
|
||||
virtual void SetIcon(const wxIcon& icon) { SetImage(&icon); }
|
||||
virtual void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); }
|
||||
virtual wxBitmap GetBitmap() const;
|
||||
virtual wxIcon GetIcon() const;
|
||||
virtual void SetIcon(const wxIcon& icon) wxOVERRIDE { SetImage(&icon); }
|
||||
virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE { SetImage(&bitmap); }
|
||||
virtual wxBitmap GetBitmap() const wxOVERRIDE;
|
||||
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
|
||||
virtual bool CanApplyThemeBorder() const { return false; }
|
||||
virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestClientSize() const;
|
||||
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
|
||||
|
||||
// ctor/dtor helpers
|
||||
void Init();
|
||||
|
||||
@ -35,18 +35,18 @@ public:
|
||||
const wxString& name = wxStaticBoxNameStr);
|
||||
|
||||
/// 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
|
||||
virtual bool CanApplyThemeBorder() const { return false; }
|
||||
virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
|
||||
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
|
||||
public:
|
||||
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
||||
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
// return the region with all the windows inside this static box excluded
|
||||
|
||||
@ -38,10 +38,10 @@ public:
|
||||
const wxString &name = wxStaticLineNameStr );
|
||||
|
||||
// overridden base class virtuals
|
||||
virtual bool AcceptsFocus() const { return false; }
|
||||
virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
|
||||
|
||||
// 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);
|
||||
};
|
||||
|
||||
@ -36,19 +36,19 @@ public:
|
||||
const wxString& name = wxStaticTextNameStr);
|
||||
|
||||
// override some methods to resize the window properly
|
||||
virtual void SetLabel(const wxString& label);
|
||||
virtual bool SetFont( const wxFont &font );
|
||||
virtual void SetLabel(const wxString& label) wxOVERRIDE;
|
||||
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:
|
||||
// implement/override some base class virtuals
|
||||
virtual void DoSetSize(int x, int y, int w, int h,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
virtual wxSize DoGetBestClientSize() const;
|
||||
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
|
||||
virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
|
||||
|
||||
virtual wxString DoGetLabel() const;
|
||||
virtual void DoSetLabel(const wxString& str);
|
||||
virtual wxString DoGetLabel() const wxOVERRIDE;
|
||||
virtual void DoSetLabel(const wxString& str) wxOVERRIDE;
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText);
|
||||
};
|
||||
|
||||
@ -40,33 +40,33 @@ public:
|
||||
virtual ~wxStatusBar();
|
||||
|
||||
// implement base class methods
|
||||
virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
|
||||
virtual void SetStatusWidths(int n, const int widths_field[]);
|
||||
virtual void SetStatusStyles(int n, const int styles[]);
|
||||
virtual void SetMinHeight(int height);
|
||||
virtual bool GetFieldRect(int i, wxRect& rect) const;
|
||||
virtual void SetFieldsCount(int number = 1, const int *widths = NULL) wxOVERRIDE;
|
||||
virtual void SetStatusWidths(int n, const int widths_field[]) wxOVERRIDE;
|
||||
virtual void SetStatusStyles(int n, const int styles[]) wxOVERRIDE;
|
||||
virtual void SetMinHeight(int height) wxOVERRIDE;
|
||||
virtual bool GetFieldRect(int i, wxRect& rect) const wxOVERRIDE;
|
||||
|
||||
virtual int GetBorderX() const;
|
||||
virtual int GetBorderY() const;
|
||||
virtual int GetBorderX() const wxOVERRIDE;
|
||||
virtual int GetBorderY() const wxOVERRIDE;
|
||||
|
||||
// override some wxWindow virtual methods too
|
||||
virtual bool SetFont(const wxFont& font);
|
||||
virtual bool SetFont(const wxFont& font) wxOVERRIDE;
|
||||
|
||||
virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
|
||||
WXWPARAM wParam,
|
||||
WXLPARAM lParam);
|
||||
WXLPARAM lParam) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
// implement base class pure virtual method
|
||||
virtual void DoUpdateStatusText(int number);
|
||||
virtual void DoUpdateStatusText(int number) wxOVERRIDE;
|
||||
|
||||
// override some base class virtuals
|
||||
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual void DoMoveWindow(int x, int y, int width, int height);
|
||||
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
|
||||
#if wxUSE_TOOLTIPS
|
||||
virtual bool MSWProcessMessage(WXMSG* pMsg);
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result);
|
||||
virtual bool MSWProcessMessage(WXMSG* pMsg) wxOVERRIDE;
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) wxOVERRIDE;
|
||||
#endif
|
||||
|
||||
// implementation of the public SetStatusWidths()
|
||||
|
||||
@ -21,13 +21,13 @@ class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
|
||||
{
|
||||
public:
|
||||
// implement base class pure virtuals
|
||||
virtual wxString GetExecutablePath() const;
|
||||
virtual wxString GetConfigDir() const;
|
||||
virtual wxString GetUserConfigDir() const;
|
||||
virtual wxString GetDataDir() const;
|
||||
virtual wxString GetUserDataDir() const;
|
||||
virtual wxString GetUserLocalDataDir() const;
|
||||
virtual wxString GetPluginsDir() const;
|
||||
virtual wxString GetExecutablePath() const wxOVERRIDE;
|
||||
virtual wxString GetConfigDir() const wxOVERRIDE;
|
||||
virtual wxString GetUserConfigDir() const wxOVERRIDE;
|
||||
virtual wxString GetDataDir() const wxOVERRIDE;
|
||||
virtual wxString GetUserDataDir() const wxOVERRIDE;
|
||||
virtual wxString GetUserLocalDataDir() const wxOVERRIDE;
|
||||
virtual wxString GetPluginsDir() const wxOVERRIDE;
|
||||
virtual wxString GetUserDir(Dir userDir) const wxOVERRIDE;
|
||||
|
||||
|
||||
@ -92,8 +92,8 @@ protected:
|
||||
class WXDLLIMPEXP_BASE wxStandardPathsWin16 : public wxStandardPaths
|
||||
{
|
||||
public:
|
||||
virtual wxString GetConfigDir() const;
|
||||
virtual wxString GetUserConfigDir() const;
|
||||
virtual wxString GetConfigDir() const wxOVERRIDE;
|
||||
virtual wxString GetUserConfigDir() const wxOVERRIDE;
|
||||
};
|
||||
|
||||
#endif // _WX_MSW_STDPATHS_H_
|
||||
|
||||
@ -28,9 +28,9 @@ public:
|
||||
bool IsIconInstalled() const { return m_iconAdded; }
|
||||
|
||||
// Operations
|
||||
bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);
|
||||
bool RemoveIcon(void);
|
||||
bool PopupMenu(wxMenu *menu);
|
||||
bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString) wxOVERRIDE;
|
||||
bool RemoveIcon(void) wxOVERRIDE;
|
||||
bool PopupMenu(wxMenu *menu) wxOVERRIDE;
|
||||
|
||||
// MSW-specific class methods
|
||||
|
||||
|
||||
@ -43,58 +43,58 @@ public:
|
||||
// overridden wxTextEntry methods
|
||||
// ------------------------------
|
||||
|
||||
virtual wxString GetValue() const;
|
||||
virtual wxString GetRange(long from, long to) const;
|
||||
virtual wxString GetValue() const wxOVERRIDE;
|
||||
virtual wxString GetRange(long from, long to) const wxOVERRIDE;
|
||||
|
||||
virtual bool IsEmpty() const;
|
||||
|
||||
virtual void WriteText(const wxString& text);
|
||||
virtual void AppendText(const wxString& text);
|
||||
virtual void Clear();
|
||||
virtual void WriteText(const wxString& text) wxOVERRIDE;
|
||||
virtual void AppendText(const wxString& text) wxOVERRIDE;
|
||||
virtual void Clear() wxOVERRIDE;
|
||||
|
||||
virtual int GetLineLength(long lineNo) const;
|
||||
virtual wxString GetLineText(long lineNo) const;
|
||||
virtual int GetNumberOfLines() const;
|
||||
virtual int GetLineLength(long lineNo) const wxOVERRIDE;
|
||||
virtual wxString GetLineText(long lineNo) const wxOVERRIDE;
|
||||
virtual int GetNumberOfLines() const wxOVERRIDE;
|
||||
|
||||
virtual 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 bool CanRedo() const;
|
||||
virtual void Redo() wxOVERRIDE;
|
||||
virtual bool CanRedo() const wxOVERRIDE;
|
||||
|
||||
virtual void SetInsertionPointEnd();
|
||||
virtual long GetInsertionPoint() const;
|
||||
virtual wxTextPos GetLastPosition() const;
|
||||
virtual void SetInsertionPointEnd() wxOVERRIDE;
|
||||
virtual long GetInsertionPoint() const wxOVERRIDE;
|
||||
virtual wxTextPos GetLastPosition() const wxOVERRIDE;
|
||||
|
||||
// implement base class pure virtuals
|
||||
// ----------------------------------
|
||||
|
||||
virtual bool IsModified() const;
|
||||
virtual void MarkDirty();
|
||||
virtual void DiscardEdits();
|
||||
virtual bool IsModified() const wxOVERRIDE;
|
||||
virtual void MarkDirty() wxOVERRIDE;
|
||||
virtual void DiscardEdits() wxOVERRIDE;
|
||||
|
||||
virtual bool EmulateKeyPress(const wxKeyEvent& event);
|
||||
virtual bool EmulateKeyPress(const wxKeyEvent& event) wxOVERRIDE;
|
||||
|
||||
#if wxUSE_RICHEDIT
|
||||
// apply text attribute to the range of text (only works with richedit
|
||||
// controls)
|
||||
virtual bool SetStyle(long start, long end, const wxTextAttr& style);
|
||||
virtual bool SetDefaultStyle(const wxTextAttr& style);
|
||||
virtual bool GetStyle(long position, wxTextAttr& style);
|
||||
virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE;
|
||||
virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE;
|
||||
virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE;
|
||||
#endif // wxUSE_RICHEDIT
|
||||
|
||||
// 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
|
||||
// which represent column and line.
|
||||
virtual long XYToPosition(long x, long y) const;
|
||||
virtual bool PositionToXY(long pos, long *x, long *y) const;
|
||||
virtual long XYToPosition(long x, long y) const wxOVERRIDE;
|
||||
virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE;
|
||||
|
||||
virtual void ShowPosition(long pos);
|
||||
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const;
|
||||
virtual void ShowPosition(long pos) wxOVERRIDE;
|
||||
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE;
|
||||
virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
|
||||
wxTextCoord *col,
|
||||
wxTextCoord *row) const
|
||||
wxTextCoord *row) const wxOVERRIDE
|
||||
{
|
||||
return wxTextCtrlBase::HitTest(pt, col, row);
|
||||
}
|
||||
@ -110,26 +110,26 @@ public:
|
||||
// --------------------------
|
||||
|
||||
#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
|
||||
|
||||
virtual void SetWindowStyleFlag(long style);
|
||||
virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
|
||||
|
||||
virtual void Command(wxCommandEvent& event);
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id);
|
||||
virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd);
|
||||
virtual void Command(wxCommandEvent& event) wxOVERRIDE;
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
|
||||
virtual WXHBRUSH MSWControlColor(WXHDC hDC, WXHWND hWnd) wxOVERRIDE;
|
||||
|
||||
#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; }
|
||||
bool IsRich() const { return m_verRichEdit != 0; }
|
||||
|
||||
// rich edit controls are not compatible with normal ones and we must set
|
||||
// the colours and font for them otherwise
|
||||
virtual bool SetBackgroundColour(const wxColour& colour);
|
||||
virtual bool SetForegroundColour(const wxColour& colour);
|
||||
virtual bool SetFont(const wxFont& font);
|
||||
virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE;
|
||||
virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE;
|
||||
virtual bool SetFont(const wxFont& font) wxOVERRIDE;
|
||||
#else
|
||||
bool IsRich() const { return false; }
|
||||
#endif // wxUSE_RICHEDIT
|
||||
@ -140,12 +140,12 @@ public:
|
||||
bool IsInkEdit() const { return false; }
|
||||
#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
|
||||
virtual bool CanApplyThemeBorder() const;
|
||||
virtual bool CanApplyThemeBorder() const wxOVERRIDE;
|
||||
|
||||
// callbacks
|
||||
void OnDropFiles(wxDropFilesEvent& event);
|
||||
@ -184,10 +184,10 @@ public:
|
||||
virtual bool MSWHandleMessage(WXLRESULT *result,
|
||||
WXUINT message,
|
||||
WXWPARAM wParam,
|
||||
WXLPARAM lParam);
|
||||
WXLPARAM lParam) wxOVERRIDE;
|
||||
|
||||
virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);
|
||||
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
|
||||
virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg) wxOVERRIDE;
|
||||
virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
// common part of all ctors
|
||||
@ -202,9 +202,9 @@ protected:
|
||||
const wxPoint& pos,
|
||||
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.
|
||||
// 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);
|
||||
|
||||
// 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
|
||||
// position
|
||||
@ -234,8 +234,8 @@ protected:
|
||||
// send TEXT_UPDATED event, return true if it was handled, false otherwise
|
||||
bool SendUpdateEvent();
|
||||
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE;
|
||||
|
||||
#if wxUSE_RICHEDIT
|
||||
// Apply the character-related parts of wxTextAttr to the given selection
|
||||
@ -266,14 +266,14 @@ protected:
|
||||
int m_updatesCount;
|
||||
|
||||
private:
|
||||
virtual void EnableTextChangedEvents(bool enable)
|
||||
virtual void EnableTextChangedEvents(bool enable) wxOVERRIDE
|
||||
{
|
||||
m_updatesCount = enable ? -1 : -2;
|
||||
}
|
||||
|
||||
// implement wxTextEntry pure virtual: it implements all the operations for
|
||||
// the simple EDIT controls
|
||||
virtual WXHWND GetEditHWND() const { return m_hWnd; }
|
||||
virtual WXHWND GetEditHWND() const wxOVERRIDE { return m_hWnd; }
|
||||
|
||||
void OnKeyDown(wxKeyEvent& event);
|
||||
|
||||
|
||||
@ -23,39 +23,39 @@ public:
|
||||
virtual ~wxTextEntry();
|
||||
|
||||
// implement wxTextEntryBase pure virtual methods
|
||||
virtual void WriteText(const wxString& text);
|
||||
virtual void Remove(long from, long to);
|
||||
virtual void WriteText(const wxString& text) wxOVERRIDE;
|
||||
virtual void Remove(long from, long to) wxOVERRIDE;
|
||||
|
||||
virtual void Copy();
|
||||
virtual void Cut();
|
||||
virtual void Paste();
|
||||
virtual void Copy() wxOVERRIDE;
|
||||
virtual void Cut() wxOVERRIDE;
|
||||
virtual void Paste() wxOVERRIDE;
|
||||
|
||||
virtual void Undo();
|
||||
virtual void Redo();
|
||||
virtual bool CanUndo() const;
|
||||
virtual bool CanRedo() const;
|
||||
virtual void Undo() wxOVERRIDE;
|
||||
virtual void Redo() wxOVERRIDE;
|
||||
virtual bool CanUndo() const wxOVERRIDE;
|
||||
virtual bool CanRedo() const wxOVERRIDE;
|
||||
|
||||
virtual void SetInsertionPoint(long pos);
|
||||
virtual long GetInsertionPoint() const;
|
||||
virtual long GetLastPosition() const;
|
||||
virtual void SetInsertionPoint(long pos) wxOVERRIDE;
|
||||
virtual long GetInsertionPoint() const wxOVERRIDE;
|
||||
virtual long GetLastPosition() const wxOVERRIDE;
|
||||
|
||||
virtual void SetSelection(long from, long to)
|
||||
virtual void SetSelection(long from, long to) wxOVERRIDE
|
||||
{ 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 void SetEditable(bool editable);
|
||||
virtual bool IsEditable() const wxOVERRIDE;
|
||||
virtual void SetEditable(bool editable) wxOVERRIDE;
|
||||
|
||||
virtual void SetMaxLength(unsigned long len);
|
||||
virtual void ForceUpper();
|
||||
virtual void SetMaxLength(unsigned long len) wxOVERRIDE;
|
||||
virtual void ForceUpper() wxOVERRIDE;
|
||||
|
||||
#if wxUSE_UXTHEME
|
||||
virtual bool SetHint(const wxString& hint);
|
||||
virtual wxString GetHint() const;
|
||||
virtual bool SetHint(const wxString& hint) wxOVERRIDE;
|
||||
virtual wxString GetHint() const wxOVERRIDE;
|
||||
#endif // wxUSE_UXTHEME
|
||||
|
||||
protected:
|
||||
virtual wxString DoGetValue() const;
|
||||
virtual wxString DoGetValue() const wxOVERRIDE;
|
||||
|
||||
// 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
|
||||
@ -68,17 +68,17 @@ protected:
|
||||
virtual void DoSetSelection(long from, long to, int flags = SetSel_Scroll);
|
||||
|
||||
// margins functions
|
||||
virtual bool DoSetMargins(const wxPoint& pt);
|
||||
virtual wxPoint DoGetMargins() const;
|
||||
virtual bool DoSetMargins(const wxPoint& pt) wxOVERRIDE;
|
||||
virtual wxPoint DoGetMargins() const wxOVERRIDE;
|
||||
|
||||
// auto-completion uses COM under Windows so they won't work without
|
||||
// wxUSE_OLE as OleInitialize() is not called then
|
||||
#if wxUSE_OLE
|
||||
virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
|
||||
virtual bool DoAutoCompleteStrings(const wxArrayString& choices) wxOVERRIDE;
|
||||
#if wxUSE_DYNLIB_CLASS
|
||||
virtual bool DoAutoCompleteFileNames(int flags);
|
||||
virtual bool DoAutoCompleteFileNames(int flags) wxOVERRIDE;
|
||||
#endif // wxUSE_DYNLIB_CLASS
|
||||
virtual bool DoAutoCompleteCustom(wxTextCompleter *completer);
|
||||
virtual bool DoAutoCompleteCustom(wxTextCompleter *completer) wxOVERRIDE;
|
||||
#endif // wxUSE_OLE
|
||||
|
||||
private:
|
||||
|
||||
@ -40,21 +40,21 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxCheckBoxNameStr);
|
||||
|
||||
virtual void SetValue(bool value);
|
||||
virtual bool GetValue() const ;
|
||||
virtual void SetValue(bool value) wxOVERRIDE;
|
||||
virtual bool GetValue() const wxOVERRIDE;
|
||||
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id);
|
||||
virtual void Command(wxCommandEvent& event);
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
|
||||
virtual void Command(wxCommandEvent& event) wxOVERRIDE;
|
||||
|
||||
// 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:
|
||||
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();
|
||||
|
||||
@ -100,7 +100,7 @@ public:
|
||||
wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap),
|
||||
SetBitmapLabel(bitmap); )
|
||||
// prevent virtual function hiding
|
||||
virtual void SetLabel(const wxString& label) { wxToggleButton::SetLabel(label); }
|
||||
virtual void SetLabel(const wxString& label) wxOVERRIDE { wxToggleButton::SetLabel(label); }
|
||||
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS(wxBitmapToggleButton);
|
||||
|
||||
@ -47,14 +47,14 @@ public:
|
||||
}
|
||||
|
||||
// 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:
|
||||
#if wxUSE_INTL
|
||||
virtual wxLocaleInfo MSWGetFormat() const;
|
||||
virtual wxLocaleInfo MSWGetFormat() const wxOVERRIDE;
|
||||
#endif // wxUSE_INTL
|
||||
virtual bool MSWAllowsNone() const { return false; }
|
||||
virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch);
|
||||
virtual bool MSWAllowsNone() const wxOVERRIDE { return false; }
|
||||
virtual bool MSWOnDateTimeChange(const tagNMDATETIMECHANGE& dtch) wxOVERRIDE;
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl);
|
||||
};
|
||||
|
||||
@ -44,47 +44,47 @@ public:
|
||||
virtual ~wxToolBar();
|
||||
|
||||
// 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 wxSize GetToolSize() const;
|
||||
virtual void SetToolBitmapSize(const wxSize& size) wxOVERRIDE;
|
||||
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 SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
|
||||
virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap) wxOVERRIDE;
|
||||
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
|
||||
// -------------------------------
|
||||
|
||||
virtual void SetWindowStyleFlag(long style);
|
||||
virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
|
||||
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id);
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
|
||||
|
||||
void OnMouseEvent(wxMouseEvent& event);
|
||||
void OnSysColourChanged(wxSysColourChangedEvent& event);
|
||||
void OnEraseBackground(wxEraseEvent& event);
|
||||
|
||||
void SetFocus() {}
|
||||
void SetFocus() wxOVERRIDE {}
|
||||
|
||||
static WXHBITMAP MapBitmap(WXHBITMAP bitmap, int width, int height);
|
||||
|
||||
// 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
|
||||
virtual bool CanApplyThemeBorder() const { return false; }
|
||||
virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
|
||||
|
||||
#ifdef wxHAS_MSW_BACKGROUND_ERASE_HOOK
|
||||
virtual bool MSWEraseBgHook(WXHDC hDC);
|
||||
virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, wxWindowMSW *child);
|
||||
virtual bool MSWEraseBgHook(WXHDC hDC) wxOVERRIDE;
|
||||
virtual WXHBRUSH MSWGetBgBrushForChild(WXHDC hDC, wxWindowMSW *child) wxOVERRIDE;
|
||||
#endif // wxHAS_MSW_BACKGROUND_ERASE_HOOK
|
||||
|
||||
virtual wxToolBarToolBase *CreateTool(int id,
|
||||
@ -94,10 +94,10 @@ public:
|
||||
wxItemKind kind = wxITEM_NORMAL,
|
||||
wxObject *clientData = NULL,
|
||||
const wxString& shortHelp = wxEmptyString,
|
||||
const wxString& longHelp = wxEmptyString);
|
||||
const wxString& longHelp = wxEmptyString) wxOVERRIDE;
|
||||
|
||||
virtual wxToolBarToolBase *CreateTool(wxControl *control,
|
||||
const wxString& label);
|
||||
const wxString& label) wxOVERRIDE;
|
||||
protected:
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
@ -109,15 +109,15 @@ protected:
|
||||
void Recreate();
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
|
||||
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
|
||||
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
|
||||
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
|
||||
|
||||
virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
|
||||
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
|
||||
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
|
||||
virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE;
|
||||
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
|
||||
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
|
||||
|
||||
// return the appropriate size and flags for the toolbar control
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
virtual wxSize DoGetBestSize() const wxOVERRIDE;
|
||||
|
||||
// handlers for various events
|
||||
bool HandleSize(WXWPARAM wParam, WXLPARAM lParam);
|
||||
|
||||
@ -45,35 +45,35 @@ public:
|
||||
virtual ~wxTopLevelWindowMSW();
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual void SetTitle( const wxString& title);
|
||||
virtual wxString GetTitle() const;
|
||||
virtual void Maximize(bool maximize = true);
|
||||
virtual bool IsMaximized() const;
|
||||
virtual void Iconize(bool iconize = true);
|
||||
virtual bool IsIconized() const;
|
||||
virtual void SetIcons(const wxIconBundle& icons );
|
||||
virtual void Restore();
|
||||
virtual void SetTitle( const wxString& title) wxOVERRIDE;
|
||||
virtual wxString GetTitle() const wxOVERRIDE;
|
||||
virtual void Maximize(bool maximize = true) wxOVERRIDE;
|
||||
virtual bool IsMaximized() const wxOVERRIDE;
|
||||
virtual void Iconize(bool iconize = true) wxOVERRIDE;
|
||||
virtual bool IsIconized() const wxOVERRIDE;
|
||||
virtual void SetIcons(const wxIconBundle& icons ) wxOVERRIDE;
|
||||
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 void Raise();
|
||||
virtual bool Show(bool show = true) wxOVERRIDE;
|
||||
virtual void Raise() wxOVERRIDE;
|
||||
|
||||
virtual void ShowWithoutActivating();
|
||||
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
|
||||
virtual bool IsFullScreen() const { return m_fsIsShowing; }
|
||||
virtual void ShowWithoutActivating() wxOVERRIDE;
|
||||
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE;
|
||||
virtual bool IsFullScreen() const wxOVERRIDE { return m_fsIsShowing; }
|
||||
|
||||
// wxMSW only: EnableCloseButton(false) may be used to remove the "Close"
|
||||
// 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 EnableMinimizeButton(bool enable = true) wxOVERRIDE;
|
||||
|
||||
// Set window transparency if the platform supports it
|
||||
virtual bool SetTransparent(wxByte alpha);
|
||||
virtual bool CanSetTransparent();
|
||||
virtual bool SetTransparent(wxByte alpha) wxOVERRIDE;
|
||||
virtual bool CanSetTransparent() wxOVERRIDE;
|
||||
|
||||
|
||||
// MSW-specific methods
|
||||
@ -100,16 +100,16 @@ public:
|
||||
wxWindow *GetLastFocus() const { return m_winLastFocused; }
|
||||
|
||||
// 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()
|
||||
virtual WXHWND MSWGetParent() const;
|
||||
virtual WXHWND MSWGetParent() const wxOVERRIDE;
|
||||
|
||||
// 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
|
||||
virtual bool CanApplyThemeBorder() const { return false; }
|
||||
virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
|
||||
|
||||
protected:
|
||||
// common part of all ctors
|
||||
@ -132,12 +132,12 @@ protected:
|
||||
|
||||
// override those to return the normal window coordinates even when the
|
||||
// window is minimized
|
||||
virtual void DoGetPosition(int *x, int *y) const;
|
||||
virtual void DoGetSize(int *width, int *height) const;
|
||||
virtual void DoGetPosition(int *x, int *y) const wxOVERRIDE;
|
||||
virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
|
||||
|
||||
// Top level windows have different freeze semantics on Windows
|
||||
virtual void DoFreeze();
|
||||
virtual void DoThaw();
|
||||
virtual void DoFreeze() wxOVERRIDE;
|
||||
virtual void DoThaw() wxOVERRIDE;
|
||||
|
||||
// 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
|
||||
@ -149,7 +149,7 @@ protected:
|
||||
virtual void MSWGetCreateWindowCoords(const wxPoint& pos,
|
||||
const wxSize& size,
|
||||
int& x, int& y,
|
||||
int& w, int& h) const;
|
||||
int& w, int& h) const wxOVERRIDE;
|
||||
|
||||
|
||||
// is the window currently iconized?
|
||||
|
||||
@ -70,117 +70,117 @@ public:
|
||||
// implement base class pure virtuals
|
||||
// ----------------------------------
|
||||
|
||||
virtual unsigned int GetCount() const;
|
||||
virtual unsigned int GetCount() const wxOVERRIDE;
|
||||
|
||||
virtual unsigned int GetIndent() const;
|
||||
virtual void SetIndent(unsigned int indent);
|
||||
virtual unsigned int GetIndent() const wxOVERRIDE;
|
||||
virtual void SetIndent(unsigned int indent) wxOVERRIDE;
|
||||
|
||||
virtual void SetImageList(wxImageList *imageList);
|
||||
virtual void SetStateImageList(wxImageList *imageList);
|
||||
virtual void SetImageList(wxImageList *imageList) wxOVERRIDE;
|
||||
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,
|
||||
wxTreeItemIcon which = wxTreeItemIcon_Normal) const;
|
||||
virtual wxTreeItemData *GetItemData(const wxTreeItemId& item) const;
|
||||
virtual wxColour GetItemTextColour(const wxTreeItemId& item) const;
|
||||
virtual wxColour GetItemBackgroundColour(const wxTreeItemId& item) const;
|
||||
virtual wxFont GetItemFont(const wxTreeItemId& item) const;
|
||||
wxTreeItemIcon which = wxTreeItemIcon_Normal) const wxOVERRIDE;
|
||||
virtual wxTreeItemData *GetItemData(const wxTreeItemId& item) const wxOVERRIDE;
|
||||
virtual wxColour GetItemTextColour(const wxTreeItemId& item) const wxOVERRIDE;
|
||||
virtual wxColour GetItemBackgroundColour(const wxTreeItemId& item) const wxOVERRIDE;
|
||||
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,
|
||||
wxTreeItemIcon which = wxTreeItemIcon_Normal);
|
||||
virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data);
|
||||
virtual void SetItemHasChildren(const wxTreeItemId& item, bool has = true);
|
||||
virtual void SetItemBold(const wxTreeItemId& item, bool bold = true);
|
||||
wxTreeItemIcon which = wxTreeItemIcon_Normal) wxOVERRIDE;
|
||||
virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data) wxOVERRIDE;
|
||||
virtual void SetItemHasChildren(const wxTreeItemId& item, bool has = true) wxOVERRIDE;
|
||||
virtual void SetItemBold(const wxTreeItemId& item, bool bold = true) wxOVERRIDE;
|
||||
virtual void SetItemDropHighlight(const wxTreeItemId& item,
|
||||
bool highlight = true);
|
||||
bool highlight = true) wxOVERRIDE;
|
||||
virtual void SetItemTextColour(const wxTreeItemId& item,
|
||||
const wxColour& col);
|
||||
const wxColour& col) wxOVERRIDE;
|
||||
virtual void SetItemBackgroundColour(const wxTreeItemId& item,
|
||||
const wxColour& col);
|
||||
virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font);
|
||||
const wxColour& col) wxOVERRIDE;
|
||||
virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font) wxOVERRIDE;
|
||||
|
||||
// item status inquiries
|
||||
// ---------------------
|
||||
|
||||
virtual bool IsVisible(const wxTreeItemId& item) const;
|
||||
virtual bool ItemHasChildren(const wxTreeItemId& item) const;
|
||||
virtual bool IsExpanded(const wxTreeItemId& item) const;
|
||||
virtual bool IsSelected(const wxTreeItemId& item) const;
|
||||
virtual bool IsBold(const wxTreeItemId& item) const;
|
||||
virtual bool IsVisible(const wxTreeItemId& item) const wxOVERRIDE;
|
||||
virtual bool ItemHasChildren(const wxTreeItemId& item) const wxOVERRIDE;
|
||||
virtual bool IsExpanded(const wxTreeItemId& item) const wxOVERRIDE;
|
||||
virtual bool IsSelected(const wxTreeItemId& item) const wxOVERRIDE;
|
||||
virtual bool IsBold(const wxTreeItemId& item) const wxOVERRIDE;
|
||||
|
||||
virtual size_t GetChildrenCount(const wxTreeItemId& item,
|
||||
bool recursively = true) const;
|
||||
bool recursively = true) const wxOVERRIDE;
|
||||
|
||||
// navigation
|
||||
// ----------
|
||||
|
||||
virtual wxTreeItemId GetRootItem() const;
|
||||
virtual wxTreeItemId GetSelection() const;
|
||||
virtual size_t GetSelections(wxArrayTreeItemIds& selections) const;
|
||||
virtual wxTreeItemId GetFocusedItem() const;
|
||||
virtual wxTreeItemId GetRootItem() const wxOVERRIDE;
|
||||
virtual wxTreeItemId GetSelection() const wxOVERRIDE;
|
||||
virtual size_t GetSelections(wxArrayTreeItemIds& selections) const wxOVERRIDE;
|
||||
virtual wxTreeItemId GetFocusedItem() const wxOVERRIDE;
|
||||
|
||||
virtual void ClearFocusedItem();
|
||||
virtual void SetFocusedItem(const wxTreeItemId& item);
|
||||
virtual void ClearFocusedItem() wxOVERRIDE;
|
||||
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,
|
||||
wxTreeItemIdValue& cookie) const;
|
||||
wxTreeItemIdValue& cookie) const wxOVERRIDE;
|
||||
virtual wxTreeItemId GetNextChild(const wxTreeItemId& item,
|
||||
wxTreeItemIdValue& cookie) const;
|
||||
virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const;
|
||||
wxTreeItemIdValue& cookie) const wxOVERRIDE;
|
||||
virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const wxOVERRIDE;
|
||||
|
||||
virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const;
|
||||
virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const;
|
||||
virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const wxOVERRIDE;
|
||||
virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const wxOVERRIDE;
|
||||
|
||||
virtual wxTreeItemId GetFirstVisibleItem() const;
|
||||
virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const;
|
||||
virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const;
|
||||
virtual wxTreeItemId GetFirstVisibleItem() const wxOVERRIDE;
|
||||
virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const wxOVERRIDE;
|
||||
virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const wxOVERRIDE;
|
||||
|
||||
// operations
|
||||
// ----------
|
||||
|
||||
virtual wxTreeItemId AddRoot(const wxString& text,
|
||||
int image = -1, int selectedImage = -1,
|
||||
wxTreeItemData *data = NULL);
|
||||
wxTreeItemData *data = NULL) wxOVERRIDE;
|
||||
|
||||
virtual void Delete(const wxTreeItemId& item);
|
||||
virtual void DeleteChildren(const wxTreeItemId& item);
|
||||
virtual void DeleteAllItems();
|
||||
virtual void Delete(const wxTreeItemId& item) wxOVERRIDE;
|
||||
virtual void DeleteChildren(const wxTreeItemId& item) wxOVERRIDE;
|
||||
virtual void DeleteAllItems() wxOVERRIDE;
|
||||
|
||||
virtual void Expand(const wxTreeItemId& item);
|
||||
virtual void Collapse(const wxTreeItemId& item);
|
||||
virtual void CollapseAndReset(const wxTreeItemId& item);
|
||||
virtual void Toggle(const wxTreeItemId& item);
|
||||
virtual void Expand(const wxTreeItemId& item) wxOVERRIDE;
|
||||
virtual void Collapse(const wxTreeItemId& item) wxOVERRIDE;
|
||||
virtual void CollapseAndReset(const wxTreeItemId& item) wxOVERRIDE;
|
||||
virtual void Toggle(const wxTreeItemId& item) wxOVERRIDE;
|
||||
|
||||
virtual void Unselect();
|
||||
virtual void UnselectAll();
|
||||
virtual void SelectItem(const wxTreeItemId& item, bool select = true);
|
||||
virtual void SelectChildren(const wxTreeItemId& parent);
|
||||
virtual void Unselect() wxOVERRIDE;
|
||||
virtual void UnselectAll() wxOVERRIDE;
|
||||
virtual void SelectItem(const wxTreeItemId& item, bool select = true) wxOVERRIDE;
|
||||
virtual void SelectChildren(const wxTreeItemId& parent) wxOVERRIDE;
|
||||
|
||||
virtual void EnsureVisible(const wxTreeItemId& item);
|
||||
virtual void ScrollTo(const wxTreeItemId& item);
|
||||
virtual void EnsureVisible(const wxTreeItemId& item) wxOVERRIDE;
|
||||
virtual void ScrollTo(const wxTreeItemId& item) wxOVERRIDE;
|
||||
|
||||
virtual wxTextCtrl *EditLabel(const wxTreeItemId& item,
|
||||
wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl));
|
||||
virtual wxTextCtrl *GetEditControl() const;
|
||||
wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)) wxOVERRIDE;
|
||||
virtual wxTextCtrl *GetEditControl() const wxOVERRIDE;
|
||||
virtual void EndEditLabel(const wxTreeItemId& WXUNUSED(item),
|
||||
bool discardChanges = false)
|
||||
bool discardChanges = false) wxOVERRIDE
|
||||
{
|
||||
DoEndEditLabel(discardChanges);
|
||||
}
|
||||
|
||||
virtual void SortChildren(const wxTreeItemId& item);
|
||||
virtual void SortChildren(const wxTreeItemId& item) wxOVERRIDE;
|
||||
|
||||
virtual bool GetBoundingRect(const wxTreeItemId& item,
|
||||
wxRect& rect,
|
||||
bool textOnly = false) const;
|
||||
bool textOnly = false) const wxOVERRIDE;
|
||||
|
||||
// implementation
|
||||
// --------------
|
||||
|
||||
virtual wxVisualAttributes GetDefaultAttributes() const
|
||||
virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
|
||||
{
|
||||
return GetClassDefaultAttributes(GetWindowVariant());
|
||||
}
|
||||
@ -189,27 +189,27 @@ public:
|
||||
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
|
||||
|
||||
|
||||
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
||||
virtual WXLRESULT MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id);
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
|
||||
virtual bool MSWShouldPreProcessMessage(WXMSG* msg);
|
||||
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
|
||||
virtual WXLRESULT MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
|
||||
virtual bool MSWCommand(WXUINT param, WXWORD id) wxOVERRIDE;
|
||||
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wxOVERRIDE;
|
||||
virtual bool MSWShouldPreProcessMessage(WXMSG* msg) wxOVERRIDE;
|
||||
|
||||
// override some base class virtuals
|
||||
virtual bool SetBackgroundColour(const wxColour &colour);
|
||||
virtual bool SetForegroundColour(const wxColour &colour);
|
||||
virtual bool SetBackgroundColour(const wxColour &colour) wxOVERRIDE;
|
||||
virtual bool SetForegroundColour(const wxColour &colour) wxOVERRIDE;
|
||||
|
||||
// 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:
|
||||
// Implement "update locking" in a custom way for this control.
|
||||
virtual void DoFreeze();
|
||||
virtual void DoThaw();
|
||||
virtual void DoFreeze() wxOVERRIDE;
|
||||
virtual void DoThaw() wxOVERRIDE;
|
||||
|
||||
virtual void DoSetSize(int x, int y,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
|
||||
|
||||
// SetImageList helper
|
||||
void SetAnyImageList(wxImageList *imageList, int which);
|
||||
@ -220,20 +220,20 @@ protected:
|
||||
// end edit label
|
||||
void DoEndEditLabel(bool discardChanges = false);
|
||||
|
||||
virtual int DoGetItemState(const wxTreeItemId& item) const;
|
||||
virtual void DoSetItemState(const wxTreeItemId& item, int state);
|
||||
virtual int DoGetItemState(const wxTreeItemId& item) const wxOVERRIDE;
|
||||
virtual void DoSetItemState(const wxTreeItemId& item, int state) wxOVERRIDE;
|
||||
|
||||
virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent,
|
||||
size_t pos,
|
||||
const wxString& text,
|
||||
int image, int selectedImage,
|
||||
wxTreeItemData *data);
|
||||
wxTreeItemData *data) wxOVERRIDE;
|
||||
virtual wxTreeItemId DoInsertAfter(const wxTreeItemId& parent,
|
||||
const wxTreeItemId& idPrevious,
|
||||
const wxString& text,
|
||||
int image = -1, int selImage = -1,
|
||||
wxTreeItemData *data = NULL);
|
||||
virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const;
|
||||
wxTreeItemData *data = NULL) wxOVERRIDE;
|
||||
virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const wxOVERRIDE;
|
||||
|
||||
// obtain the user data for the lParam member of TV_ITEM
|
||||
class wxTreeItemParam *GetItemParam(const wxTreeItemId& item) const;
|
||||
|
||||
@ -60,73 +60,73 @@ public:
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = 0,
|
||||
const wxString& name = wxWebViewNameStr);
|
||||
const wxString& name = wxWebViewNameStr) wxOVERRIDE;
|
||||
|
||||
virtual void LoadURL(const wxString& url);
|
||||
virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);
|
||||
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
|
||||
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();
|
||||
virtual void LoadURL(const wxString& url) wxOVERRIDE;
|
||||
virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item) wxOVERRIDE;
|
||||
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory() wxOVERRIDE;
|
||||
virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory() wxOVERRIDE;
|
||||
|
||||
virtual bool CanGoForward() const;
|
||||
virtual bool CanGoBack() const;
|
||||
virtual void GoBack();
|
||||
virtual void GoForward();
|
||||
virtual void ClearHistory();
|
||||
virtual void EnableHistory(bool enable = true);
|
||||
virtual void Stop();
|
||||
virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT);
|
||||
virtual bool CanGoForward() const wxOVERRIDE;
|
||||
virtual bool CanGoBack() const wxOVERRIDE;
|
||||
virtual void GoBack() wxOVERRIDE;
|
||||
virtual void GoForward() wxOVERRIDE;
|
||||
virtual void ClearHistory() wxOVERRIDE;
|
||||
virtual void EnableHistory(bool enable = true) wxOVERRIDE;
|
||||
virtual void Stop() wxOVERRIDE;
|
||||
virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT) wxOVERRIDE;
|
||||
|
||||
virtual wxString GetPageSource() const;
|
||||
virtual wxString GetPageText() const;
|
||||
virtual wxString GetPageSource() const wxOVERRIDE;
|
||||
virtual wxString GetPageText() const wxOVERRIDE;
|
||||
|
||||
virtual bool IsBusy() const;
|
||||
virtual wxString GetCurrentURL() const;
|
||||
virtual wxString GetCurrentTitle() const;
|
||||
virtual bool IsBusy() const wxOVERRIDE;
|
||||
virtual wxString GetCurrentURL() const wxOVERRIDE;
|
||||
virtual wxString GetCurrentTitle() const wxOVERRIDE;
|
||||
|
||||
virtual void SetZoomType(wxWebViewZoomType);
|
||||
virtual wxWebViewZoomType GetZoomType() const;
|
||||
virtual bool CanSetZoomType(wxWebViewZoomType) const;
|
||||
virtual void SetZoomType(wxWebViewZoomType) wxOVERRIDE;
|
||||
virtual wxWebViewZoomType GetZoomType() const wxOVERRIDE;
|
||||
virtual bool CanSetZoomType(wxWebViewZoomType) const wxOVERRIDE;
|
||||
|
||||
virtual void Print();
|
||||
virtual void Print() wxOVERRIDE;
|
||||
|
||||
virtual wxWebViewZoom GetZoom() const;
|
||||
virtual void SetZoom(wxWebViewZoom zoom);
|
||||
virtual wxWebViewZoom GetZoom() const wxOVERRIDE;
|
||||
virtual void SetZoom(wxWebViewZoom zoom) wxOVERRIDE;
|
||||
|
||||
//Clipboard functions
|
||||
virtual bool CanCut() const;
|
||||
virtual bool CanCopy() const;
|
||||
virtual bool CanPaste() const;
|
||||
virtual void Cut();
|
||||
virtual void Copy();
|
||||
virtual void Paste();
|
||||
virtual bool CanCut() const wxOVERRIDE;
|
||||
virtual bool CanCopy() const wxOVERRIDE;
|
||||
virtual bool CanPaste() const wxOVERRIDE;
|
||||
virtual void Cut() wxOVERRIDE;
|
||||
virtual void Copy() wxOVERRIDE;
|
||||
virtual void Paste() wxOVERRIDE;
|
||||
|
||||
//Undo / redo functionality
|
||||
virtual bool CanUndo() const;
|
||||
virtual bool CanRedo() const;
|
||||
virtual void Undo();
|
||||
virtual void Redo();
|
||||
virtual bool CanUndo() const wxOVERRIDE;
|
||||
virtual bool CanRedo() const wxOVERRIDE;
|
||||
virtual void Undo() wxOVERRIDE;
|
||||
virtual void Redo() wxOVERRIDE;
|
||||
|
||||
//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
|
||||
virtual void SetEditable(bool enable = true);
|
||||
virtual bool IsEditable() const;
|
||||
virtual void SetEditable(bool enable = true) wxOVERRIDE;
|
||||
virtual bool IsEditable() const wxOVERRIDE;
|
||||
|
||||
//Selection
|
||||
virtual void SelectAll();
|
||||
virtual bool HasSelection() const;
|
||||
virtual void DeleteSelection();
|
||||
virtual wxString GetSelectedText() const;
|
||||
virtual wxString GetSelectedSource() const;
|
||||
virtual void ClearSelection();
|
||||
virtual void SelectAll() wxOVERRIDE;
|
||||
virtual bool HasSelection() const wxOVERRIDE;
|
||||
virtual void DeleteSelection() wxOVERRIDE;
|
||||
virtual wxString GetSelectedText() const wxOVERRIDE;
|
||||
virtual wxString GetSelectedSource() const wxOVERRIDE;
|
||||
virtual void ClearSelection() wxOVERRIDE;
|
||||
|
||||
virtual void RunScript(const wxString& javascript);
|
||||
virtual void RunScript(const wxString& javascript) wxOVERRIDE;
|
||||
|
||||
//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
|
||||
|
||||
@ -146,7 +146,7 @@ public:
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
|
||||
protected:
|
||||
virtual void DoSetPage(const wxString& html, const wxString& baseUrl);
|
||||
virtual void DoSetPage(const wxString& html, const wxString& baseUrl) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxIEContainer* m_container;
|
||||
@ -197,14 +197,14 @@ private:
|
||||
class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryIE : public wxWebViewFactory
|
||||
{
|
||||
public:
|
||||
virtual wxWebView* Create() { return new wxWebViewIE; }
|
||||
virtual wxWebView* Create() wxOVERRIDE { return new wxWebViewIE; }
|
||||
virtual wxWebView* Create(wxWindow* parent,
|
||||
wxWindowID id,
|
||||
const wxString& url = wxWebViewDefaultURLStr,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
long style = 0,
|
||||
const wxString& name = wxWebViewNameStr)
|
||||
const wxString& name = wxWebViewNameStr) wxOVERRIDE
|
||||
{ return new wxWebViewIE(parent, id, url, pos, size, style, name); }
|
||||
};
|
||||
|
||||
@ -227,28 +227,28 @@ public:
|
||||
|
||||
//IInternetProtocolRoot
|
||||
HRESULT STDMETHODCALLTYPE Abort(HRESULT WXUNUSED(hrReason),
|
||||
DWORD WXUNUSED(dwOptions))
|
||||
DWORD WXUNUSED(dwOptions)) wxOVERRIDE
|
||||
{ return E_NOTIMPL; }
|
||||
HRESULT STDMETHODCALLTYPE Continue(wxPROTOCOLDATA *WXUNUSED(pProtocolData))
|
||||
HRESULT STDMETHODCALLTYPE Continue(wxPROTOCOLDATA *WXUNUSED(pProtocolData)) wxOVERRIDE
|
||||
{ return S_OK; }
|
||||
HRESULT STDMETHODCALLTYPE Resume() { return S_OK; }
|
||||
HRESULT STDMETHODCALLTYPE Resume() wxOVERRIDE { return S_OK; }
|
||||
HRESULT STDMETHODCALLTYPE Start(LPCWSTR szUrl,
|
||||
wxIInternetProtocolSink *pOIProtSink,
|
||||
wxIInternetBindInfo *pOIBindInfo,
|
||||
DWORD grfPI,
|
||||
HANDLE_PTR dwReserved);
|
||||
HRESULT STDMETHODCALLTYPE Suspend() { return S_OK; }
|
||||
HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) { return S_OK; }
|
||||
HANDLE_PTR dwReserved) wxOVERRIDE;
|
||||
HRESULT STDMETHODCALLTYPE Suspend() wxOVERRIDE { return S_OK; }
|
||||
HRESULT STDMETHODCALLTYPE Terminate(DWORD WXUNUSED(dwOptions)) wxOVERRIDE { return S_OK; }
|
||||
|
||||
//IInternetProtocol
|
||||
HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions))
|
||||
HRESULT STDMETHODCALLTYPE LockRequest(DWORD WXUNUSED(dwOptions)) wxOVERRIDE
|
||||
{ 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),
|
||||
DWORD WXUNUSED(dwOrigin),
|
||||
ULARGE_INTEGER* WXUNUSED(plibNewPosition))
|
||||
ULARGE_INTEGER* WXUNUSED(plibNewPosition)) wxOVERRIDE
|
||||
{ return E_FAIL; }
|
||||
HRESULT STDMETHODCALLTYPE UnlockRequest() { return S_OK; }
|
||||
HRESULT STDMETHODCALLTYPE UnlockRequest() wxOVERRIDE { return S_OK; }
|
||||
};
|
||||
|
||||
class ClassFactory : public IClassFactory
|
||||
@ -262,8 +262,8 @@ public:
|
||||
|
||||
//IClassFactory
|
||||
HRESULT STDMETHODCALLTYPE CreateInstance(IUnknown* pUnkOuter,
|
||||
REFIID riid, void** ppvObject);
|
||||
HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock);
|
||||
REFIID riid, void** ppvObject) wxOVERRIDE;
|
||||
HRESULT STDMETHODCALLTYPE LockServer(BOOL fLock) wxOVERRIDE;
|
||||
|
||||
//IUnknown
|
||||
DECLARE_IUNKNOWN_METHODS;
|
||||
@ -277,7 +277,7 @@ class wxIEContainer : public wxActiveXContainer
|
||||
public:
|
||||
wxIEContainer(wxWindow *parent, REFIID iid, IUnknown *pUnk, DocHostUIHandler* uiHandler = NULL);
|
||||
virtual ~wxIEContainer();
|
||||
virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc);
|
||||
virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc) wxOVERRIDE;
|
||||
private:
|
||||
DocHostUIHandler* m_uiHandler;
|
||||
};
|
||||
@ -290,48 +290,48 @@ public:
|
||||
|
||||
virtual HRESULT wxSTDCALL ShowContextMenu(DWORD dwID, POINT *ppt,
|
||||
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,
|
||||
IOleInPlaceActiveObject *pActiveObject,
|
||||
IOleCommandTarget *pCommandTarget,
|
||||
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,
|
||||
IOleInPlaceUIWindow *pUIWindow,
|
||||
BOOL fRameWindow);
|
||||
BOOL fRameWindow) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL TranslateAccelerator(LPMSG lpMsg,
|
||||
const GUID *pguidCmdGroup,
|
||||
DWORD nCmdID);
|
||||
DWORD nCmdID) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL GetOptionKeyPath(LPOLESTR *pchKey,
|
||||
DWORD dw);
|
||||
DWORD dw) wxOVERRIDE;
|
||||
|
||||
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,
|
||||
OLECHAR *pchURLIn,
|
||||
OLECHAR **ppchURLOut);
|
||||
OLECHAR **ppchURLOut) wxOVERRIDE;
|
||||
|
||||
virtual HRESULT wxSTDCALL FilterDataObject(IDataObject *pDO,
|
||||
IDataObject **ppDORet);
|
||||
IDataObject **ppDORet) wxOVERRIDE;
|
||||
//IUnknown
|
||||
DECLARE_IUNKNOWN_METHODS;
|
||||
|
||||
|
||||
@ -55,74 +55,74 @@ public:
|
||||
const wxString& name = wxPanelNameStr);
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual void SetLabel(const wxString& label);
|
||||
virtual wxString GetLabel() const;
|
||||
virtual void SetLabel(const wxString& label) wxOVERRIDE;
|
||||
virtual wxString GetLabel() const wxOVERRIDE;
|
||||
|
||||
virtual void Raise();
|
||||
virtual void Lower();
|
||||
virtual void Raise() wxOVERRIDE;
|
||||
virtual void Lower() wxOVERRIDE;
|
||||
|
||||
#if wxUSE_DEFERRED_SIZING
|
||||
virtual bool BeginRepositioningChildren();
|
||||
virtual void EndRepositioningChildren();
|
||||
virtual bool BeginRepositioningChildren() wxOVERRIDE;
|
||||
virtual void EndRepositioningChildren() wxOVERRIDE;
|
||||
#endif // wxUSE_DEFERRED_SIZING
|
||||
|
||||
virtual bool Show(bool show = true);
|
||||
virtual bool Show(bool show = true) wxOVERRIDE;
|
||||
virtual bool ShowWithEffect(wxShowEffect effect,
|
||||
unsigned timeout = 0)
|
||||
unsigned timeout = 0) wxOVERRIDE
|
||||
{
|
||||
return MSWShowWithEffect(true, effect, timeout);
|
||||
}
|
||||
virtual bool HideWithEffect(wxShowEffect effect,
|
||||
unsigned timeout = 0)
|
||||
unsigned timeout = 0) wxOVERRIDE
|
||||
{
|
||||
return MSWShowWithEffect(false, effect, timeout);
|
||||
}
|
||||
|
||||
virtual void SetFocus();
|
||||
virtual void SetFocusFromKbd();
|
||||
virtual void SetFocus() wxOVERRIDE;
|
||||
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,
|
||||
const wxRect *rect = (const wxRect *) NULL );
|
||||
virtual void Update();
|
||||
const wxRect *rect = (const wxRect *) NULL ) wxOVERRIDE;
|
||||
virtual void Update() wxOVERRIDE;
|
||||
|
||||
virtual void SetWindowStyleFlag(long style);
|
||||
virtual void SetExtraStyle(long exStyle);
|
||||
virtual bool SetCursor( const wxCursor &cursor );
|
||||
virtual bool SetFont( const wxFont &font );
|
||||
virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
|
||||
virtual void SetExtraStyle(long exStyle) wxOVERRIDE;
|
||||
virtual bool SetCursor( const wxCursor &cursor ) wxOVERRIDE;
|
||||
virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
|
||||
|
||||
virtual int GetCharHeight() const;
|
||||
virtual int GetCharWidth() const;
|
||||
virtual int GetCharHeight() const wxOVERRIDE;
|
||||
virtual int GetCharWidth() const wxOVERRIDE;
|
||||
|
||||
virtual void SetScrollbar( int orient, int pos, int thumbVisible,
|
||||
int range, bool refresh = true );
|
||||
virtual void SetScrollPos( int orient, int pos, bool refresh = true );
|
||||
virtual int GetScrollPos( int orient ) const;
|
||||
virtual int GetScrollThumb( int orient ) const;
|
||||
virtual int GetScrollRange( int orient ) const;
|
||||
int range, bool refresh = true ) wxOVERRIDE;
|
||||
virtual void SetScrollPos( int orient, int pos, bool refresh = true ) wxOVERRIDE;
|
||||
virtual int GetScrollPos( int orient ) const wxOVERRIDE;
|
||||
virtual int GetScrollThumb( int orient ) const wxOVERRIDE;
|
||||
virtual int GetScrollRange( int orient ) const wxOVERRIDE;
|
||||
virtual void ScrollWindow( int dx, int dy,
|
||||
const wxRect* rect = NULL );
|
||||
const wxRect* rect = NULL ) wxOVERRIDE;
|
||||
|
||||
virtual bool ScrollLines(int lines);
|
||||
virtual bool ScrollPages(int pages);
|
||||
virtual bool ScrollLines(int lines) wxOVERRIDE;
|
||||
virtual bool ScrollPages(int pages) wxOVERRIDE;
|
||||
|
||||
virtual void SetLayoutDirection(wxLayoutDirection dir);
|
||||
virtual wxLayoutDirection GetLayoutDirection() const;
|
||||
virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE;
|
||||
virtual wxLayoutDirection GetLayoutDirection() const wxOVERRIDE;
|
||||
virtual wxCoord AdjustForLayoutDirection(wxCoord x,
|
||||
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
|
||||
virtual void SetDropTarget( wxDropTarget *dropTarget );
|
||||
virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE;
|
||||
#endif // wxUSE_DRAG_AND_DROP
|
||||
|
||||
// Accept files for dragging
|
||||
virtual void DragAcceptFiles(bool accept);
|
||||
virtual void DragAcceptFiles(bool accept) wxOVERRIDE;
|
||||
|
||||
#ifndef __WXUNIVERSAL__
|
||||
// Native resource loading (implemented in src/msw/nativdlg.cpp)
|
||||
@ -135,8 +135,8 @@ public:
|
||||
|
||||
#if wxUSE_HOTKEY
|
||||
// install and deinstall a system wide hotkey
|
||||
virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode);
|
||||
virtual bool UnregisterHotKey(int hotkeyId);
|
||||
virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) wxOVERRIDE;
|
||||
virtual bool UnregisterHotKey(int hotkeyId) wxOVERRIDE;
|
||||
#endif // wxUSE_HOTKEY
|
||||
|
||||
// window handle stuff
|
||||
@ -144,10 +144,10 @@ public:
|
||||
|
||||
WXHWND GetHWND() const { return m_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 DissociateHandle();
|
||||
void AssociateHandle(WXWidget handle) wxOVERRIDE;
|
||||
void DissociateHandle() wxOVERRIDE;
|
||||
|
||||
// does this window have deferred position and/or size?
|
||||
bool IsSizeDeferred() const;
|
||||
@ -514,7 +514,7 @@ public:
|
||||
bool IsMouseInWindow() const;
|
||||
|
||||
// check if a native double-buffering applies for this window
|
||||
virtual bool IsDoubleBuffered() const;
|
||||
virtual bool IsDoubleBuffered() const wxOVERRIDE;
|
||||
|
||||
void SetDoubleBuffered(bool on);
|
||||
|
||||
@ -523,7 +523,7 @@ public:
|
||||
|
||||
// virtual function for implementing internal idle
|
||||
// behaviour
|
||||
virtual void OnInternalIdle();
|
||||
virtual void OnInternalIdle() wxOVERRIDE;
|
||||
|
||||
#if wxUSE_MENUS && !defined(__WXUNIVERSAL__)
|
||||
virtual bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
|
||||
@ -552,17 +552,17 @@ protected:
|
||||
// this allows you to implement standard control borders without
|
||||
// repeating the code in different classes that are not derived from
|
||||
// wxControl
|
||||
virtual wxBorder GetDefaultBorderForControl() const;
|
||||
virtual wxBorder GetDefaultBorderForControl() const wxOVERRIDE;
|
||||
|
||||
// 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
|
||||
// that makes most sense for this Windows environment
|
||||
virtual wxBorder TranslateBorder(wxBorder border) const;
|
||||
|
||||
#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
|
||||
|
||||
// the window handle
|
||||
@ -584,26 +584,26 @@ protected:
|
||||
int *x, int *y,
|
||||
int *descent = NULL,
|
||||
int *externalLeading = NULL,
|
||||
const wxFont *font = NULL) const;
|
||||
virtual void DoClientToScreen( int *x, int *y ) const;
|
||||
virtual void DoScreenToClient( int *x, int *y ) const;
|
||||
virtual void DoGetPosition( int *x, int *y ) const;
|
||||
virtual void DoGetSize( int *width, int *height ) const;
|
||||
virtual void DoGetClientSize( int *width, int *height ) const;
|
||||
const wxFont *font = NULL) const wxOVERRIDE;
|
||||
virtual void DoClientToScreen( int *x, int *y ) const wxOVERRIDE;
|
||||
virtual void DoScreenToClient( int *x, int *y ) const wxOVERRIDE;
|
||||
virtual void DoGetPosition( int *x, int *y ) const wxOVERRIDE;
|
||||
virtual void DoGetSize( int *width, int *height ) const wxOVERRIDE;
|
||||
virtual void DoGetClientSize( int *width, int *height ) const wxOVERRIDE;
|
||||
virtual void DoSetSize(int x, int y,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
virtual void DoSetClientSize(int width, int height);
|
||||
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
|
||||
virtual void DoSetClientSize(int width, int height) wxOVERRIDE;
|
||||
|
||||
virtual wxSize DoGetBorderSize() const;
|
||||
virtual wxSize DoGetBorderSize() const wxOVERRIDE;
|
||||
|
||||
virtual void DoCaptureMouse();
|
||||
virtual void DoReleaseMouse();
|
||||
virtual void DoCaptureMouse() wxOVERRIDE;
|
||||
virtual void DoReleaseMouse() wxOVERRIDE;
|
||||
|
||||
virtual void DoEnable(bool enable);
|
||||
virtual void DoEnable(bool enable) wxOVERRIDE;
|
||||
|
||||
virtual void DoFreeze();
|
||||
virtual void DoThaw();
|
||||
virtual void DoFreeze() wxOVERRIDE;
|
||||
virtual void DoThaw() wxOVERRIDE;
|
||||
|
||||
// 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
|
||||
@ -617,10 +617,10 @@ protected:
|
||||
// from both DoSetSize() and DoSetClientSize() and would usually just call
|
||||
// ::MoveWindow() except for composite controls which will want to arrange
|
||||
// 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
|
||||
virtual void DoSetToolTip( wxToolTip *tip );
|
||||
virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE;
|
||||
|
||||
// process TTN_NEEDTEXT message properly (i.e. fixing the bugs in
|
||||
// comctl32.dll in our code -- see the function body for more info)
|
||||
|
||||
@ -158,32 +158,32 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
virtual wxBitmap GetBitmap(wxAnyButton::State which) const
|
||||
virtual wxBitmap GetBitmap(wxAnyButton::State which) const wxOVERRIDE
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
virtual wxSize GetBitmapMargins() const
|
||||
virtual wxSize GetBitmapMargins() const wxOVERRIDE
|
||||
{
|
||||
return m_margin;
|
||||
}
|
||||
|
||||
virtual void SetBitmapMargins(wxCoord x, wxCoord y)
|
||||
virtual void SetBitmapMargins(wxCoord x, wxCoord y) wxOVERRIDE
|
||||
{
|
||||
m_margin = wxSize(x, y);
|
||||
}
|
||||
|
||||
virtual wxDirection GetBitmapPosition() const
|
||||
virtual wxDirection GetBitmapPosition() const wxOVERRIDE
|
||||
{
|
||||
return m_dir;
|
||||
}
|
||||
|
||||
virtual void SetBitmapPosition(wxDirection dir)
|
||||
virtual void SetBitmapPosition(wxDirection dir) wxOVERRIDE
|
||||
{
|
||||
m_dir = dir;
|
||||
}
|
||||
@ -254,12 +254,12 @@ public:
|
||||
UpdateImageInfo();
|
||||
}
|
||||
|
||||
virtual wxBitmap GetBitmap(wxAnyButton::State which) const
|
||||
virtual wxBitmap GetBitmap(wxAnyButton::State which) const wxOVERRIDE
|
||||
{
|
||||
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);
|
||||
|
||||
@ -271,12 +271,12 @@ public:
|
||||
UpdateImageInfo();
|
||||
}
|
||||
|
||||
virtual wxSize GetBitmapMargins() const
|
||||
virtual wxSize GetBitmapMargins() const wxOVERRIDE
|
||||
{
|
||||
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;
|
||||
margin.left =
|
||||
@ -290,7 +290,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
virtual wxDirection GetBitmapPosition() const
|
||||
virtual wxDirection GetBitmapPosition() const wxOVERRIDE
|
||||
{
|
||||
switch ( m_data.uAlign )
|
||||
{
|
||||
@ -312,7 +312,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
virtual void SetBitmapPosition(wxDirection dir)
|
||||
virtual void SetBitmapPosition(wxDirection dir) wxOVERRIDE
|
||||
{
|
||||
UINT alignNew;
|
||||
switch ( dir )
|
||||
|
||||
@ -140,7 +140,7 @@ class wxWindowsArtProvider : public wxArtProvider
|
||||
{
|
||||
protected:
|
||||
virtual wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& client,
|
||||
const wxSize& size);
|
||||
const wxSize& size) wxOVERRIDE;
|
||||
};
|
||||
|
||||
static wxBitmap CreateFromStdIcon(const char *iconName,
|
||||
|
||||
@ -69,7 +69,7 @@ public:
|
||||
wxBitmapRefData(const wxBitmapRefData& data);
|
||||
virtual ~wxBitmapRefData() { Free(); }
|
||||
|
||||
virtual void Free();
|
||||
virtual void Free() wxOVERRIDE;
|
||||
|
||||
#if wxUSE_WXDIB
|
||||
// Creates a new bitmap (DDB or DIB) from the contents of the given DIB.
|
||||
|
||||
@ -81,7 +81,7 @@ public:
|
||||
wxCheckListBoxItem(wxCheckListBox *parent);
|
||||
|
||||
// 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
|
||||
wxCheckListBox *GetParent() const
|
||||
@ -90,7 +90,7 @@ public:
|
||||
int GetIndex() const
|
||||
{ return m_parent->GetItemIndex(const_cast<wxCheckListBoxItem*>(this)); }
|
||||
|
||||
wxString GetName() const
|
||||
wxString GetName() const wxOVERRIDE
|
||||
{ return m_parent->GetString(GetIndex()); }
|
||||
|
||||
|
||||
|
||||
@ -53,7 +53,7 @@ public:
|
||||
|
||||
virtual ~wxCursorRefData() { Free(); }
|
||||
|
||||
virtual void Free();
|
||||
virtual void Free() wxOVERRIDE;
|
||||
|
||||
|
||||
// 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
|
||||
{
|
||||
public:
|
||||
virtual bool OnInit()
|
||||
virtual bool OnInit() wxOVERRIDE
|
||||
{
|
||||
gs_globalCursor = new wxCursor;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
virtual void OnExit()
|
||||
virtual void OnExit() wxOVERRIDE
|
||||
{
|
||||
wxDELETE(gs_globalCursor);
|
||||
}
|
||||
|
||||
@ -210,8 +210,8 @@ static bool gs_triedToLoadSetLayout = false;
|
||||
class wxGDIDLLsCleanupModule : public wxModule
|
||||
{
|
||||
public:
|
||||
virtual bool OnInit() { return true; }
|
||||
virtual void OnExit()
|
||||
virtual bool OnInit() wxOVERRIDE { return true; }
|
||||
virtual void OnExit() wxOVERRIDE
|
||||
{
|
||||
wxMSIMG32DLL.Unload();
|
||||
wxGDI32DLL.Unload();
|
||||
@ -2566,8 +2566,8 @@ void wxMSWDCImpl::ClearCache()
|
||||
class wxDCModule : public wxModule
|
||||
{
|
||||
public:
|
||||
virtual bool OnInit() { return true; }
|
||||
virtual void OnExit() { wxMSWDCImpl::ClearCache(); }
|
||||
virtual bool OnInit() wxOVERRIDE { return true; }
|
||||
virtual void OnExit() wxOVERRIDE { wxMSWDCImpl::ClearCache(); }
|
||||
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS(wxDCModule);
|
||||
|
||||
@ -120,8 +120,8 @@ class wxDDEModule : public wxModule
|
||||
{
|
||||
public:
|
||||
wxDDEModule() {}
|
||||
bool OnInit() { return true; }
|
||||
void OnExit() { wxDDECleanUp(); }
|
||||
bool OnInit() wxOVERRIDE { return true; }
|
||||
void OnExit() wxOVERRIDE { wxDDECleanUp(); }
|
||||
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS(wxDDEModule);
|
||||
|
||||
@ -83,14 +83,14 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
virtual wxRect GetGeometry() const;
|
||||
virtual wxRect GetClientArea() const;
|
||||
virtual wxString GetName() const;
|
||||
virtual bool IsPrimary() const;
|
||||
virtual wxRect GetGeometry() const wxOVERRIDE;
|
||||
virtual wxRect GetClientArea() const wxOVERRIDE;
|
||||
virtual wxString GetName() const wxOVERRIDE;
|
||||
virtual bool IsPrimary() const wxOVERRIDE;
|
||||
|
||||
virtual wxVideoMode GetCurrentMode() const;
|
||||
virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;
|
||||
virtual bool ChangeMode(const wxVideoMode& mode);
|
||||
virtual wxVideoMode GetCurrentMode() const wxOVERRIDE;
|
||||
virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE;
|
||||
virtual bool ChangeMode(const wxVideoMode& mode) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
// convert a DEVMODE to our wxVideoMode
|
||||
@ -135,10 +135,10 @@ public:
|
||||
|
||||
bool IsOk() const { return !m_displays.empty(); }
|
||||
|
||||
virtual wxDisplayImpl *CreateDisplay(unsigned n);
|
||||
virtual unsigned GetCount() { return unsigned(m_displays.size()); }
|
||||
virtual int GetFromPoint(const wxPoint& pt);
|
||||
virtual int GetFromWindow(const wxWindow *window);
|
||||
virtual wxDisplayImpl *CreateDisplay(unsigned n) wxOVERRIDE;
|
||||
virtual unsigned GetCount() wxOVERRIDE { return unsigned(m_displays.size()); }
|
||||
virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE;
|
||||
virtual int GetFromWindow(const wxWindow *window) wxOVERRIDE;
|
||||
|
||||
// Called when we receive WM_SETTINGCHANGE to refresh the list of monitor
|
||||
// handles.
|
||||
|
||||
@ -230,7 +230,7 @@ public:
|
||||
wxEnhMetaFile *Close();
|
||||
|
||||
protected:
|
||||
virtual void DoGetSize(int *width, int *height) const;
|
||||
virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
|
||||
|
||||
private:
|
||||
void Create(HDC hdcRef,
|
||||
|
||||
@ -39,12 +39,12 @@ public:
|
||||
void SendEvent(wxFileSystemWatcherEvent& evt);
|
||||
|
||||
protected:
|
||||
bool Init();
|
||||
bool Init() wxOVERRIDE;
|
||||
|
||||
// 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:
|
||||
bool DoSetUpWatch(wxFSWatchEntryMSW& watch);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user