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.
94 lines
3.3 KiB
C++
94 lines
3.3 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/private/msgdlg.h
|
|
// Purpose: helper functions used with native message dialog
|
|
// Author: Rickard Westerlund
|
|
// Created: 2010-07-12
|
|
// Copyright: (c) 2010 wxWidgets team
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_PRIVATE_MSGDLG_H_
|
|
#define _WX_MSW_PRIVATE_MSGDLG_H_
|
|
|
|
#include "wx/msw/wrapcctl.h"
|
|
#include "wx/scopedarray.h"
|
|
|
|
// Macro to help identify if task dialogs are available: we rely on
|
|
// TD_WARNING_ICON being defined in the headers for this as this symbol is used
|
|
// by the task dialogs only. Also notice that task dialogs are available for
|
|
// Unicode applications only.
|
|
#if defined(TD_WARNING_ICON) && wxUSE_UNICODE
|
|
#define wxHAS_MSW_TASKDIALOG
|
|
#endif
|
|
|
|
// Provides methods for creating a task dialog.
|
|
namespace wxMSWMessageDialog
|
|
{
|
|
|
|
#ifdef wxHAS_MSW_TASKDIALOG
|
|
class wxMSWTaskDialogConfig
|
|
{
|
|
public:
|
|
enum { MAX_BUTTONS = 4 };
|
|
|
|
wxMSWTaskDialogConfig()
|
|
: buttons(new TASKDIALOG_BUTTON[MAX_BUTTONS]),
|
|
parent(NULL),
|
|
iconId(0),
|
|
style(0),
|
|
useCustomLabels(false)
|
|
{ }
|
|
|
|
// initializes the object from a message dialog.
|
|
wxMSWTaskDialogConfig(const wxMessageDialogBase& dlg);
|
|
|
|
wxScopedArray<TASKDIALOG_BUTTON> buttons;
|
|
wxWindow *parent;
|
|
wxString caption;
|
|
wxString message;
|
|
wxString extendedMessage;
|
|
long iconId;
|
|
long style;
|
|
bool useCustomLabels;
|
|
wxString btnYesLabel;
|
|
wxString btnNoLabel;
|
|
wxString btnOKLabel;
|
|
wxString btnCancelLabel;
|
|
wxString btnHelpLabel;
|
|
|
|
// Will create a task dialog with it's parameters for it's creation
|
|
// stored in the provided TASKDIALOGCONFIG parameter.
|
|
// NOTE: The wxMSWTaskDialogConfig object needs to remain accessible
|
|
// during the subsequent call to TaskDialogIndirect().
|
|
void MSWCommonTaskDialogInit(TASKDIALOGCONFIG &tdc);
|
|
|
|
// Used by MSWCommonTaskDialogInit() to add a regular button or a
|
|
// button with a custom label if used.
|
|
void AddTaskDialogButton(TASKDIALOGCONFIG &tdc,
|
|
int btnCustomId,
|
|
int btnCommonId,
|
|
const wxString& customLabel);
|
|
}; // class wxMSWTaskDialogConfig
|
|
|
|
|
|
typedef HRESULT (WINAPI *TaskDialogIndirect_t)(const TASKDIALOGCONFIG *,
|
|
int *, int *, BOOL *);
|
|
|
|
// Return the pointer to TaskDialogIndirect(). This should only be called
|
|
// if HasNativeTaskDialog() returned true and is normally guaranteed to
|
|
// succeed in this case.
|
|
TaskDialogIndirect_t GetTaskDialogIndirectFunc();
|
|
#endif // wxHAS_MSW_TASKDIALOG
|
|
|
|
|
|
// Check if the task dialog is available: this simply checks the OS version
|
|
// as we know that it's only present in Vista and later.
|
|
bool HasNativeTaskDialog();
|
|
|
|
// Translates standard MSW button IDs like IDCANCEL into an equivalent
|
|
// wx constant such as wxCANCEL.
|
|
int MSWTranslateReturnCode(int msAns);
|
|
}; // namespace wxMSWMessageDialog
|
|
|
|
#endif // _WX_MSW_PRIVATE_MSGDLG_H_
|