we don't need reserved virtual functions on HEAD
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
5a63a0f10a
commit
6021b8f80b
@ -65,17 +65,6 @@ public:
|
||||
// wxControl-specific processing after processing the update event
|
||||
virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
|
||||
|
||||
// Reserved for future use
|
||||
virtual void ReservedControlFunc1() {}
|
||||
virtual void ReservedControlFunc2() {}
|
||||
virtual void ReservedControlFunc3() {}
|
||||
virtual void ReservedControlFunc4() {}
|
||||
virtual void ReservedControlFunc5() {}
|
||||
virtual void ReservedControlFunc6() {}
|
||||
virtual void ReservedControlFunc7() {}
|
||||
virtual void ReservedControlFunc8() {}
|
||||
virtual void ReservedControlFunc9() {}
|
||||
|
||||
protected:
|
||||
// creates the control (calls wxWindowBase::CreateBase inside) and adds it
|
||||
// to the list of parents children
|
||||
|
@ -650,17 +650,6 @@ public:
|
||||
if (h) *h = hh;
|
||||
}
|
||||
|
||||
// Reserved for future use
|
||||
virtual void ReservedDCFunc1() {}
|
||||
virtual void ReservedDCFunc2() {}
|
||||
virtual void ReservedDCFunc3() {}
|
||||
virtual void ReservedDCFunc4() {}
|
||||
virtual void ReservedDCFunc5() {}
|
||||
virtual void ReservedDCFunc6() {}
|
||||
virtual void ReservedDCFunc7() {}
|
||||
virtual void ReservedDCFunc8() {}
|
||||
virtual void ReservedDCFunc9() {}
|
||||
|
||||
protected:
|
||||
// the pure virtual functions which should be implemented by wxDC
|
||||
virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
|
||||
|
@ -90,14 +90,6 @@ public:
|
||||
// On platforms that support it, get the theme page background colour, else invalid colour
|
||||
virtual wxColour GetThemeBackgroundColour() const { return wxNullColour; }
|
||||
|
||||
|
||||
// Reserved for future use
|
||||
virtual void ReservedNotebookFunc1() {}
|
||||
virtual void ReservedNotebookFunc2() {}
|
||||
virtual void ReservedNotebookFunc3() {}
|
||||
virtual void ReservedNotebookFunc4() {}
|
||||
virtual void ReservedNotebookFunc5() {}
|
||||
|
||||
protected:
|
||||
DECLARE_NO_COPY_CLASS(wxNotebookBase)
|
||||
};
|
||||
|
@ -471,18 +471,6 @@ public:
|
||||
// destroy a reference
|
||||
void UnRef();
|
||||
|
||||
|
||||
// Reserved for future use
|
||||
virtual void ReservedObjectFunc1() {}
|
||||
virtual void ReservedObjectFunc2() {}
|
||||
virtual void ReservedObjectFunc3() {}
|
||||
virtual void ReservedObjectFunc4() {}
|
||||
virtual void ReservedObjectFunc5() {}
|
||||
virtual void ReservedObjectFunc6() {}
|
||||
virtual void ReservedObjectFunc7() {}
|
||||
virtual void ReservedObjectFunc8() {}
|
||||
virtual void ReservedObjectFunc9() {}
|
||||
|
||||
protected:
|
||||
// ensure that our data is not shared with anybody else: if we have no
|
||||
// data, it is created using CreateRefData() below, if we have shared data
|
||||
|
@ -71,17 +71,6 @@ public:
|
||||
// returns true if the streams supports seeking to arbitrary offsets
|
||||
virtual bool IsSeekable() const { return false; }
|
||||
|
||||
// Reserved for future use
|
||||
virtual void ReservedStreamFunc1() {}
|
||||
virtual void ReservedStreamFunc2() {}
|
||||
virtual void ReservedStreamFunc3() {}
|
||||
virtual void ReservedStreamFunc4() {}
|
||||
virtual void ReservedStreamFunc5() {}
|
||||
virtual void ReservedStreamFunc6() {}
|
||||
virtual void ReservedStreamFunc7() {}
|
||||
virtual void ReservedStreamFunc8() {}
|
||||
virtual void ReservedStreamFunc9() {}
|
||||
|
||||
protected:
|
||||
virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
|
||||
virtual wxFileOffset OnSysTell() const;
|
||||
|
@ -204,17 +204,6 @@ public:
|
||||
// do the window-specific processing after processing the update event
|
||||
virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ;
|
||||
|
||||
// Reserved for future use
|
||||
virtual void ReservedTopLevelWindowFunc1() {}
|
||||
virtual void ReservedTopLevelWindowFunc2() {}
|
||||
virtual void ReservedTopLevelWindowFunc3() {}
|
||||
virtual void ReservedTopLevelWindowFunc4() {}
|
||||
virtual void ReservedTopLevelWindowFunc5() {}
|
||||
virtual void ReservedTopLevelWindowFunc6() {}
|
||||
virtual void ReservedTopLevelWindowFunc7() {}
|
||||
virtual void ReservedTopLevelWindowFunc8() {}
|
||||
virtual void ReservedTopLevelWindowFunc9() {}
|
||||
|
||||
protected:
|
||||
// the frame client to screen translation should take account of the
|
||||
// toolbar which may shift the origin of the client area
|
||||
|
@ -1081,17 +1081,6 @@ public:
|
||||
// behaviour in the most common case
|
||||
virtual bool ShouldInheritColours() const { return false; }
|
||||
|
||||
// Reserved for future use
|
||||
virtual void ReservedWindowFunc1() {}
|
||||
virtual void ReservedWindowFunc2() {}
|
||||
virtual void ReservedWindowFunc3() {}
|
||||
virtual void ReservedWindowFunc4() {}
|
||||
virtual void ReservedWindowFunc5() {}
|
||||
virtual void ReservedWindowFunc6() {}
|
||||
virtual void ReservedWindowFunc7() {}
|
||||
virtual void ReservedWindowFunc8() {}
|
||||
virtual void ReservedWindowFunc9() {}
|
||||
|
||||
protected:
|
||||
// event handling specific to wxWindow
|
||||
virtual bool TryValidator(wxEvent& event);
|
||||
@ -1338,9 +1327,6 @@ protected:
|
||||
// implements the window variants
|
||||
virtual void DoSetWindowVariant( wxWindowVariant variant ) ;
|
||||
|
||||
// Reserved for future use
|
||||
void* m_windowReserved;
|
||||
|
||||
private:
|
||||
// contains the last id generated by NewControlId
|
||||
static int ms_lastControlId;
|
||||
|
Loading…
Reference in New Issue
Block a user