mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 17:49:14 +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.
56 lines
1.8 KiB
C++
56 lines
1.8 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/generic/msgdlgg.h
|
|
// Purpose: Generic wxMessageDialog
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 01/02/97
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GENERIC_MSGDLGG_H_
|
|
#define _WX_GENERIC_MSGDLGG_H_
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxSizer;
|
|
|
|
class WXDLLIMPEXP_CORE wxGenericMessageDialog : public wxMessageDialogBase
|
|
{
|
|
public:
|
|
wxGenericMessageDialog(wxWindow *parent,
|
|
const wxString& message,
|
|
const wxString& caption = wxMessageBoxCaptionStr,
|
|
long style = wxOK|wxCENTRE,
|
|
const wxPoint& pos = wxDefaultPosition);
|
|
|
|
virtual int ShowModal() wxOVERRIDE;
|
|
|
|
protected:
|
|
// Creates a message dialog taking any options that have been set after
|
|
// object creation into account such as custom labels.
|
|
void DoCreateMsgdialog();
|
|
|
|
void OnYes(wxCommandEvent& event);
|
|
void OnNo(wxCommandEvent& event);
|
|
void OnHelp(wxCommandEvent& event);
|
|
void OnCancel(wxCommandEvent& event);
|
|
|
|
// can be overridden to provide more contents to the dialog
|
|
virtual void AddMessageDialogCheckBox(wxSizer *WXUNUSED(sizer)) { }
|
|
virtual void AddMessageDialogDetails(wxSizer *WXUNUSED(sizer)) { }
|
|
|
|
private:
|
|
// Creates and returns a standard button sizer using the style of this
|
|
// dialog and the custom labels, if any.
|
|
//
|
|
// May return NULL on smart phone platforms not using buttons at all.
|
|
wxSizer *CreateMsgDlgButtonSizer();
|
|
|
|
wxPoint m_pos;
|
|
bool m_created;
|
|
|
|
wxDECLARE_EVENT_TABLE();
|
|
wxDECLARE_DYNAMIC_CLASS(wxGenericMessageDialog);
|
|
};
|
|
|
|
#endif // _WX_GENERIC_MSGDLGG_H_
|