Applied patch for generic file dialog Show()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -68,6 +68,7 @@ public:
 | 
				
			|||||||
    // -------------------------------
 | 
					    // -------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual int ShowModal();
 | 
					    virtual int ShowModal();
 | 
				
			||||||
 | 
					    virtual bool Show( bool show = true );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    void OnSelected( wxListEvent &event );
 | 
					    void OnSelected( wxListEvent &event );
 | 
				
			||||||
    void OnActivated( wxListEvent &event );
 | 
					    void OnActivated( wxListEvent &event );
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1059,6 +1059,18 @@ int wxGenericFileDialog::ShowModal()
 | 
				
			|||||||
    return wxDialog::ShowModal();
 | 
					    return wxDialog::ShowModal();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					bool wxGenericFileDialog::Show( bool show )
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    if (show)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        m_list->GoToDir(m_dir);
 | 
				
			||||||
 | 
					        UpdateControls();
 | 
				
			||||||
 | 
					        m_text->SetValue(m_fileName);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return wxDialog::Show( show );
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void wxGenericFileDialog::DoSetFilterIndex(int filterindex)
 | 
					void wxGenericFileDialog::DoSetFilterIndex(int filterindex)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    wxString *str = (wxString*) m_choice->GetClientData( filterindex );
 | 
					    wxString *str = (wxString*) m_choice->GetClientData( filterindex );
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user