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.
90 lines
3.3 KiB
C++
90 lines
3.3 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/helpchm.h
|
|
// Purpose: Help system: MS HTML Help implementation
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 16/04/2000
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_HELPCHM_H_
|
|
#define _WX_MSW_HELPCHM_H_
|
|
|
|
#if wxUSE_MS_HTML_HELP
|
|
|
|
#include "wx/helpbase.h"
|
|
|
|
class WXDLLIMPEXP_CORE wxCHMHelpController : public wxHelpControllerBase
|
|
{
|
|
public:
|
|
wxCHMHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) { }
|
|
|
|
// 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);
|
|
virtual bool DisplayBlock(long blockNo);
|
|
virtual bool DisplayContextPopup(int contextId);
|
|
virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos);
|
|
virtual bool KeywordSearch(const wxString& k,
|
|
wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
|
|
virtual bool Quit();
|
|
|
|
wxString GetHelpFile() const { return m_helpFile; }
|
|
|
|
// helper of DisplayTextPopup(), also used in wxSimpleHelpProvider::ShowHelp
|
|
static bool ShowContextHelpPopup(const wxString& text,
|
|
const wxPoint& pos,
|
|
wxWindow *window);
|
|
|
|
protected:
|
|
// get the name of the CHM file we use from our m_helpFile
|
|
wxString GetValidFilename() const;
|
|
|
|
// Call HtmlHelp() with the provided parameters (both overloads do the same
|
|
// thing but allow to avoid casts in the calling code) and return false
|
|
// (but don't crash) if HTML help is unavailable
|
|
static bool CallHtmlHelp(wxWindow *win, const wxChar *str,
|
|
unsigned cmd, WXWPARAM param);
|
|
static bool CallHtmlHelp(wxWindow *win, const wxChar *str,
|
|
unsigned cmd, const void *param = NULL)
|
|
{
|
|
return CallHtmlHelp(win, str, cmd, reinterpret_cast<WXWPARAM>(param));
|
|
}
|
|
|
|
// even simpler wrappers using GetParentWindow() and GetValidFilename() as
|
|
// the first 2 HtmlHelp() parameters
|
|
bool CallHtmlHelp(unsigned cmd, WXWPARAM param)
|
|
{
|
|
return CallHtmlHelp(GetParentWindow(), GetValidFilename().t_str(),
|
|
cmd, param);
|
|
}
|
|
|
|
bool CallHtmlHelp(unsigned cmd, const void *param = NULL)
|
|
{
|
|
return CallHtmlHelp(cmd, reinterpret_cast<WXWPARAM>(param));
|
|
}
|
|
|
|
// wrapper around CallHtmlHelp(HH_DISPLAY_TEXT_POPUP): only one of text and
|
|
// contextId parameters can be non-NULL/non-zero
|
|
static bool DoDisplayTextPopup(const wxChar *text,
|
|
const wxPoint& pos,
|
|
int contextId,
|
|
wxWindow *window);
|
|
|
|
|
|
wxString m_helpFile;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxCHMHelpController);
|
|
};
|
|
|
|
#endif // wxUSE_MS_HTML_HELP
|
|
|
|
#endif // _WX_MSW_HELPCHM_H_
|