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.
41 lines
1.5 KiB
C++
41 lines
1.5 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/splitter.h
|
|
// Purpose: Base header for wxSplitterWindow
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created:
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows Licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_SPLITTER_H_BASE_
|
|
#define _WX_SPLITTER_H_BASE_
|
|
|
|
#include "wx/event.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxSplitterWindow flags
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#define wxSP_NOBORDER 0x0000
|
|
#define wxSP_THIN_SASH 0x0000 // NB: the default is 3D sash
|
|
#define wxSP_NOSASH 0x0010
|
|
#define wxSP_PERMIT_UNSPLIT 0x0040
|
|
#define wxSP_LIVE_UPDATE 0x0080
|
|
#define wxSP_3DSASH 0x0100
|
|
#define wxSP_3DBORDER 0x0200
|
|
#define wxSP_NO_XP_THEME 0x0400
|
|
#define wxSP_BORDER wxSP_3DBORDER
|
|
#define wxSP_3D (wxSP_3DBORDER | wxSP_3DSASH)
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxSplitterEvent;
|
|
|
|
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_SPLITTER_SASH_POS_CHANGED, wxSplitterEvent );
|
|
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_SPLITTER_SASH_POS_CHANGING, wxSplitterEvent );
|
|
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_SPLITTER_DOUBLECLICKED, wxSplitterEvent );
|
|
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_SPLITTER_UNSPLIT, wxSplitterEvent );
|
|
|
|
#include "wx/generic/splitter.h"
|
|
|
|
#endif // _WX_SPLITTER_H_BASE_
|