From e9c3992c393926560befe4e312e4b135b675297f Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Sat, 10 Jan 2009 18:31:45 +0000 Subject: [PATCH] s/""/wxEmptyString git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/combobox.h | 2 +- interface/wx/dirdlg.h | 2 +- interface/wx/filedlg.h | 13 +++++++------ interface/wx/font.h | 12 ++++++------ interface/wx/fontenum.h | 2 +- interface/wx/metafile.h | 4 ++-- interface/wx/odcombo.h | 4 ++-- interface/wx/textdlg.h | 4 ++-- interface/wx/utils.h | 2 +- 9 files changed, 23 insertions(+), 22 deletions(-) diff --git a/interface/wx/combobox.h b/interface/wx/combobox.h index c04b81de47..2aa5c1d63e 100644 --- a/interface/wx/combobox.h +++ b/interface/wx/combobox.h @@ -99,7 +99,7 @@ public: @see Create(), wxValidator */ wxComboBox(wxWindow* parent, wxWindowID id, - const wxString& value = "", + const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, diff --git a/interface/wx/dirdlg.h b/interface/wx/dirdlg.h index 400452315d..1765cef770 100644 --- a/interface/wx/dirdlg.h +++ b/interface/wx/dirdlg.h @@ -134,7 +134,7 @@ public: @header{wx/dirdlg.h} */ wxString wxDirSelector(const wxString& message = wxDirSelectorPromptStr, - const wxString& default_path = "", + const wxString& default_path = wxEmptyString, long style = 0, const wxPoint& pos = wxDefaultPosition, wxWindow* parent = NULL); diff --git a/interface/wx/filedlg.h b/interface/wx/filedlg.h index 1093760f98..450f333e7f 100644 --- a/interface/wx/filedlg.h +++ b/interface/wx/filedlg.h @@ -14,9 +14,10 @@ It pops up a file selector box (native for Windows and GTK2.4+). The path and filename are distinct elements of a full file pathname. - If path is "", the current directory will be used. If filename is "", no default - filename will be supplied. The wildcard determines what files are displayed in the - file selector, and file extension supplies a type extension for the required filename. + If path is wxEmptyString, the current directory will be used. + If filename is wxEmptyString, no default filename will be supplied. + The wildcard determines what files are displayed in the file selector, + and file extension supplies a type extension for the required filename. @remarks All implementations of the wxFileDialog provide a wildcard filter. Typing a filename @@ -272,9 +273,9 @@ public: @header{wx/filedlg.h} */ wxString wxFileSelector(const wxString& message, - const wxString& default_path = "", - const wxString& default_filename = "", - const wxString& default_extension = "", + const wxString& default_path = wxEmptyString, + const wxString& default_filename = wxEmptyString, + const wxString& default_extension = wxEmptyString, const wxString& wildcard = ".", int flags = 0, wxWindow* parent = NULL, diff --git a/interface/wx/font.h b/interface/wx/font.h index e4e99ae1dc..3e6dce7ed7 100644 --- a/interface/wx/font.h +++ b/interface/wx/font.h @@ -313,7 +313,7 @@ public: wxFont(int pointSize, wxFontFamily family, int style, wxFontWeight weight, bool underline = false, - const wxString& faceName = "", + const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); /** @@ -362,7 +362,7 @@ public: wxFont(const wxSize& pixelSize, wxFontFamily family, int style, wxFontWeight weight, bool underline = false, - const wxString& faceName = "", + const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); //@} @@ -476,23 +476,23 @@ public: static wxFont* New(int pointSize, wxFontFamily family, int style, wxFontWeight weight, bool underline = false, - const wxString& faceName = "", + const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); static wxFont* New(int pointSize, wxFontFamily family, int flags = wxFONTFLAG_DEFAULT, - const wxString& faceName = "", + const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); static wxFont* New(const wxSize& pixelSize, wxFontFamily family, int style, wxFontWeight weight, bool underline = false, - const wxString& faceName = "", + const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); static wxFont* New(const wxSize& pixelSize, wxFontFamily family, int flags = wxFONTFLAG_DEFAULT, - const wxString& faceName = "", + const wxString& faceName = wxEmptyString, wxFontEncoding encoding = wxFONTENCODING_DEFAULT); //@} diff --git a/interface/wx/fontenum.h b/interface/wx/fontenum.h index ad31d2e524..089443aed0 100644 --- a/interface/wx/fontenum.h +++ b/interface/wx/fontenum.h @@ -56,7 +56,7 @@ public: Return array of strings containing all encodings found by EnumerateEncodings(). */ - static wxArrayString GetEncodings(const wxString& facename = ""); + static wxArrayString GetEncodings(const wxString& facename = wxEmptyString); /** Return array of strings containing all facenames found by diff --git a/interface/wx/metafile.h b/interface/wx/metafile.h index 35afa09c4c..8d4f7c3b28 100644 --- a/interface/wx/metafile.h +++ b/interface/wx/metafile.h @@ -39,7 +39,7 @@ public: Constructor. If no filename is passed, the metafile is created in memory. */ - wxMetafileDC(const wxString& filename = ""); + wxMetafileDC(const wxString& filename = wxEmptyString); /** Destructor. @@ -82,7 +82,7 @@ public: If a filename is given, the Windows disk metafile is read in. Check whether this was performed successfully by using the IsOk() member. */ - wxMetafile(const wxString& filename = ""); + wxMetafile(const wxString& filename = wxEmptyString); /** Destructor. diff --git a/interface/wx/odcombo.h b/interface/wx/odcombo.h index f77cb38732..7544ba228d 100644 --- a/interface/wx/odcombo.h +++ b/interface/wx/odcombo.h @@ -97,7 +97,7 @@ public: @see Create(), wxValidator */ wxOwnerDrawnComboBox(wxWindow* parent, wxWindowID id, - const wxString& value = "", + const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, @@ -153,7 +153,7 @@ public: @remarks Derived classes should call or replace this function. */ bool Create(wxWindow* parent, wxWindowID id, - const wxString& value = "", + const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n, const wxString choices[], diff --git a/interface/wx/textdlg.h b/interface/wx/textdlg.h index b61d9bf479..24c3b80baf 100644 --- a/interface/wx/textdlg.h +++ b/interface/wx/textdlg.h @@ -133,7 +133,7 @@ public: */ wxString wxGetTextFromUser(const wxString& message, const wxString& caption = "Input text", - const wxString& default_value = "", + const wxString& default_value = wxEmptyString, wxWindow* parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord, @@ -148,7 +148,7 @@ wxString wxGetTextFromUser(const wxString& message, */ wxString wxGetPasswordFromUser(const wxString& message, const wxString& caption = "Input text", - const wxString& default_value = "", + const wxString& default_value = wxEmptyString, wxWindow* parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord, diff --git a/interface/wx/utils.h b/interface/wx/utils.h index 94e9977e61..8e615d89ac 100644 --- a/interface/wx/utils.h +++ b/interface/wx/utils.h @@ -538,7 +538,7 @@ wxString wxGetFullHostName(); @header{wx/utils.h} */ -wxString wxGetUserHome(const wxString& user = ""); +wxString wxGetUserHome(const wxString& user = wxEmptyString); /** This function returns the "user id" also known as "login name" under Unix -- 2.45.2