AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wxCocoa build fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2005-05-23 16:13:37 +00:00
parent 8241721975
commit a04a377acf
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
utils/configtool/src/utils.cpp
View File

@ -35,6 +35,7 @@
#include "wx/log.h" #include "wx/log.h"
#include "wx/sizer.h" #include "wx/sizer.h"
#include "wx/icon.h" #include "wx/icon.h"
#include "wx/intl.h"
#endif #endif
@ -120,7 +121,7 @@ wxFont apStringToFont(const wxString& str)
int style = wxNORMAL; int style = wxNORMAL;
int weight = wxNORMAL; int weight = wxNORMAL;
int underlined = 0; int underlined = 0;
wxString facename(wxT("")); wxString facename;
wxStringTokenizer tkz(str, wxT(",")); wxStringTokenizer tkz(str, wxT(","));
int i = 0; int i = 0;
@ -206,7 +207,7 @@ void apViewHTMLFile(const wxString& url)
wxString cmd; wxString cmd;
bool ok = ft->GetOpenCommand(&cmd, bool ok = ft->GetOpenCommand(&cmd,
wxFileType::MessageParameters(url, _T(""))); wxFileType::MessageParameters(url, wxEmptyString));
delete ft; delete ft;
if (!ok) if (!ok)
@ -266,7 +267,7 @@ bool apInvokeAppForFile(const wxString& filename)
} }
wxString cmd; wxString cmd;
ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(filename, _T(""))); ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(filename, wxEmptyString));
delete ft; delete ft;
return (wxExecute(cmd, false) != 0); return (wxExecute(cmd, false) != 0);
@ -281,10 +282,10 @@ bool apInvokeAppForFile(const wxString& filename)
wxString apFindAppPath(const wxString& argv0, const wxString& cwd, const wxString& appVariableName) wxString apFindAppPath(const wxString& argv0, const wxString& cwd, const wxString& appVariableName)
{ {
// Try appVariableName // Try appVariableName
if (!appVariableName.IsEmpty()) if (!appVariableName.empty())
{ {
wxString strVar(wxGetenv(appVariableName.c_str())); wxString strVar(wxGetenv(appVariableName.c_str()));
if (!strVar.IsEmpty()) if (!strVar.empty())
return strVar; return strVar;
} }
@ -308,7 +309,7 @@ wxString apFindAppPath(const wxString& argv0, const wxString& cwd, const wxStrin
wxPathList pathList; wxPathList pathList;
pathList.AddEnvList(wxT("PATH")); pathList.AddEnvList(wxT("PATH"));
wxString strPath = pathList.FindAbsoluteValidPath(argv0); wxString strPath = pathList.FindAbsoluteValidPath(argv0);
if (!strPath.IsEmpty()) if (!strPath.empty())
return wxPathOnly(strPath); return wxPathOnly(strPath);
// Failed // Failed
@ -525,7 +526,7 @@ bool ctMatchString(const wxString& matchAgainst, const wxString& matchText, bool
wxString left(matchAgainst); wxString left(matchAgainst);
bool success = false; bool success = false;
int matchTextLen = (int) matchText.Length(); int matchTextLen = (int) matchText.Length();
while (!success && !matchAgainst.IsEmpty()) while (!success && !matchAgainst.empty())
{ {
int pos = left.Find(matchText); int pos = left.Find(matchText);
if (pos == wxNOT_FOUND) if (pos == wxNOT_FOUND)