mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-10 08:09:26 +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.
98 lines
3.1 KiB
C++
98 lines
3.1 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/fontdlg.h
|
|
// Purpose: common interface for different wxFontDialog classes
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 12.05.02
|
|
// Copyright: (c) 1997-2002 wxWidgets team
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_FONTDLG_H_BASE_
|
|
#define _WX_FONTDLG_H_BASE_
|
|
|
|
#include "wx/defs.h" // for wxUSE_FONTDLG
|
|
|
|
#if wxUSE_FONTDLG
|
|
|
|
#include "wx/dialog.h" // the base class
|
|
#include "wx/fontdata.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxFontDialog interface
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxFontDialogBase : public wxDialog
|
|
{
|
|
public:
|
|
// create the font dialog
|
|
wxFontDialogBase() { }
|
|
wxFontDialogBase(wxWindow *parent) { m_parent = parent; }
|
|
wxFontDialogBase(wxWindow *parent, const wxFontData& data)
|
|
{ m_parent = parent; InitFontData(&data); }
|
|
|
|
bool Create(wxWindow *parent)
|
|
{ return DoCreate(parent); }
|
|
bool Create(wxWindow *parent, const wxFontData& data)
|
|
{ InitFontData(&data); return Create(parent); }
|
|
|
|
// retrieve the font data
|
|
const wxFontData& GetFontData() const { return m_fontData; }
|
|
wxFontData& GetFontData() { return m_fontData; }
|
|
|
|
protected:
|
|
virtual bool DoCreate(wxWindow *parent) { m_parent = parent; return true; }
|
|
|
|
void InitFontData(const wxFontData *data = NULL)
|
|
{ if ( data ) m_fontData = *data; }
|
|
|
|
wxFontData m_fontData;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxFontDialogBase);
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// platform-specific wxFontDialog implementation
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#if defined( __WXOSX_MAC__ )
|
|
//set to 1 to use native mac font and color dialogs
|
|
#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 1
|
|
#else
|
|
//not supported on these platforms, leave 0
|
|
#define USE_NATIVE_FONT_DIALOG_FOR_MACOSX 0
|
|
#endif
|
|
|
|
#if defined(__WXUNIVERSAL__) || \
|
|
defined(__WXMOTIF__) || \
|
|
defined(__WXGPE__)
|
|
|
|
#include "wx/generic/fontdlgg.h"
|
|
#define wxFontDialog wxGenericFontDialog
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/fontdlg.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/fontdlg.h"
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/gtk1/fontdlg.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/fontdlg.h"
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/fontdlg.h"
|
|
#endif
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// global public functions
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// get the font from user and return it, returns wxNullFont if the dialog was
|
|
// cancelled
|
|
WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = NULL,
|
|
const wxFont& fontInit = wxNullFont,
|
|
const wxString& caption = wxEmptyString);
|
|
|
|
#endif // wxUSE_FONTDLG
|
|
|
|
#endif
|
|
// _WX_FONTDLG_H_BASE_
|