Oh well, I'll just stuff in the rest of the Unicode changes I have made
so far here. You may start complaining now. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -32,7 +32,7 @@ class wxComboBox;
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern const char* wxComboBoxNameStr;
|
||||
extern const char* wxEmptyString;
|
||||
extern const wxChar* wxEmptyString;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxComboBox
|
||||
|
@@ -21,8 +21,8 @@
|
||||
// File selector
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
extern const char *wxFileSelectorPromptStr;
|
||||
extern const char *wxFileSelectorDefaultWildcardStr;
|
||||
extern const wxChar *wxFileSelectorPromptStr;
|
||||
extern const wxChar *wxFileSelectorDefaultWildcardStr;
|
||||
|
||||
class wxFileDialog: public wxDialog
|
||||
{
|
||||
@@ -75,38 +75,38 @@ protected:
|
||||
|
||||
// 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,
|
||||
wxFileSelector(const wxChar *message = wxFileSelectorPromptStr,
|
||||
const wxChar *default_path = NULL,
|
||||
const wxChar *default_filename = NULL,
|
||||
const wxChar *default_extension = NULL,
|
||||
const wxChar *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,
|
||||
wxFileSelectorEx(const wxChar *message = wxFileSelectorPromptStr,
|
||||
const wxChar *default_path = NULL,
|
||||
const wxChar *default_filename = NULL,
|
||||
int *indexDefaultExtension = NULL,
|
||||
const char *wildcard = wxFileSelectorDefaultWildcardStr,
|
||||
const wxChar *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,
|
||||
wxLoadFileSelector(const wxChar *what,
|
||||
const wxChar *extension,
|
||||
const wxChar *default_name = (const wxChar *)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,
|
||||
wxSaveFileSelector(const wxChar *what,
|
||||
const wxChar *extension,
|
||||
const wxChar *default_name = (const wxChar *) NULL,
|
||||
wxWindow *parent = (wxWindow *) NULL);
|
||||
|
||||
#endif
|
||||
|
@@ -41,7 +41,7 @@ class wxFontNameDirectory;
|
||||
/*
|
||||
extern wxFontNameDirectory *wxTheFontNameDirectory;
|
||||
*/
|
||||
extern const char* wxEmptyString;
|
||||
extern const wxChar* wxEmptyString;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxFont
|
||||
|
Reference in New Issue
Block a user