mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 01:29:11 +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.
56 lines
1.7 KiB
C++
56 lines
1.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/helpwin.h
|
|
// Purpose: Help system: WinHelp implementation
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 04/01/98
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_HELPWIN_H_
|
|
#define _WX_HELPWIN_H_
|
|
|
|
#include "wx/wx.h"
|
|
|
|
#if wxUSE_HELP
|
|
|
|
#include "wx/helpbase.h"
|
|
|
|
class WXDLLIMPEXP_CORE wxWinHelpController: public wxHelpControllerBase
|
|
{
|
|
wxDECLARE_DYNAMIC_CLASS(wxWinHelpController);
|
|
|
|
public:
|
|
wxWinHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) {}
|
|
virtual ~wxWinHelpController() {}
|
|
|
|
// Must call this to set the filename
|
|
virtual bool Initialize(const wxString& file);
|
|
virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); }
|
|
|
|
// If file is "", reloads file given in Initialize
|
|
virtual bool LoadFile(const wxString& file = wxEmptyString);
|
|
virtual bool DisplayContents();
|
|
virtual bool DisplaySection(int sectionNo);
|
|
virtual bool DisplaySection(const wxString& section) { return KeywordSearch(section); }
|
|
virtual bool DisplayBlock(long blockNo);
|
|
virtual bool DisplayContextPopup(int contextId);
|
|
virtual bool KeywordSearch(const wxString& k,
|
|
wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
|
|
virtual bool Quit();
|
|
|
|
inline wxString GetHelpFile() const { return m_helpFile; }
|
|
|
|
protected:
|
|
// Append extension if necessary.
|
|
wxString GetValidFilename(const wxString& file) const;
|
|
|
|
private:
|
|
wxString m_helpFile;
|
|
};
|
|
|
|
#endif // wxUSE_HELP
|
|
#endif
|
|
// _WX_HELPWIN_H_
|