Merges from Scitech Branch (George Davison):
Added wxDisplayChangedEvent and triggering in MSW, when display mode changes this event gets triggered. I don't know what should happen with other OS's since I am not familiar with how they handle mode changes. Watcome Version 11 now compiles with wide character support. Fixed watcom warnings in html/htmlwin.h imagbmp.h listctrl.h imagbmp.cpp quantize.cpp strconv.cpp variant.cpp dirctrlg.cpp treectlg.cpp m_style.cpp fontenum.cpp listctrl.cpp ole\dataobj.cpp textctrl.cpp window.cpp xml.cpp msw/setup.h with watcom version 11 it now compiles with wide character support. xrc/xml.cpp fixed memory leak and compile warnings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -359,7 +359,7 @@ void wxFileName::Assign(const wxString& fullpathOrig,
|
||||
_T("the path shouldn't contain file name nor extension") );
|
||||
|
||||
#else // !__WXDEBUG__
|
||||
SplitPath(fullname, NULL /* no path */, &name, &ext, format);
|
||||
SplitPath(fullname, NULL /* no path */, &name, &ext, format);
|
||||
SplitPath(fullpath, &volume, &path, NULL, NULL, format);
|
||||
#endif // __WXDEBUG__/!__WXDEBUG__
|
||||
|
||||
@@ -1043,8 +1043,10 @@ wxString wxFileName::GetFullName() const
|
||||
return fullname;
|
||||
}
|
||||
|
||||
wxString wxFileName::GetPath( bool add_separator, wxPathFormat format ) const
|
||||
wxString wxFileName::GetPath( bool, wxPathFormat format ) const
|
||||
{
|
||||
// Should add_seperator parameter be used?
|
||||
|
||||
format = GetFormat( format );
|
||||
|
||||
wxString fullpath;
|
||||
@@ -1776,4 +1778,3 @@ void wxFileName::MacRegisterDefaultTypeAndCreator( const wxString& ext , wxUint3
|
||||
gMacDefaultExtensions.Add( rec ) ;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user