Add optional wxWindow parameter to wxButtonBase::GetDefaultSize()

When per-monitor DPI is used, the default button size depends on the DPI of the
display. Use the window to determine this DPI.

include/wx/button.h

@@ -39,8 +39,9 @@ public:
     // returns the old default item (possibly NULL)
     virtual wxWindow *SetDefault();
 
-    // returns the default button size for this platform
-    static wxSize GetDefaultSize();
+    // returns the default button size for this platform, and optionally for a
+    // specific window when the platform supports per-monitor DPI
+    static wxSize GetDefaultSize(wxWindow* win = NULL);
 
 protected:
     wxDECLARE_NO_COPY_CLASS(wxButtonBase);

interface/wx/button.h

@@ -179,11 +179,14 @@ public:
 
 
     /**
-        Returns the default size for the buttons. It is advised to make all the dialog
-        buttons of the same size and this function allows retrieving the (platform and
-        current font dependent size) which should be the best suited for this.
+        Returns the default size for the buttons. It is advised to make all the
+        dialog buttons of the same size and this function allows retrieving the
+        (platform, and current font dependent) size which should be the best
+        suited for this.
+        The optional wxWindow parameter allows to get a per-monitor DPI
+        specific size.
     */
-    static wxSize GetDefaultSize();
+    static wxSize GetDefaultSize(wxWindow* win = NULL);
 
     /**
         Returns the string label for the button.

src/gtk/button.cpp

@@ -165,7 +165,7 @@ wxWindow *wxButton::SetDefault()
 }
 
 /* static */
-wxSize wxButtonBase::GetDefaultSize()
+wxSize wxButtonBase::GetDefaultSize(wxWindow* WXUNUSED(win))
 {
     static wxSize size = wxDefaultSize;
     if (size == wxDefaultSize)

src/gtk1/button.cpp

@@ -166,7 +166,7 @@ wxWindow *wxButton::SetDefault()
 }
 
 /* static */
-wxSize wxButtonBase::GetDefaultSize()
+wxSize wxButtonBase::GetDefaultSize(wxWindow* WXUNUSED(win))
 {
     return wxSize(80,26);
 }

src/msw/button.cpp

@@ -160,10 +160,8 @@ WXDWORD wxButton::MSWGetStyle(long style, WXDWORD *exstyle) const
 }
 
 /* static */
-wxSize wxButtonBase::GetDefaultSize()
+wxSize wxButtonBase::GetDefaultSize(wxWindow* win)
 {
-    wxWindow* win = wxTheApp ? wxTheApp->GetTopWindow() : NULL;
-
     static wxPrivate::DpiDependentValue<wxSize> s_sizeBtn;
 
     if ( s_sizeBtn.HasChanged(win) )

src/osx/button_osx.cpp

@@ -137,7 +137,7 @@ bool wxButton::OSXHandleClicked( double WXUNUSED(timestampsec) )
 }
 
 /* static */
-wxSize wxButtonBase::GetDefaultSize()
+wxSize wxButtonBase::GetDefaultSize(wxWindow* WXUNUSED(win))
 {
     return wxAnyButton::GetDefaultSize();
 }

src/qt/button.cpp

@@ -61,7 +61,7 @@ wxWindow *wxButton::SetDefault()
 }
 
 /* static */
-wxSize wxButtonBase::GetDefaultSize()
+wxSize wxButtonBase::GetDefaultSize(wxWindow* WXUNUSED(win))
 {
     static wxSize size = wxDefaultSize;
     if (size == wxDefaultSize)

src/univ/button.cpp

@@ -110,7 +110,7 @@ wxButton::~wxButton()
 // ----------------------------------------------------------------------------
 
 /* static */
-wxSize wxButtonBase::GetDefaultSize()
+wxSize wxButtonBase::GetDefaultSize(wxWindow* WXUNUSED(win))
 {
     static wxSize s_sizeBtn;