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

InheritAttributes is public in the base class, make it so here too.

Browse Source
This commit is contained in:
Robin Dunn
2020-06-29 12:00:28 -07:00
parent c43af017c9
commit 42a5745367
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,8 @@ public:
wxNonOwnedWindow(); wxNonOwnedWindow();
virtual ~wxNonOwnedWindow(); virtual ~wxNonOwnedWindow();
virtual void InheritAttributes() wxOVERRIDE;
protected: protected:
virtual bool DoClearShape() wxOVERRIDE; virtual bool DoClearShape() wxOVERRIDE;
virtual bool DoSetRegionShape(const wxRegion& region) wxOVERRIDE; virtual bool DoSetRegionShape(const wxRegion& region) wxOVERRIDE;
@@ -30,7 +32,6 @@ protected:
#endif // wxUSE_GRAPHICS_CONTEXT #endif // wxUSE_GRAPHICS_CONTEXT
virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE;
virtual void InheritAttributes() wxOVERRIDE;
private: private:
bool HandleDPIChange(const wxSize& newDPI, const wxRect& newRect); bool HandleDPIChange(const wxSize& newDPI, const wxRect& newRect);