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

more use of wxOVERRIDE

Browse Source
This commit is contained in:
Paul Cornett
2015-09-06 17:20:42 -07:00
parent 4177593aef
commit 27a8d28029
131 changed files with 1059 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/gtk/filepicker.h
View File

@@ -28,7 +28,7 @@
/* needs to create the dialog in ::Create() and not for each user */ \
/* request in response to the user click as the generic implementation */ \
/* does. */ \
virtual wxWindow *GetDialogParent() \
virtual wxWindow *GetDialogParent() wxOVERRIDE \
{ \
return NULL; \
} \
@@ -42,7 +42,7 @@
/* give us access to the internal GdkWindow of a GtkFileChooserButton */ \
protected: \
virtual GdkWindow * \
GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const \
GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const wxOVERRIDE \
{ return NULL; }
@@ -92,8 +92,8 @@ public: // overrides
// event handler for the click
void OnDialogOK(wxCommandEvent &);
virtual void SetPath(const wxString &str);
virtual void SetInitialDirectory(const wxString& dir);
virtual void SetPath(const wxString &str) wxOVERRIDE;
virtual void SetInitialDirectory(const wxString& dir) wxOVERRIDE;
// see macro defined above
FILEDIRBTN_OVERRIDES
@@ -156,13 +156,13 @@ public: // overrides
// GtkFileChooserButton does not support GTK_FILE_CHOOSER_CREATE_FOLDER
// thus we must ensure that the wxDD_DIR_MUST_EXIST style was given
long GetDialogStyle() const
long GetDialogStyle() const wxOVERRIDE
{
return (wxGenericDirButton::GetDialogStyle() | wxDD_DIR_MUST_EXIST);
}
virtual void SetPath(const wxString &str);
virtual void SetInitialDirectory(const wxString& dir);
virtual void SetPath(const wxString &str) wxOVERRIDE;
virtual void SetInitialDirectory(const wxString& dir) wxOVERRIDE;
// see macro defined above
FILEDIRBTN_OVERRIDES