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.
51 lines
2.1 KiB
C++
51 lines
2.1 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/msgdlg.h
|
|
// Purpose: wxMessageDialog for GTK+2
|
|
// Author: Vaclav Slavik
|
|
// Modified by:
|
|
// Created: 2003/02/28
|
|
// Copyright: (c) Vaclav Slavik, 2003
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTK_MSGDLG_H_
|
|
#define _WX_GTK_MSGDLG_H_
|
|
|
|
class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
|
|
{
|
|
public:
|
|
wxMessageDialog(wxWindow *parent, const wxString& message,
|
|
const wxString& caption = wxMessageBoxCaptionStr,
|
|
long style = wxOK|wxCENTRE,
|
|
const wxPoint& pos = wxDefaultPosition);
|
|
|
|
virtual int ShowModal() wxOVERRIDE;
|
|
virtual bool Show(bool WXUNUSED(show) = true) wxOVERRIDE { return false; }
|
|
|
|
protected:
|
|
// implement some base class methods to do nothing to avoid asserts and
|
|
// GTK warnings, since this is not a real wxDialog.
|
|
virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
|
|
int WXUNUSED(width), int WXUNUSED(height),
|
|
int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {}
|
|
virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y),
|
|
int WXUNUSED(width), int WXUNUSED(height)) wxOVERRIDE {}
|
|
// override to convert wx mnemonics to GTK+ ones and handle stock ids
|
|
virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label) wxOVERRIDE;
|
|
|
|
private:
|
|
// override to use stock GTK+ defaults instead of just string ones
|
|
virtual wxString GetDefaultYesLabel() const wxOVERRIDE;
|
|
virtual wxString GetDefaultNoLabel() const wxOVERRIDE;
|
|
virtual wxString GetDefaultOKLabel() const wxOVERRIDE;
|
|
virtual wxString GetDefaultCancelLabel() const wxOVERRIDE;
|
|
virtual wxString GetDefaultHelpLabel() const wxOVERRIDE;
|
|
|
|
// create the real GTK+ dialog: this is done from ShowModal() to allow
|
|
// changing the message between constructing the dialog and showing it
|
|
void GTKCreateMsgDialog();
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxMessageDialog);
|
|
};
|
|
|
|
#endif // _WX_GTK_MSGDLG_H_
|