mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-15 10:39:13 +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.7 KiB
C++
96 lines
2.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/dialog.h
|
|
// Purpose: wxDialog class
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 01/02/97
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_DIALOG_H_
|
|
#define _WX_DIALOG_H_
|
|
|
|
#include "wx/panel.h"
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxDialogModalData;
|
|
|
|
// Dialog boxes
|
|
class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase
|
|
{
|
|
public:
|
|
wxDialog() { Init(); }
|
|
|
|
// full ctor
|
|
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();
|
|
|
|
(void)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();
|
|
|
|
// return true if we're showing the dialog modally
|
|
virtual bool IsModal() const { return m_modalData != NULL; }
|
|
|
|
// show the dialog modally and return the value passed to EndModal()
|
|
virtual int ShowModal();
|
|
|
|
// may be called to terminate the dialog with the given return code
|
|
virtual void EndModal(int retCode);
|
|
|
|
|
|
// implementation only from now on
|
|
// -------------------------------
|
|
|
|
// override some base class virtuals
|
|
virtual bool Show(bool show = true);
|
|
virtual void SetWindowStyleFlag(long style);
|
|
|
|
// Windows callbacks
|
|
WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
|
|
|
|
protected:
|
|
// common part of all ctors
|
|
void Init();
|
|
|
|
private:
|
|
// these functions deal with the gripper window shown in the corner of
|
|
// resizable dialogs
|
|
void CreateGripper();
|
|
void DestroyGripper();
|
|
void ShowGripper(bool show);
|
|
void ResizeGripper();
|
|
|
|
// this function is used to adjust Z-order of new children relative to the
|
|
// gripper if we have one
|
|
void OnWindowCreate(wxWindowCreateEvent& event);
|
|
|
|
// gripper window for a resizable dialog, NULL if we're not resizable
|
|
WXHWND m_hGripper;
|
|
|
|
// this pointer is non-NULL only while the modal event loop is running
|
|
wxDialogModalData *m_modalData;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxDialog);
|
|
wxDECLARE_NO_COPY_CLASS(wxDialog);
|
|
};
|
|
|
|
#endif
|
|
// _WX_DIALOG_H_
|