mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 12:21:41 +02: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.
103 lines
3.1 KiB
C++
103 lines
3.1 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/filehistory.h
|
|
// Purpose: wxFileHistory class
|
|
// Author: Julian Smart, Vaclav Slavik
|
|
// Created: 2010-05-03
|
|
// Copyright: (c) Julian Smart, Vaclav Slavik
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_FILEHISTORY_H_
|
|
#define _WX_FILEHISTORY_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_FILE_HISTORY
|
|
|
|
#include "wx/windowid.h"
|
|
#include "wx/object.h"
|
|
#include "wx/list.h"
|
|
#include "wx/string.h"
|
|
#include "wx/arrstr.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxMenu;
|
|
class WXDLLIMPEXP_FWD_BASE wxConfigBase;
|
|
class WXDLLIMPEXP_FWD_BASE wxFileName;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// File history management
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxFileHistoryBase : public wxObject
|
|
{
|
|
public:
|
|
wxFileHistoryBase(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1);
|
|
|
|
// Operations
|
|
virtual void AddFileToHistory(const wxString& file);
|
|
virtual void RemoveFileFromHistory(size_t i);
|
|
virtual int GetMaxFiles() const { return (int)m_fileMaxFiles; }
|
|
virtual void UseMenu(wxMenu *menu);
|
|
|
|
// Remove menu from the list (MDI child may be closing)
|
|
virtual void RemoveMenu(wxMenu *menu);
|
|
|
|
#if wxUSE_CONFIG
|
|
virtual void Load(const wxConfigBase& config);
|
|
virtual void Save(wxConfigBase& config);
|
|
#endif // wxUSE_CONFIG
|
|
|
|
virtual void AddFilesToMenu();
|
|
virtual void AddFilesToMenu(wxMenu* menu); // Single menu
|
|
|
|
// Accessors
|
|
virtual wxString GetHistoryFile(size_t i) const { return m_fileHistory[i]; }
|
|
virtual size_t GetCount() const { return m_fileHistory.GetCount(); }
|
|
|
|
const wxList& GetMenus() const { return m_fileMenus; }
|
|
|
|
// Set/get base id
|
|
void SetBaseId(wxWindowID baseId) { m_idBase = baseId; }
|
|
wxWindowID GetBaseId() const { return m_idBase; }
|
|
|
|
protected:
|
|
// Last n files
|
|
wxArrayString m_fileHistory;
|
|
|
|
// Menus to maintain (may need several for an MDI app)
|
|
wxList m_fileMenus;
|
|
|
|
// Max files to maintain
|
|
size_t m_fileMaxFiles;
|
|
|
|
private:
|
|
// The ID of the first history menu item (Doesn't have to be wxID_FILE1)
|
|
wxWindowID m_idBase;
|
|
|
|
// Normalize a file name to canonical form. We have a special function for
|
|
// this to ensure the same normalization is used everywhere.
|
|
static wxString NormalizeFileName(const wxFileName& filename);
|
|
|
|
// Remove any existing entries from the associated menus.
|
|
void RemoveExistingHistory();
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxFileHistoryBase);
|
|
};
|
|
|
|
#if defined(__WXGTK20__)
|
|
#include "wx/gtk/filehistory.h"
|
|
#else
|
|
// no platform-specific implementation of wxFileHistory yet
|
|
class WXDLLIMPEXP_CORE wxFileHistory : public wxFileHistoryBase
|
|
{
|
|
public:
|
|
wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1)
|
|
: wxFileHistoryBase(maxFiles, idBase) {}
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxFileHistory);
|
|
};
|
|
#endif
|
|
|
|
#endif // wxUSE_FILE_HISTORY
|
|
|
|
#endif // _WX_FILEHISTORY_H_
|