mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-17 19:49:12 +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.1 KiB
C++
106 lines
3.1 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/x11/app.h
|
|
// Purpose: wxApp class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 17/09/98
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_X11_APP_H_
|
|
#define _WX_X11_APP_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#include "wx/gdicmn.h"
|
|
#include "wx/event.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// forward declarations
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxFrame;
|
|
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
|
class WXDLLIMPEXP_FWD_CORE wxApp;
|
|
class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
|
|
class WXDLLIMPEXP_FWD_BASE wxLog;
|
|
class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// the wxApp class for wxX11 - see wxAppBase for more details
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxApp : public wxAppBase
|
|
{
|
|
public:
|
|
wxApp();
|
|
virtual ~wxApp();
|
|
|
|
// override base class (pure) virtuals
|
|
// -----------------------------------
|
|
|
|
virtual void Exit();
|
|
|
|
virtual void WakeUpIdle();
|
|
|
|
virtual bool OnInitGui();
|
|
|
|
// implementation from now on
|
|
// --------------------------
|
|
|
|
// Processes an X event.
|
|
virtual bool ProcessXEvent(WXEvent* event);
|
|
|
|
public:
|
|
// Implementation
|
|
virtual bool Initialize(int& argc, wxChar **argv);
|
|
virtual void CleanUp();
|
|
|
|
WXWindow GetTopLevelWidget() const { return m_topLevelWidget; }
|
|
WXColormap GetMainColormap(WXDisplay* display);
|
|
long GetMaxRequestSize() const { return m_maxRequestSize; }
|
|
|
|
// This handler is called when a property change event occurs
|
|
virtual bool HandlePropertyChange(WXEvent *event);
|
|
|
|
// Values that can be passed on the command line.
|
|
// Returns -1, -1 if none specified.
|
|
const wxSize& GetInitialSize() const { return m_initialSize; }
|
|
bool GetShowIconic() const { return m_showIconic; }
|
|
|
|
#if wxUSE_UNICODE
|
|
// Global context for Pango layout. Either use X11
|
|
// or use Xft rendering according to GDK_USE_XFT
|
|
// environment variable
|
|
PangoContext* GetPangoContext();
|
|
#endif
|
|
|
|
wxXVisualInfo* GetVisualInfo(WXDisplay* WXUNUSED(display))
|
|
{
|
|
// this should be implemented correctly for wxBitmap to work
|
|
// with multiple display
|
|
return m_visualInfo;
|
|
}
|
|
|
|
public:
|
|
static long sm_lastMessageTime;
|
|
bool m_showIconic;
|
|
wxSize m_initialSize;
|
|
|
|
#if !wxUSE_NANOX
|
|
wxXVisualInfo* m_visualInfo;
|
|
#endif
|
|
|
|
protected:
|
|
WXWindow m_topLevelWidget;
|
|
WXColormap m_mainColormap;
|
|
long m_maxRequestSize;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxApp);
|
|
};
|
|
|
|
#endif // _WX_X11_APP_H_
|