Removed warning for Darwin compilation from datetime.inl
Added wxFileName::SetPath() and set m_relative if no dir is given Corrected wxFrame::Enable() in wxMac. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -231,6 +231,15 @@ void wxFileName::Assign(const wxString& volume,
|
||||
const wxString& name,
|
||||
const wxString& ext,
|
||||
wxPathFormat format )
|
||||
{
|
||||
SetPath( path, format );
|
||||
|
||||
m_volume = volume;
|
||||
m_ext = ext;
|
||||
m_name = name;
|
||||
}
|
||||
|
||||
void wxFileName::SetPath( const wxString &path, wxPathFormat format )
|
||||
{
|
||||
wxPathFormat my_format = GetFormat( format );
|
||||
wxString my_path = path;
|
||||
@@ -297,10 +306,10 @@ void wxFileName::Assign(const wxString& volume,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
m_volume = volume;
|
||||
m_ext = ext;
|
||||
m_name = name;
|
||||
else
|
||||
{
|
||||
m_relative = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
void wxFileName::Assign(const wxString& fullpath,
|
||||
|
Reference in New Issue
Block a user