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.
77 lines
2.2 KiB
C++
77 lines
2.2 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/persist/window.h
|
|
// Purpose: wxPersistentWindow declaration
|
|
// Author: Vadim Zeitlin
|
|
// Created: 2009-01-23
|
|
// Copyright: (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_PERSIST_WINDOW_H_
|
|
#define _WX_PERSIST_WINDOW_H_
|
|
|
|
#include "wx/persist.h"
|
|
|
|
#include "wx/window.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxPersistentWindow: base class for persistent windows, uses the window name
|
|
// as persistent name by default and automatically reacts
|
|
// to the window destruction
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// type-independent part of wxPersistentWindow
|
|
class wxPersistentWindowBase : public wxPersistentObject
|
|
{
|
|
public:
|
|
wxPersistentWindowBase(wxWindow *win)
|
|
: wxPersistentObject(win)
|
|
{
|
|
win->Bind(wxEVT_DESTROY, &wxPersistentWindowBase::HandleDestroy, this);
|
|
}
|
|
|
|
virtual wxString GetName() const wxOVERRIDE
|
|
{
|
|
const wxString name = GetWindow()->GetName();
|
|
wxASSERT_MSG( !name.empty(), "persistent windows should be named!" );
|
|
|
|
return name;
|
|
}
|
|
|
|
protected:
|
|
wxWindow *GetWindow() const { return static_cast<wxWindow *>(GetObject()); }
|
|
|
|
private:
|
|
void HandleDestroy(wxWindowDestroyEvent& event)
|
|
{
|
|
event.Skip();
|
|
|
|
// only react to the destruction of this object itself, not of any of
|
|
// its children
|
|
if ( event.GetEventObject() == GetObject() )
|
|
{
|
|
// this will delete this object itself
|
|
wxPersistenceManager::Get().SaveAndUnregister(GetWindow());
|
|
}
|
|
}
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxPersistentWindowBase);
|
|
};
|
|
|
|
template <class T>
|
|
class wxPersistentWindow : public wxPersistentWindowBase
|
|
{
|
|
public:
|
|
typedef T WindowType;
|
|
|
|
wxPersistentWindow(WindowType *win)
|
|
: wxPersistentWindowBase(win)
|
|
{
|
|
}
|
|
|
|
WindowType *Get() const { return static_cast<WindowType *>(GetWindow()); }
|
|
};
|
|
|
|
#endif // _WX_PERSIST_WINDOW_H_
|
|
|