More wxChar conversion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
621ae68a13
commit
e97f6ab64e
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#include "wx/dialog.h"
|
#include "wx/dialog.h"
|
||||||
|
|
||||||
WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
|
WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr;
|
||||||
|
|
||||||
class WXDLLEXPORT wxDirDialog: public wxDialog
|
class WXDLLEXPORT wxDirDialog: public wxDialog
|
||||||
{
|
{
|
||||||
|
@ -22,8 +22,8 @@
|
|||||||
* File selector
|
* File selector
|
||||||
*/
|
*/
|
||||||
|
|
||||||
WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
|
WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorPromptStr;
|
||||||
WXDLLEXPORT_DATA(extern const char*) wxFileSelectorDefaultWildcardStr;
|
WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorDefaultWildcardStr;
|
||||||
|
|
||||||
class WXDLLEXPORT wxFileDialog: public wxDialog
|
class WXDLLEXPORT wxFileDialog: public wxDialog
|
||||||
{
|
{
|
||||||
@ -71,38 +71,38 @@ protected:
|
|||||||
|
|
||||||
// File selector - backward compatibility
|
// File selector - backward compatibility
|
||||||
WXDLLEXPORT wxString
|
WXDLLEXPORT wxString
|
||||||
wxFileSelector(const char *message = wxFileSelectorPromptStr,
|
wxFileSelector(const wxChar *message = wxFileSelectorPromptStr,
|
||||||
const char *default_path = NULL,
|
const wxChar *default_path = NULL,
|
||||||
const char *default_filename = NULL,
|
const wxChar *default_filename = NULL,
|
||||||
const char *default_extension = NULL,
|
const wxChar *default_extension = NULL,
|
||||||
const char *wildcard = wxFileSelectorDefaultWildcardStr,
|
const wxChar *wildcard = wxFileSelectorDefaultWildcardStr,
|
||||||
int flags = 0,
|
int flags = 0,
|
||||||
wxWindow *parent = NULL,
|
wxWindow *parent = NULL,
|
||||||
int x = -1, int y = -1);
|
int x = -1, int y = -1);
|
||||||
|
|
||||||
// An extended version of wxFileSelector
|
// An extended version of wxFileSelector
|
||||||
WXDLLEXPORT wxString
|
WXDLLEXPORT wxString
|
||||||
wxFileSelectorEx(const char *message = wxFileSelectorPromptStr,
|
wxFileSelectorEx(const wxChar *message = wxFileSelectorPromptStr,
|
||||||
const char *default_path = NULL,
|
const wxChar *default_path = NULL,
|
||||||
const char *default_filename = NULL,
|
const wxChar *default_filename = NULL,
|
||||||
int *indexDefaultExtension = NULL,
|
int *indexDefaultExtension = NULL,
|
||||||
const char *wildcard = wxFileSelectorDefaultWildcardStr,
|
const wxChar *wildcard = wxFileSelectorDefaultWildcardStr,
|
||||||
int flags = 0,
|
int flags = 0,
|
||||||
wxWindow *parent = NULL,
|
wxWindow *parent = NULL,
|
||||||
int x = -1, int y = -1);
|
int x = -1, int y = -1);
|
||||||
|
|
||||||
// Ask for filename to load
|
// Ask for filename to load
|
||||||
WXDLLEXPORT wxString
|
WXDLLEXPORT wxString
|
||||||
wxLoadFileSelector(const char *what,
|
wxLoadFileSelector(const wxChar *what,
|
||||||
const char *extension,
|
const wxChar *extension,
|
||||||
const char *default_name = (const char *)NULL,
|
const wxChar *default_name = (const wxChar *)NULL,
|
||||||
wxWindow *parent = (wxWindow *) NULL);
|
wxWindow *parent = (wxWindow *) NULL);
|
||||||
|
|
||||||
// Ask for filename to save
|
// Ask for filename to save
|
||||||
WXDLLEXPORT wxString
|
WXDLLEXPORT wxString
|
||||||
wxSaveFileSelector(const char *what,
|
wxSaveFileSelector(const wxChar *what,
|
||||||
const char *extension,
|
const wxChar *extension,
|
||||||
const char *default_name = (const char *) NULL,
|
const wxChar *default_name = (const wxChar *) NULL,
|
||||||
wxWindow *parent = (wxWindow *) NULL);
|
wxWindow *parent = (wxWindow *) NULL);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user