Fixes for 16-bit compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -102,14 +102,6 @@ public:
|
||||
wxPathFormat format = wxPATH_NATIVE)
|
||||
{ Assign(path, name, ext, format); }
|
||||
|
||||
// assorted assignment operators
|
||||
|
||||
wxFileName& operator=(const wxFileName& filename)
|
||||
{ Assign(filename); return *this; }
|
||||
|
||||
wxFileName& operator=(const wxString& filename)
|
||||
{ Assign(filename); return *this; }
|
||||
|
||||
// the same for delayed initialization
|
||||
|
||||
// VZ: wouldn't it be better to call this Create() for consistency with
|
||||
@@ -128,6 +120,14 @@ public:
|
||||
void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE)
|
||||
{ Assign(dir, _T(""), format); }
|
||||
|
||||
// assorted assignment operators
|
||||
|
||||
wxFileName& operator=(const wxFileName& filename)
|
||||
{ Assign(filename); return *this; }
|
||||
|
||||
wxFileName& operator=(const wxString& filename)
|
||||
{ Assign(filename); return *this; }
|
||||
|
||||
// reset all components to default, uninitialized state
|
||||
void Clear();
|
||||
|
||||
@@ -191,15 +191,15 @@ public:
|
||||
|
||||
// Comparison
|
||||
|
||||
// compares with the rules of this platform
|
||||
bool SameAs(const wxFileName &filepath,
|
||||
wxPathFormat format = wxPATH_NATIVE);
|
||||
|
||||
// uses the current platform settings
|
||||
bool operator==(const wxFileName& filename) { return SameAs(filename); }
|
||||
bool operator==(const wxString& filename)
|
||||
{ return *this == wxFileName(filename); }
|
||||
|
||||
// compares with the rules of this platform
|
||||
bool SameAs(const wxFileName &filepath,
|
||||
wxPathFormat format = wxPATH_NATIVE);
|
||||
|
||||
// Tests
|
||||
static bool IsCaseSensitive( wxPathFormat format = wxPATH_NATIVE );
|
||||
bool IsRelative( wxPathFormat format = wxPATH_NATIVE );
|
||||
|
Reference in New Issue
Block a user