Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / palmos / filedlg.cpp

diff --git a/src/palmos/filedlg.cpp b/src/palmos/filedlg.cpp
index 747b6377de0bf0385dcbfba371f265dccad3ae65..d03ec1b7421427e09397cf5c3a7d65a266bc0b68 100644 (file)
--- a/src/palmos/filedlg.cpp
+++ b/src/palmos/filedlg.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/filedlg.cpp
 // Purpose:     wxFileDialog
-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "filedlg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -30,19 +26,18 @@
 
 #if wxUSE_FILEDLG && !defined(__SMARTPHONE__)
 
+#include "wx/filedlg.h"
+
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
-    #include "wx/filedlg.h"
     #include "wx/filefn.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
+    #include "wx/math.h"
 #endif
 
-#include "wx/palmos/private.h"
-
-#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -79,8 +74,10 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
                            const wxString& defaultFileName,
                            const wxString& wildCard,
                            long style,
-                           const wxPoint& pos)
-             :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos)
+                           const wxPoint& pos,
+                           const wxSize& sz,
+                           const wxString& name)
+             :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name)
 
 {
 }
@@ -103,4 +100,3 @@ int wxFileDialog::ShowModal()
 }
 
 #endif // wxUSE_FILEDLG
-