Merge branch 'collpane-bestsize'

Fix generic collapsible pane best size determination. See https://github.com/wxWidgets/wxWidgets/pull/1580
2019-10-01 20:17:52 +02:00
parent 244547a010 45a4db125e
commit 43e1066f10
4 changed files with 31 additions and 13 deletions
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -73,7 +73,7 @@ public:

 protected:
    // overridden methods
-    virtual wxSize DoGetBestSize() const wxOVERRIDE;
+    virtual wxSize DoGetBestClientSize() const wxOVERRIDE;

    int GetBorder() const;