Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved the implemtation of the generic and the

Browse Source 
native GTK 2.4 file dialogs into one place
   by making wxFileDialog derive from the
   generic variant and by then choosing which
   implementation to use. Later, we'll add
   run-time checks.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-12-05 20:30:18 +00:00
parent 822cf31c27
commit 4e1901b70e
7 changed files with 321 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/generic/filedlgg.cpp
View File

@@ -20,7 +20,7 @@
#pragma hdrstop
#endif
#if wxUSE_FILEDLG && !defined(__WXGTK24__)
#if wxUSE_FILEDLG
// NOTE : it probably also supports MAC, untested
#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__)
@@ -876,11 +876,29 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
const wxString& defaultFile,
const wxString& wildCard,
long style,
const wxPoint& pos )
const wxPoint& pos,
bool bypassGenericImpl )
:wxFileDialogBase(parent, message, defaultDir, defaultFile, wildCard, style, pos)
{
wxDialog::Create( parent, wxID_ANY, message, pos, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER );
m_bypassGenericImpl = bypassGenericImpl;
if (!m_bypassGenericImpl)
Create( parent, message, defaultDir, defaultFile, wildCard, style, pos );
}
bool wxGenericFileDialog::Create( wxWindow *parent,
const wxString& message,
const wxString& defaultDir,
const wxString& defaultFile,
const wxString& wildCard,
long style,
const wxPoint& pos )
{
if (!wxDialog::Create( parent, wxID_ANY, message, pos, wxDefaultSize,
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ))
{
return false;
}
if (wxConfig::Get(false))
{
@@ -1031,22 +1049,27 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
Centre( wxBOTH );
m_text->SetFocus();
return true;
}
wxGenericFileDialog::~wxGenericFileDialog()
{
if (wxConfig::Get(false))
if (!m_bypassGenericImpl)
{
wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
ms_lastViewStyle);
wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
ms_lastShowHidden);
}
if (wxConfig::Get(false))
{
wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
ms_lastViewStyle);
wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
ms_lastShowHidden);
}
const int count = m_choice->GetCount();
for ( int i = 0; i < count; i++ )
{
delete (wxString *)m_choice->GetClientData(i);
const int count = m_choice->GetCount();
for ( int i = 0; i < count; i++ )
{
delete (wxString *)m_choice->GetClientData(i);
}
}
}
@@ -1416,5 +1439,5 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog);
#endif // USE_GENERIC_FILEDIALOG
#endif // wxUSE_FILEDLG && !defined(__WXGTK24__)
#endif // wxUSE_FILEDLG