Update of /cvsroot/audacity/lib-src/FileDialog/gtk
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv23310/gtk
Modified Files:
FileDialog.hpp
Log Message:
Fix compilation with wx2.8
Index: FileDialog.hpp
===================================================================
RCS file: /cvsroot/audacity/lib-src/FileDialog/gtk/FileDialog.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- FileDialog.hpp 11 Apr 2007 01:33:22 -0000 1.4
+++ FileDialog.hpp 15 Apr 2007 10:36:04 -0000 1.5
@@ -30,6 +30,7 @@
#include "wx/tokenzr.h" // wxStringTokenizer
#include "wx/filefn.h" // ::wxGetCwd
#include "wx/msgdlg.h" // wxMessageDialog
+#include "wx/version.h"
//-----------------------------------------------------------------------------
// idle system
@@ -167,7 +168,12 @@
const wxString& wildCard,
long style, const wxPoint& pos)
: wxGenericFileDialog(parent, message, defaultDir, defaultFileName,
- wildCard, style, pos, true )
+ wildCard, style, pos,
+#if wxCHECK_VERSION(2,8,0)
+ wxDefaultSize,
+ wxFileDialogNameStr,
+#endif
+ true )
{
#if defined(__WXGTK24__) && (!defined(__WXGPE__))
if (!gtk_check_version(2,4,0))
@@ -277,9 +283,10 @@
void FileDialog::OnFakeOk( wxCommandEvent &event )
{
#if defined(__WXGTK24__) && (!defined(__WXGPE__))
- if (!gtk_check_version(2,4,0))
- wxDialog::OnOK( event );
- else
+ if (!gtk_check_version(2,4,0)) {
+ if (Validate() && TransferDataFromWindow())
+ EndModal(wxID_OK);
+ } else
#endif
wxGenericFileDialog::OnListOk( event );
}
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
