This merges in the latest sources from GSoC 2014 wxQt project with just a few minor corrections, mostly undoing wrong changes to common files in that branch (results of a previous bad merge?) and getting rid of whitespace-only changes. Also remove debug logging from wxGrid. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
		
			
				
	
	
		
			59 lines
		
	
	
		
			2.3 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			59 lines
		
	
	
		
			2.3 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /////////////////////////////////////////////////////////////////////////////
 | |
| // Name:        wx/qt/filedlg.h
 | |
| // Author:      Sean D'Epagnier
 | |
| // Copyright:   (c) 2014 Sean D'Epagnier
 | |
| // Licence:     wxWindows licence
 | |
| /////////////////////////////////////////////////////////////////////////////
 | |
| 
 | |
| #ifndef _WX_QT_FILEDLG_H_
 | |
| #define _WX_QT_FILEDLG_H_
 | |
| 
 | |
| #include <QtWidgets/QFileDialog>
 | |
| 
 | |
| class WXDLLIMPEXP_CORE wxFileDialog : public wxFileDialogBase
 | |
| {
 | |
| public:
 | |
|     wxFileDialog() { }
 | |
|     wxFileDialog(wxWindow *parent,
 | |
|                  const wxString& message = wxFileSelectorPromptStr,
 | |
|                  const wxString& defaultDir = wxEmptyString,
 | |
|                  const wxString& defaultFile = wxEmptyString,
 | |
|                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
 | |
|                  long style = wxFD_DEFAULT_STYLE,
 | |
|                  const wxPoint& pos = wxDefaultPosition,
 | |
|                  const wxSize& sz = wxDefaultSize,
 | |
|                  const wxString& name = wxFileDialogNameStr);
 | |
|     bool Create(wxWindow *parent,
 | |
|                  const wxString& message = wxFileSelectorPromptStr,
 | |
|                  const wxString& defaultDir = wxEmptyString,
 | |
|                  const wxString& defaultFile = wxEmptyString,
 | |
|                  const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
 | |
|                  long style = wxFD_DEFAULT_STYLE,
 | |
|                  const wxPoint& pos = wxDefaultPosition,
 | |
|                  const wxSize& sz = wxDefaultSize,
 | |
|                  const wxString& name = wxFileDialogNameStr);
 | |
| 
 | |
|     virtual wxString GetPath() const wxOVERRIDE;
 | |
|     virtual void GetPaths(wxArrayString& paths) const wxOVERRIDE;
 | |
|     virtual wxString GetFilename() const wxOVERRIDE;
 | |
|     virtual void GetFilenames(wxArrayString& files) const wxOVERRIDE;
 | |
|     virtual int GetFilterIndex() const wxOVERRIDE;
 | |
| 
 | |
|     virtual void SetMessage(const wxString& message) wxOVERRIDE;
 | |
|     virtual void SetPath(const wxString& path) wxOVERRIDE;
 | |
|     virtual void SetDirectory(const wxString& dir) wxOVERRIDE;
 | |
|     virtual void SetFilename(const wxString& name) wxOVERRIDE;
 | |
|     virtual void SetWildcard(const wxString& wildCard) wxOVERRIDE;
 | |
|     virtual void SetFilterIndex(int filterIndex) wxOVERRIDE;
 | |
| 
 | |
|     virtual bool SupportsExtraControl() const wxOVERRIDE { return true; }
 | |
| 
 | |
|     virtual QFileDialog *GetHandle() const;
 | |
|     
 | |
| private:
 | |
|     
 | |
|     DECLARE_DYNAMIC_CLASS(wxFileDialog)
 | |
| };
 | |
| 
 | |
| #endif // _WX_QT_FILEDLG_H_
 |