adding measuring contexts, streamlining printing code

[wxWidgets.git] / include / wx / mac / carbon / filedlg.h

diff --git a/include/wx/mac/carbon/filedlg.h b/include/wx/mac/carbon/filedlg.h
index 4cc0387a082575259160cb25b5c44594efb1b094..d9559656f9206c8dfdee99735e6f2cc9705d63b4 100644 (file)
--- a/include/wx/mac/carbon/filedlg.h
+++ b/include/wx/mac/carbon/filedlg.h
@@ -12,10 +12,6 @@
 #ifndef _WX_FILEDLG_H_
 #define _WX_FILEDLG_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "filedlg.h"
-#endif
-
 //-------------------------------------------------------------------------
 // wxFileDialog
 //-------------------------------------------------------------------------
@@ -33,14 +29,17 @@ public:
                  const wxString& defaultDir = wxEmptyString,
                  const wxString& defaultFile = wxEmptyString,
                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
-                 long style = 0,
-                 const wxPoint& pos = wxDefaultPosition);
+                 long style = wxFD_DEFAULT_STYLE,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& sz = wxDefaultSize,
+                 const wxString& name = wxFileDialogNameStr);
 
     virtual void GetPaths(wxArrayString& paths) const { paths = m_paths; }
     virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; }
 
     virtual int ShowModal();
-    
+
+protected:
     // not supported for file dialog, RR
     virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
                            int WXUNUSED(width), int WXUNUSED(height),