mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-17 19:49: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.
96 lines
2.5 KiB
C++
96 lines
2.5 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/dialog.h
|
|
// Purpose: wxDialog class
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 1998-01-01
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_DIALOG_H_
|
|
#define _WX_DIALOG_H_
|
|
|
|
#include "wx/panel.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
|
|
class WXDLLIMPEXP_FWD_CORE wxModalEventLoop ;
|
|
|
|
// Dialog boxes
|
|
class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase
|
|
{
|
|
wxDECLARE_DYNAMIC_CLASS(wxDialog);
|
|
|
|
public:
|
|
wxDialog() { Init(); }
|
|
|
|
// Constructor with no modal flag - the new convention.
|
|
wxDialog(wxWindow *parent, wxWindowID id,
|
|
const wxString& title,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxDEFAULT_DIALOG_STYLE,
|
|
const wxString& name = wxDialogNameStr)
|
|
{
|
|
Init();
|
|
Create(parent, id, title, pos, size, style, name);
|
|
}
|
|
|
|
bool Create(wxWindow *parent, wxWindowID id,
|
|
const wxString& title,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxDEFAULT_DIALOG_STYLE,
|
|
const wxString& name = wxDialogNameStr);
|
|
|
|
virtual ~wxDialog();
|
|
|
|
// virtual bool Destroy();
|
|
virtual bool Show(bool show = true);
|
|
|
|
// return true if we're showing the dialog modally
|
|
virtual bool IsModal() const;
|
|
|
|
// show the dialog modally and return the value passed to EndModal()
|
|
virtual int ShowModal();
|
|
|
|
virtual void ShowWindowModal();
|
|
|
|
// may be called to terminate the dialog with the given return code
|
|
virtual void EndModal(int retCode);
|
|
|
|
static bool OSXHasModalDialogsOpen();
|
|
static void OSXBeginModalDialog();
|
|
static void OSXEndModalDialog();
|
|
|
|
// implementation
|
|
// --------------
|
|
|
|
wxDialogModality GetModality() const;
|
|
|
|
#if wxOSX_USE_COCOA
|
|
virtual void ModalFinishedCallback(void* WXUNUSED(panel), int WXUNUSED(returnCode)) {}
|
|
#endif
|
|
|
|
protected:
|
|
// show window modal dialog
|
|
void DoShowWindowModal();
|
|
|
|
// end window modal dialog.
|
|
void EndWindowModal();
|
|
|
|
// mac also takes command-period as cancel
|
|
virtual bool IsEscapeKey(const wxKeyEvent& event);
|
|
|
|
|
|
wxDialogModality m_modality;
|
|
|
|
wxModalEventLoop* m_eventLoop;
|
|
|
|
private:
|
|
void Init();
|
|
};
|
|
|
|
#endif
|
|
// _WX_DIALOG_H_
|