mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-12 09:09: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.
69 lines
2.1 KiB
C++
69 lines
2.1 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/persist/splitter.h
|
|
// Purpose: Persistence support for wxSplitterWindow.
|
|
// Author: Vadim Zeitlin
|
|
// Created: 2011-08-31
|
|
// Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_PERSIST_SPLITTER_H_
|
|
#define _WX_PERSIST_SPLITTER_H_
|
|
|
|
#include "wx/persist/window.h"
|
|
|
|
#include "wx/splitter.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// string constants used by wxPersistentSplitter
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#define wxPERSIST_SPLITTER_KIND "Splitter"
|
|
|
|
// Special position value of -1 means the splitter is not split at all.
|
|
#define wxPERSIST_SPLITTER_POSITION "Position"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxPersistentSplitter: supports saving/restoring splitter position
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class wxPersistentSplitter : public wxPersistentWindow<wxSplitterWindow>
|
|
{
|
|
public:
|
|
wxPersistentSplitter(wxSplitterWindow* splitter)
|
|
: wxPersistentWindow<wxSplitterWindow>(splitter)
|
|
{
|
|
}
|
|
|
|
virtual void Save() const wxOVERRIDE
|
|
{
|
|
wxSplitterWindow* const splitter = Get();
|
|
|
|
int pos = splitter->IsSplit() ? splitter->GetSashPosition() : -1;
|
|
SaveValue(wxPERSIST_SPLITTER_POSITION, pos);
|
|
}
|
|
|
|
virtual bool Restore() wxOVERRIDE
|
|
{
|
|
int pos;
|
|
if ( !RestoreValue(wxPERSIST_SPLITTER_POSITION, &pos) )
|
|
return false;
|
|
|
|
if ( pos == -1 )
|
|
Get()->Unsplit();
|
|
else
|
|
Get()->SetSashPosition(pos);
|
|
|
|
return true;
|
|
}
|
|
|
|
virtual wxString GetKind() const wxOVERRIDE { return wxPERSIST_SPLITTER_KIND; }
|
|
};
|
|
|
|
inline wxPersistentObject *wxCreatePersistentObject(wxSplitterWindow* splitter)
|
|
{
|
|
return new wxPersistentSplitter(splitter);
|
|
}
|
|
|
|
#endif // _WX_PERSIST_SPLITTER_H_
|