mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-12 09:09:12 +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.
115 lines
3.8 KiB
C++
115 lines
3.8 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/regconf.h
|
|
// Purpose: Registry based implementation of wxConfigBase
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 27.04.98
|
|
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_REGCONF_H_
|
|
#define _WX_MSW_REGCONF_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_CONFIG && wxUSE_REGKEY
|
|
|
|
#include "wx/msw/registry.h"
|
|
#include "wx/object.h"
|
|
#include "wx/confbase.h"
|
|
#include "wx/buffer.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxRegConfig
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_BASE wxRegConfig : public wxConfigBase
|
|
{
|
|
public:
|
|
// ctor & dtor
|
|
// will store data in HKLM\appName and HKCU\appName
|
|
wxRegConfig(const wxString& appName = wxEmptyString,
|
|
const wxString& vendorName = wxEmptyString,
|
|
const wxString& localFilename = wxEmptyString,
|
|
const wxString& globalFilename = wxEmptyString,
|
|
long style = wxCONFIG_USE_GLOBAL_FILE);
|
|
|
|
// dtor will save unsaved data
|
|
virtual ~wxRegConfig(){}
|
|
|
|
// implement inherited pure virtual functions
|
|
// ------------------------------------------
|
|
|
|
// path management
|
|
virtual void SetPath(const wxString& strPath);
|
|
virtual const wxString& GetPath() const { return m_strPath; }
|
|
|
|
// entry/subgroup info
|
|
// enumerate all of them
|
|
virtual bool GetFirstGroup(wxString& str, long& lIndex) const;
|
|
virtual bool GetNextGroup (wxString& str, long& lIndex) const;
|
|
virtual bool GetFirstEntry(wxString& str, long& lIndex) const;
|
|
virtual bool GetNextEntry (wxString& str, long& lIndex) const;
|
|
|
|
// tests for existence
|
|
virtual bool HasGroup(const wxString& strName) const;
|
|
virtual bool HasEntry(const wxString& strName) const;
|
|
virtual EntryType GetEntryType(const wxString& name) const;
|
|
|
|
// get number of entries/subgroups in the current group, with or without
|
|
// it's subgroups
|
|
virtual size_t GetNumberOfEntries(bool bRecursive = false) const;
|
|
virtual size_t GetNumberOfGroups(bool bRecursive = false) const;
|
|
|
|
virtual bool Flush(bool WXUNUSED(bCurrentOnly) = false) { return true; }
|
|
|
|
// rename
|
|
virtual bool RenameEntry(const wxString& oldName, const wxString& newName);
|
|
virtual bool RenameGroup(const wxString& oldName, const wxString& newName);
|
|
|
|
// delete
|
|
virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true);
|
|
virtual bool DeleteGroup(const wxString& key);
|
|
virtual bool DeleteAll();
|
|
|
|
protected:
|
|
// opens the local key creating it if necessary and returns it
|
|
wxRegKey& LocalKey() const // must be const to be callable from const funcs
|
|
{
|
|
wxRegConfig* self = wxConstCast(this, wxRegConfig);
|
|
|
|
if ( !m_keyLocal.IsOpened() )
|
|
{
|
|
// create on demand
|
|
self->m_keyLocal.Create();
|
|
}
|
|
|
|
return self->m_keyLocal;
|
|
}
|
|
|
|
// implement read/write methods
|
|
virtual bool DoReadString(const wxString& key, wxString *pStr) const;
|
|
virtual bool DoReadLong(const wxString& key, long *plResult) const;
|
|
virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const;
|
|
|
|
virtual bool DoWriteString(const wxString& key, const wxString& szValue);
|
|
virtual bool DoWriteLong(const wxString& key, long lValue);
|
|
virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf);
|
|
|
|
private:
|
|
// these keys are opened during all lifetime of wxRegConfig object
|
|
wxRegKey m_keyLocalRoot, m_keyLocal,
|
|
m_keyGlobalRoot, m_keyGlobal;
|
|
|
|
// current path (not '/' terminated)
|
|
wxString m_strPath;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxRegConfig);
|
|
wxDECLARE_ABSTRACT_CLASS(wxRegConfig);
|
|
};
|
|
|
|
#endif // wxUSE_CONFIG && wxUSE_REGKEY
|
|
|
|
#endif // _WX_MSW_REGCONF_H_
|