mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 12:21:41 +02: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.
66 lines
1.9 KiB
C++
66 lines
1.9 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/x11/reparent.h
|
|
// Purpose: Reparenting classes
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 2002-03-09
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_REPARENT_H_
|
|
#define _WX_REPARENT_H_
|
|
|
|
#include "wx/window.h"
|
|
|
|
/*
|
|
* This class helps to reparent a specific window
|
|
*/
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxAdoptedWindow;
|
|
class WXDLLIMPEXP_CORE wxReparenter: public wxObject
|
|
{
|
|
public:
|
|
wxReparenter() {}
|
|
|
|
// We assume that toReparent has had its X window set
|
|
// appropriately. toReparent is typically a wxAdoptedWindow.
|
|
bool Reparent(wxWindow* newParent, wxAdoptedWindow* toReparent);
|
|
|
|
// Wait for an appropriate window to be created.
|
|
// If exactMatch is FALSE, a substring match is OK.
|
|
// If windowName is empty, then wait for the next overrideRedirect window.
|
|
bool WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toReparent,
|
|
const wxString& windowName = wxEmptyString,
|
|
bool exactMatch = TRUE);
|
|
|
|
protected:
|
|
|
|
bool ProcessXEvent(WXEvent* event);
|
|
WXWindow FindAClientWindow(WXWindow window, const wxString& name);
|
|
|
|
static bool sm_done;
|
|
static wxAdoptedWindow* sm_toReparent;
|
|
static wxWindow* sm_newParent;
|
|
static wxString sm_name;
|
|
static bool sm_exactMatch;
|
|
};
|
|
|
|
/*
|
|
* A window that adopts its handle from the native
|
|
* toolkit. It has no parent until reparented.
|
|
*/
|
|
|
|
class WXDLLIMPEXP_CORE wxAdoptedWindow: public wxWindow
|
|
{
|
|
public:
|
|
wxAdoptedWindow();
|
|
wxAdoptedWindow(WXWindow window);
|
|
virtual ~wxAdoptedWindow();
|
|
|
|
void SetHandle(WXWindow window) { m_mainWindow = window; m_clientWindow = window; }
|
|
WXWindow GetHandle() const { return X11GetMainWindow(); }
|
|
};
|
|
|
|
#endif
|
|
// _WX_REPARENT_H_
|