use wxBoxSizer in wxPickerBase instead of doing the layout manually + other picker controls fixes (patch 1513042)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -45,10 +45,11 @@ bool wxFileButton::Create( wxWindow *parent, wxWindowID id,
|
||||
{
|
||||
if (!gtk_check_version(2,6,0))
|
||||
{
|
||||
// VERY IMPORTANT: this code is identic to relative code in wxFileButton;
|
||||
// if you find a problem here, fix it also in wxFileButton !
|
||||
// VERY IMPORTANT: this code is identic to relative code in wxDirButton;
|
||||
// if you find a problem here, fix it also in wxDirButton !
|
||||
|
||||
m_needParent = true;
|
||||
m_acceptsFocus = true;
|
||||
|
||||
if (!PreCreation( parent, pos, size ) ||
|
||||
!wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
|
||||
@@ -127,7 +128,6 @@ void wxFileButton::OnDialogOK(wxCommandEvent& ev)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void wxFileButton::SetPath(const wxString &str)
|
||||
{
|
||||
m_path = str;
|
||||
@@ -200,6 +200,7 @@ bool wxDirButton::Create( wxWindow *parent, wxWindowID id,
|
||||
// if you find a problem here, fix it also in wxFileButton !
|
||||
|
||||
m_needParent = true;
|
||||
m_acceptsFocus = true;
|
||||
|
||||
if (!PreCreation( parent, pos, size ) ||
|
||||
!wxControl::CreateBase(parent, id, pos, size, style & wxWINDOW_STYLE_MASK,
|
||||
|
||||
Reference in New Issue
Block a user