mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 01:29: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.
89 lines
2.9 KiB
C++
89 lines
2.9 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/docmdi.h
|
|
// Purpose: Frame classes for MDI document/view applications
|
|
// Author: Julian Smart
|
|
// Created: 01/02/97
|
|
// Copyright: (c) 1997 Julian Smart
|
|
// (c) 2010 Vadim Zeitlin
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_DOCMDI_H_
|
|
#define _WX_DOCMDI_H_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_MDI_ARCHITECTURE
|
|
|
|
#include "wx/docview.h"
|
|
#include "wx/mdi.h"
|
|
|
|
// Define MDI versions of the doc-view frame classes. Note that we need to
|
|
// define them as classes for wxRTTI, otherwise we could simply define them as
|
|
// typedefs.
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// An MDI document parent frame
|
|
// ----------------------------------------------------------------------------
|
|
|
|
typedef
|
|
wxDocParentFrameAny<wxMDIParentFrame> wxDocMDIParentFrameBase;
|
|
|
|
class WXDLLIMPEXP_CORE wxDocMDIParentFrame : public wxDocMDIParentFrameBase
|
|
{
|
|
public:
|
|
wxDocMDIParentFrame() : wxDocMDIParentFrameBase() { }
|
|
|
|
wxDocMDIParentFrame(wxDocManager *manager,
|
|
wxFrame *parent,
|
|
wxWindowID id,
|
|
const wxString& title,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxDEFAULT_FRAME_STYLE,
|
|
const wxString& name = wxFrameNameStr)
|
|
: wxDocMDIParentFrameBase(manager,
|
|
parent, id, title, pos, size, style, name)
|
|
{
|
|
}
|
|
|
|
private:
|
|
wxDECLARE_CLASS(wxDocMDIParentFrame);
|
|
wxDECLARE_NO_COPY_CLASS(wxDocMDIParentFrame);
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// An MDI document child frame
|
|
// ----------------------------------------------------------------------------
|
|
|
|
typedef
|
|
wxDocChildFrameAny<wxMDIChildFrame, wxMDIParentFrame> wxDocMDIChildFrameBase;
|
|
|
|
class WXDLLIMPEXP_CORE wxDocMDIChildFrame : public wxDocMDIChildFrameBase
|
|
{
|
|
public:
|
|
wxDocMDIChildFrame() { }
|
|
|
|
wxDocMDIChildFrame(wxDocument *doc,
|
|
wxView *view,
|
|
wxMDIParentFrame *parent,
|
|
wxWindowID id,
|
|
const wxString& title,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxDEFAULT_FRAME_STYLE,
|
|
const wxString& name = wxFrameNameStr)
|
|
: wxDocMDIChildFrameBase(doc, view,
|
|
parent, id, title, pos, size, style, name)
|
|
{
|
|
}
|
|
|
|
private:
|
|
wxDECLARE_CLASS(wxDocMDIChildFrame);
|
|
wxDECLARE_NO_COPY_CLASS(wxDocMDIChildFrame);
|
|
};
|
|
|
|
#endif // wxUSE_MDI_ARCHITECTURE
|
|
|
|
#endif // _WX_DOCMDI_H_
|