Fixed conflicts with Robert's similar fixes; fixed toolbar size calculation

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

diff --git a/include/wx/os2/filedlg.h b/include/wx/os2/filedlg.h
index 134f26b77a720820176e92a5ec11dfe04a83d6a6..d1b17552dba9b91be0b324fc9e15f58a747678b0 100644 (file)
--- a/include/wx/os2/filedlg.h
+++ b/include/wx/os2/filedlg.h
@@ -39,8 +39,11 @@ public:
 
     inline wxString GetMessage() const { return m_message; }
     inline wxString GetPath() const { return m_path; }
 
     inline wxString GetMessage() const { return m_message; }
     inline wxString GetPath() const { return m_path; }

+    inline void GetPaths(wxArrayString& a) { a.Empty(); a.Add(m_path); }

     inline wxString GetDirectory() const { return m_dir; }
     inline wxString GetFilename() const { return m_fileName; }
     inline wxString GetDirectory() const { return m_dir; }
     inline wxString GetFilename() const { return m_fileName; }

+    inline void GetFilenames(wxArrayString& a) { a.Empty();
+       a.Add( m_fileName); }

     inline wxString GetWildcard() const { return m_wildCard; }
     inline long GetStyle() const { return m_dialogStyle; }
     inline int GetFilterIndex() const { return m_filterIndex ; }
     inline wxString GetWildcard() const { return m_wildCard; }
     inline long GetStyle() const { return m_dialogStyle; }
     inline int GetFilterIndex() const { return m_filterIndex ; }