mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 09:39: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.
106 lines
3.5 KiB
C++
106 lines
3.5 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/generic/helpext.h
|
|
// Purpose: an external help controller for wxWidgets
|
|
// Author: Karsten Ballueder (Ballueder@usa.net)
|
|
// Modified by:
|
|
// Copyright: (c) Karsten Ballueder 1998
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef __WX_HELPEXT_H_
|
|
#define __WX_HELPEXT_H_
|
|
|
|
#if wxUSE_HELP
|
|
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#include "wx/helpbase.h"
|
|
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxExtHelpController
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// This class implements help via an external browser.
|
|
class WXDLLIMPEXP_ADV wxExtHelpController : public wxHelpControllerBase
|
|
{
|
|
public:
|
|
wxExtHelpController(wxWindow* parentWindow = NULL);
|
|
virtual ~wxExtHelpController();
|
|
|
|
#if WXWIN_COMPATIBILITY_2_8
|
|
wxDEPRECATED(void SetBrowser(const wxString& browsername = wxEmptyString, bool isNetscape = false) );
|
|
#endif
|
|
|
|
// Set viewer: new name for SetBrowser
|
|
virtual void SetViewer(const wxString& viewer = wxEmptyString,
|
|
long flags = wxHELP_NETSCAPE) wxOVERRIDE;
|
|
|
|
virtual bool Initialize(const wxString& dir, int WXUNUSED(server)) wxOVERRIDE
|
|
{ return Initialize(dir); }
|
|
|
|
virtual bool Initialize(const wxString& dir) wxOVERRIDE;
|
|
virtual bool LoadFile(const wxString& file = wxEmptyString) wxOVERRIDE;
|
|
virtual bool DisplayContents(void) wxOVERRIDE;
|
|
virtual bool DisplaySection(int sectionNo) wxOVERRIDE;
|
|
virtual bool DisplaySection(const wxString& section) wxOVERRIDE;
|
|
virtual bool DisplayBlock(long blockNo) wxOVERRIDE;
|
|
virtual bool KeywordSearch(const wxString& k,
|
|
wxHelpSearchMode mode = wxHELP_SEARCH_ALL) wxOVERRIDE;
|
|
|
|
virtual bool Quit(void) wxOVERRIDE;
|
|
virtual void OnQuit(void) wxOVERRIDE;
|
|
|
|
virtual bool DisplayHelp(const wxString &) ;
|
|
|
|
virtual void SetFrameParameters(const wxString& WXUNUSED(title),
|
|
const wxSize& WXUNUSED(size),
|
|
const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
|
|
bool WXUNUSED(newFrameEachTime) = false) wxOVERRIDE
|
|
{
|
|
// does nothing by default
|
|
}
|
|
|
|
virtual wxFrame *GetFrameParameters(wxSize *WXUNUSED(size) = NULL,
|
|
wxPoint *WXUNUSED(pos) = NULL,
|
|
bool *WXUNUSED(newFrameEachTime) = NULL) wxOVERRIDE
|
|
{
|
|
return NULL; // does nothing by default
|
|
}
|
|
|
|
protected:
|
|
// Filename of currently active map file.
|
|
wxString m_helpDir;
|
|
|
|
// How many entries do we have in the map file?
|
|
int m_NumOfEntries;
|
|
|
|
// A list containing all id,url,documentation triples.
|
|
wxList *m_MapList;
|
|
|
|
private:
|
|
// parse a single line of the map file (called by LoadFile())
|
|
//
|
|
// return true if the line was valid or false otherwise
|
|
bool ParseMapFileLine(const wxString& line);
|
|
|
|
// Deletes the list and all objects.
|
|
void DeleteList(void);
|
|
|
|
|
|
// How to call the html viewer.
|
|
wxString m_BrowserName;
|
|
|
|
// Is the viewer a variant of netscape?
|
|
bool m_BrowserIsNetscape;
|
|
|
|
wxDECLARE_CLASS(wxExtHelpController);
|
|
};
|
|
|
|
#endif // wxUSE_HELP
|
|
|
|
#endif // __WX_HELPEXT_H_
|