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:
@@ -407,7 +407,7 @@ static int LINKAGEMODE wxDirCtrlStringCompareFunction(const void *first, const v
|
||||
{
|
||||
wxString *strFirst = (wxString *)first;
|
||||
wxString *strSecond = (wxString *)second;
|
||||
|
||||
|
||||
return strFirst->CmpNoCase(*strSecond);
|
||||
}
|
||||
|
||||
@@ -454,7 +454,7 @@ bool wxDirItemData::HasSubDirs() const
|
||||
return dir.HasSubDirs();
|
||||
}
|
||||
|
||||
bool wxDirItemData::HasFiles(const wxString& spec) const
|
||||
bool wxDirItemData::HasFiles(const wxString& WXUNUSED(spec)) const
|
||||
{
|
||||
if (m_path.IsEmpty())
|
||||
return FALSE;
|
||||
@@ -578,8 +578,8 @@ void wxGenericDirCtrl::Init()
|
||||
void wxGenericDirCtrl::ShowHidden( bool show )
|
||||
{
|
||||
m_showHidden = show;
|
||||
|
||||
// reparse FIXME
|
||||
|
||||
// reparse FIXME
|
||||
}
|
||||
|
||||
void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, int imageId)
|
||||
|
Reference in New Issue
Block a user