Added screen design to system settings for
different dialog layouts on desktop vs PDA screens git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -34,6 +34,7 @@
|
||||
#include "wx/dcscreen.h"
|
||||
#include "wx/button.h"
|
||||
#include "wx/validate.h"
|
||||
#include "wx/settings.h"
|
||||
#endif
|
||||
|
||||
#include "wx/univ/renderer.h"
|
||||
@@ -136,15 +137,16 @@ wxSize wxButton::DoGetBestClientSize() const
|
||||
}
|
||||
|
||||
// for compatibility with other ports, the buttons default size is never
|
||||
// less than the standard one
|
||||
#ifndef __WXX11__
|
||||
if ( !(GetWindowStyle() & wxBU_EXACTFIT) )
|
||||
// less than the standard one, but not when display not PDAs.
|
||||
if (wxSystemSettings::GetScreen() < wxSYS_SCREEN_PDA)
|
||||
{
|
||||
wxSize szDef = GetDefaultSize();
|
||||
if ( width < szDef.x )
|
||||
width = szDef.x;
|
||||
if ( !(GetWindowStyle() & wxBU_EXACTFIT) )
|
||||
{
|
||||
wxSize szDef = GetDefaultSize();
|
||||
if ( width < szDef.x )
|
||||
width = szDef.x;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
return wxSize(width, height);
|
||||
}
|
||||
|
Reference in New Issue
Block a user