mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 10:39:13 +01:00
822326eea9
From wxWidgets master 81570ae070b35c9d52de47b1f14897f3ff1a66c7. include/wx/defs.h -- __w64 warning disable patch by comex brought forward. include/wx/msw/window.h -- added GetContentScaleFactor() which was not implemented on Windows but is necessary for wxBitmap scaling on Mac OS X so it needs to work to avoid #ifdef-ing the code. src/gtk/window.cpp -- Modified DoSetClientSize() to direct call wxWindowGTK::DoSetSize() instead of using public wxWindowBase::SetSize() which now prevents derived classes (like wxAuiToolbar) intercepting the call and breaking it. This matches Windows which does NOT need to call DoSetSize internally. End result is this fixes Dolphin's debug tools toolbars on Linux. src/osx/window_osx.cpp -- Same fix as for GTK since it has the same issue. src/msw/radiobox.cpp -- Hacked to fix display in HiDPI (was clipping off end of text). Updated CMakeLists for Linux and Mac OS X. Small code changes to Dolphin to fix debug error boxes, deprecation warnings, and retain previous UI behavior on Windows.
116 lines
3.4 KiB
C++
116 lines
3.4 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/private/fswatcher.h
|
|
// Purpose: File system watcher impl classes
|
|
// Author: Bartosz Bekier
|
|
// Created: 2009-05-26
|
|
// Copyright: (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef WX_PRIVATE_FSWATCHER_H_
|
|
#define WX_PRIVATE_FSWATCHER_H_
|
|
|
|
#include "wx/sharedptr.h"
|
|
|
|
#ifdef wxHAS_INOTIFY
|
|
class wxFSWatchEntryUnix;
|
|
#define wxFSWatchEntry wxFSWatchEntryUnix
|
|
WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxFSWatchEntry>,wxFSWatchEntries);
|
|
#include "wx/unix/private/fswatcher_inotify.h"
|
|
#elif defined(wxHAS_KQUEUE)
|
|
class wxFSWatchEntryKq;
|
|
#define wxFSWatchEntry wxFSWatchEntryKq
|
|
WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxFSWatchEntry>,wxFSWatchEntries);
|
|
#include "wx/unix/private/fswatcher_kqueue.h"
|
|
#elif defined(__WINDOWS__)
|
|
class wxFSWatchEntryMSW;
|
|
#define wxFSWatchEntry wxFSWatchEntryMSW
|
|
WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxFSWatchEntry>,wxFSWatchEntries);
|
|
#include "wx/msw/private/fswatcher.h"
|
|
#else
|
|
#define wxFSWatchEntry wxFSWatchEntryPolling
|
|
#endif
|
|
|
|
class wxFSWatcherImpl
|
|
{
|
|
public:
|
|
wxFSWatcherImpl(wxFileSystemWatcherBase* watcher) :
|
|
m_watcher(watcher)
|
|
{
|
|
}
|
|
|
|
virtual ~wxFSWatcherImpl()
|
|
{
|
|
(void) RemoveAll();
|
|
}
|
|
|
|
virtual bool Init() = 0;
|
|
|
|
virtual bool Add(const wxFSWatchInfo& winfo)
|
|
{
|
|
if ( m_watches.find(winfo.GetPath()) != m_watches.end() )
|
|
{
|
|
wxLogTrace(wxTRACE_FSWATCHER,
|
|
"Path '%s' is already watched", winfo.GetPath());
|
|
// This can happen if a dir is watched, then a parent tree added
|
|
return true;
|
|
}
|
|
|
|
// construct watch entry
|
|
wxSharedPtr<wxFSWatchEntry> watch(new wxFSWatchEntry(winfo));
|
|
|
|
if (!DoAdd(watch))
|
|
return false;
|
|
|
|
// add watch to our map (always succeedes, checked above)
|
|
wxFSWatchEntries::value_type val(watch->GetPath(), watch);
|
|
return m_watches.insert(val).second;
|
|
}
|
|
|
|
virtual bool Remove(const wxFSWatchInfo& winfo)
|
|
{
|
|
wxFSWatchEntries::iterator it = m_watches.find(winfo.GetPath());
|
|
if ( it == m_watches.end() )
|
|
{
|
|
wxLogTrace(wxTRACE_FSWATCHER,
|
|
"Path '%s' is not watched", winfo.GetPath());
|
|
// This can happen if a dir is watched, then a parent tree added
|
|
return true;
|
|
}
|
|
wxSharedPtr<wxFSWatchEntry> watch = it->second;
|
|
m_watches.erase(it);
|
|
return DoRemove(watch);
|
|
}
|
|
|
|
virtual bool RemoveAll()
|
|
{
|
|
bool ret = true;
|
|
for ( wxFSWatchEntries::iterator it = m_watches.begin();
|
|
it != m_watches.end();
|
|
++it )
|
|
{
|
|
if ( !DoRemove(it->second) )
|
|
ret = false;
|
|
}
|
|
m_watches.clear();
|
|
return ret;
|
|
}
|
|
|
|
// Check whether any filespec matches the file's ext (if present)
|
|
bool MatchesFilespec(const wxFileName& fn, const wxString& filespec) const
|
|
{
|
|
return filespec.empty() || wxMatchWild(filespec, fn.GetFullName());
|
|
}
|
|
|
|
protected:
|
|
virtual bool DoAdd(wxSharedPtr<wxFSWatchEntry> watch) = 0;
|
|
|
|
virtual bool DoRemove(wxSharedPtr<wxFSWatchEntry> watch) = 0;
|
|
|
|
wxFSWatchEntries m_watches;
|
|
wxFileSystemWatcherBase* m_watcher;
|
|
};
|
|
|
|
|
|
#endif /* WX_PRIVATE_FSWATCHER_H_ */
|