Further adaptions of wxFileDialog to mini-screens.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@22420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -470,7 +470,7 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
|
|||||||
#ifdef __VISUALC__
|
#ifdef __VISUALC__
|
||||||
m_isDir = ((buff.st_mode & _S_IFDIR ) == _S_IFDIR );
|
m_isDir = ((buff.st_mode & _S_IFDIR ) == _S_IFDIR );
|
||||||
#else
|
#else
|
||||||
m_isDir = S_ISDIR( buff.st_mode );
|
m_isDir = S_ISDIR( buff.st_mode );
|
||||||
#endif // VC++
|
#endif // VC++
|
||||||
m_isExe = ((buff.st_mode & wxS_IXUSR ) == wxS_IXUSR );
|
m_isExe = ((buff.st_mode & wxS_IXUSR ) == wxS_IXUSR );
|
||||||
|
|
||||||
@@ -1177,19 +1177,14 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
|
|||||||
// PDAs have a different screen layout
|
// PDAs have a different screen layout
|
||||||
mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
|
mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
|
||||||
|
|
||||||
wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
|
|
||||||
m_choice = new wxChoice( this, ID_CHOICE );
|
|
||||||
choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 5 );
|
|
||||||
mainsizer->Add( choicesizer, 0, wxEXPAND );
|
|
||||||
|
|
||||||
wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
|
wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
|
||||||
m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
|
m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
|
||||||
textsizer->Add( m_text, 1, wxCENTER | wxALL, 5 );
|
textsizer->Add( m_text, 1, wxCENTER | wxALL, 5 );
|
||||||
mainsizer->Add( textsizer, 0, wxEXPAND );
|
mainsizer->Add( textsizer, 0, wxEXPAND );
|
||||||
|
|
||||||
m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
|
m_check = NULL;
|
||||||
m_check->SetValue( ms_lastShowHidden );
|
m_choice = new wxChoice( this, ID_CHOICE );
|
||||||
textsizer->Add( m_check, 0, wxCENTER|wxALL, 5 );
|
textsizer->Add( m_choice, 1, wxCENTER|wxALL, 5 );
|
||||||
|
|
||||||
buttonsizer = new wxBoxSizer( wxHORIZONTAL );
|
buttonsizer = new wxBoxSizer( wxHORIZONTAL );
|
||||||
buttonsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxALL, 5 );
|
buttonsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxALL, 5 );
|
||||||
@@ -1229,9 +1224,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
|
|||||||
SetSizer( mainsizer );
|
SetSizer( mainsizer );
|
||||||
|
|
||||||
mainsizer->Fit( this );
|
mainsizer->Fit( this );
|
||||||
|
mainsizer->SetSizeHints( this );
|
||||||
if (!is_pda)
|
|
||||||
mainsizer->SetSizeHints( this );
|
|
||||||
|
|
||||||
Centre( wxBOTH );
|
Centre( wxBOTH );
|
||||||
|
|
||||||
@@ -1320,13 +1313,13 @@ void wxFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) )
|
|||||||
// not get the file whose name they typed.
|
// not get the file whose name they typed.
|
||||||
if (m_list->GetSelectedItemCount() > 0)
|
if (m_list->GetSelectedItemCount() > 0)
|
||||||
{
|
{
|
||||||
long item = m_list->GetNextItem(-1, wxLIST_NEXT_ALL,
|
long item = m_list->GetNextItem(-1, wxLIST_NEXT_ALL,
|
||||||
wxLIST_STATE_SELECTED);
|
wxLIST_STATE_SELECTED);
|
||||||
while ( item != -1 )
|
while ( item != -1 )
|
||||||
{
|
{
|
||||||
m_list->SetItemState(item,0, wxLIST_STATE_SELECTED);
|
m_list->SetItemState(item,0, wxLIST_STATE_SELECTED);
|
||||||
item = m_list->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
|
item = m_list->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user