mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 18:49: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.
81 lines
2.7 KiB
C++
81 lines
2.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/app.h
|
|
// Purpose: wxApp definition for wxGTK
|
|
// Author: Robert Roebling
|
|
// Copyright: (c) 1998 Robert Roebling, Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTK_APP_H_
|
|
#define _WX_GTK_APP_H_
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// classes
|
|
//-----------------------------------------------------------------------------
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxApp
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxApp: public wxAppBase
|
|
{
|
|
public:
|
|
wxApp();
|
|
virtual ~wxApp();
|
|
|
|
/* override for altering the way wxGTK initializes the GUI
|
|
* (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
|
|
* default. when overriding this method, the code in it is likely to be
|
|
* platform dependent, otherwise use OnInit(). */
|
|
virtual bool SetNativeTheme(const wxString& theme) wxOVERRIDE;
|
|
virtual bool OnInitGui() wxOVERRIDE;
|
|
|
|
// override base class (pure) virtuals
|
|
virtual void WakeUpIdle() wxOVERRIDE;
|
|
|
|
virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE;
|
|
virtual void CleanUp() wxOVERRIDE;
|
|
|
|
virtual void OnAssertFailure(const wxChar *file,
|
|
int line,
|
|
const wxChar *func,
|
|
const wxChar *cond,
|
|
const wxChar *msg) wxOVERRIDE;
|
|
|
|
// GTK-specific methods
|
|
// -------------------
|
|
|
|
// this can be overridden to return a specific visual to be used for GTK+
|
|
// instead of the default one (it's used by wxGLApp)
|
|
//
|
|
// must return XVisualInfo pointer (it is not freed by caller)
|
|
virtual void *GetXVisualInfo() { return NULL; }
|
|
|
|
// Check if we're using a global menu. Currently this is only true when
|
|
// running under Ubuntu Unity and global menu is not disabled.
|
|
//
|
|
// This is mostly used in the implementation in order to work around
|
|
// various bugs arising due to this.
|
|
static bool GTKIsUsingGlobalMenu();
|
|
|
|
// implementation only from now on
|
|
// -------------------------------
|
|
|
|
// check for pending events, without interference from our idle source
|
|
bool EventsPending();
|
|
bool DoIdle();
|
|
|
|
private:
|
|
// true if we're inside an assert modal dialog
|
|
bool m_isInAssert;
|
|
|
|
#if wxUSE_THREADS
|
|
wxMutex m_idleMutex;
|
|
#endif
|
|
unsigned m_idleSourceId;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxApp);
|
|
};
|
|
|
|
#endif // _WX_GTK_APP_H_
|