Don't interpret '&' specially in wxTextWrapper.

[wxWidgets.git] / include / wx / osx / filedlg.h

diff --git a/include/wx/osx/filedlg.h b/include/wx/osx/filedlg.h
index faf901a6d5f4a8e9bebbb8d122f04e43d40aa8d2..2d7e1648f406b2c09bce436f4faa5a54579916c3 100644 (file)
--- a/include/wx/osx/filedlg.h
+++ b/include/wx/osx/filedlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlg.h
+// Name:        wx/osx/filedlg.h

 // Purpose:     wxFileDialog class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxFileDialog class
 // Author:      Stefan Csomor
 // Modified by:


@@ -41,6 +41,10 @@ public:
                  const wxSize& sz = wxDefaultSize,
                  const wxString& name = wxFileDialogNameStr);
 
                  const wxSize& sz = wxDefaultSize,
                  const wxString& name = wxFileDialogNameStr);
 

+#if wxOSX_USE_COCOA
+    ~wxFileDialog();
+#endif
+    

     virtual void GetPaths(wxArrayString& paths) const { paths = m_paths; }
     virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; }
 
     virtual void GetPaths(wxArrayString& paths) const { paths = m_paths; }
     virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; }
 


@@ -70,6 +74,7 @@ protected:
     
 #if wxOSX_USE_COCOA
     virtual wxWindow* CreateFilterPanel(wxWindow *extracontrol);
     
 #if wxOSX_USE_COCOA
     virtual wxWindow* CreateFilterPanel(wxWindow *extracontrol);

+    void DoOnFilterSelected(int index);

     virtual void OnFilterSelected(wxCommandEvent &event);
 
     wxArrayString m_filterExtensions;
     virtual void OnFilterSelected(wxCommandEvent &event);
 
     wxArrayString m_filterExtensions;


@@ -80,6 +85,7 @@ protected:
     int m_firstFileTypeFilter;
     wxArrayString m_currentExtensions;
     WX_NSObject m_delegate;
     int m_firstFileTypeFilter;
     wxArrayString m_currentExtensions;
     WX_NSObject m_delegate;

+    WX_NSObject m_sheetDelegate;

 #endif
 };
 
 #endif
 };