1. wxLoad/SaveFileSelector return "wxString" instead of "char *"
2. WXDLLEXPORT was misplaced in a couple of places (hopefully my chanegs won't break compilation for other compilers) 3. Some VC++ warnings suppressed in socket code git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -15,5 +15,41 @@
|
||||
#include "wx/stubs/filedlg.h"
|
||||
#endif
|
||||
|
||||
// File selector - backward compatibility
|
||||
WXDLLEXPORT wxString
|
||||
wxFileSelector(const char *message = wxFileSelectorPromptStr,
|
||||
const char *default_path = NULL,
|
||||
const char *default_filename = NULL,
|
||||
const char *default_extension = NULL,
|
||||
const char *wildcard = wxFileSelectorDefaultWildcardStr,
|
||||
int flags = 0,
|
||||
wxWindow *parent = NULL,
|
||||
int x = -1, int y = -1);
|
||||
|
||||
// An extended version of wxFileSelector
|
||||
WXDLLEXPORT wxString
|
||||
wxFileSelectorEx(const char *message = wxFileSelectorPromptStr,
|
||||
const char *default_path = NULL,
|
||||
const char *default_filename = NULL,
|
||||
int *indexDefaultExtension = NULL,
|
||||
const char *wildcard = wxFileSelectorDefaultWildcardStr,
|
||||
int flags = 0,
|
||||
wxWindow *parent = NULL,
|
||||
int x = -1, int y = -1);
|
||||
|
||||
// Ask for filename to load
|
||||
WXDLLEXPORT wxString
|
||||
wxLoadFileSelector(const char *what,
|
||||
const char *extension,
|
||||
const char *default_name = (const char *)NULL,
|
||||
wxWindow *parent = (wxWindow *) NULL);
|
||||
|
||||
// Ask for filename to save
|
||||
WXDLLEXPORT wxString
|
||||
wxSaveFileSelector(const char *what,
|
||||
const char *extension,
|
||||
const char *default_name = (const char *) NULL,
|
||||
wxWindow *parent = (wxWindow *) NULL);
|
||||
|
||||
#endif
|
||||
// _WX_FILEDLG_H_BASE_
|
||||
|
Reference in New Issue
Block a user