mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 20:31:50 +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.
123 lines
4.1 KiB
C++
123 lines
4.1 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/dirdlg.h
|
|
// Purpose: wxDirDialog base class
|
|
// Author: Robert Roebling
|
|
// Modified by:
|
|
// Created:
|
|
// Copyright: (c) Robert Roebling
|
|
// Licence: wxWindows Licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_DIRDLG_H_BASE_
|
|
#define _WX_DIRDLG_H_BASE_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_DIRDLG
|
|
|
|
#include "wx/dialog.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// constants
|
|
// ----------------------------------------------------------------------------
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogNameStr[];
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxDirDialogDefaultFolderStr[];
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxDirSelectorPromptStr[];
|
|
|
|
#define wxDD_CHANGE_DIR 0x0100
|
|
#define wxDD_DIR_MUST_EXIST 0x0200
|
|
|
|
// deprecated, on by default now, use wxDD_DIR_MUST_EXIST to disable it
|
|
#define wxDD_NEW_DIR_BUTTON 0
|
|
|
|
#define wxDD_DEFAULT_STYLE (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
|
|
|
|
//-------------------------------------------------------------------------
|
|
// wxDirDialogBase
|
|
//-------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxDirDialogBase : public wxDialog
|
|
{
|
|
public:
|
|
wxDirDialogBase() {}
|
|
wxDirDialogBase(wxWindow *parent,
|
|
const wxString& title = wxDirSelectorPromptStr,
|
|
const wxString& defaultPath = wxEmptyString,
|
|
long style = wxDD_DEFAULT_STYLE,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& sz = wxDefaultSize,
|
|
const wxString& name = wxDirDialogNameStr)
|
|
{
|
|
Create(parent, title, defaultPath, style, pos, sz, name);
|
|
}
|
|
|
|
virtual ~wxDirDialogBase() {}
|
|
|
|
|
|
bool Create(wxWindow *parent,
|
|
const wxString& title = wxDirSelectorPromptStr,
|
|
const wxString& defaultPath = wxEmptyString,
|
|
long style = wxDD_DEFAULT_STYLE,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& sz = wxDefaultSize,
|
|
const wxString& name = wxDirDialogNameStr)
|
|
{
|
|
if (!wxDialog::Create(parent, wxID_ANY, title, pos, sz, style, name))
|
|
return false;
|
|
m_path = defaultPath;
|
|
m_message = title;
|
|
return true;
|
|
}
|
|
|
|
virtual void SetMessage(const wxString& message) { m_message = message; }
|
|
virtual void SetPath(const wxString& path) { m_path = path; }
|
|
|
|
virtual wxString GetMessage() const { return m_message; }
|
|
virtual wxString GetPath() const { return m_path; }
|
|
|
|
protected:
|
|
wxString m_message;
|
|
wxString m_path;
|
|
};
|
|
|
|
|
|
// Universal and non-port related switches with need for generic implementation
|
|
#if defined(__WXUNIVERSAL__)
|
|
#include "wx/generic/dirdlgg.h"
|
|
#define wxDirDialog wxGenericDirDialog
|
|
#elif defined(__WXMSW__) && !wxUSE_OLE
|
|
#include "wx/generic/dirdlgg.h"
|
|
#define wxDirDialog wxGenericDirDialog
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/dirdlg.h" // Native MSW
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/dirdlg.h" // Native GTK for gtk2.4
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/generic/dirdlgg.h"
|
|
#define wxDirDialog wxGenericDirDialog
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/dirdlg.h" // Native Mac
|
|
#elif defined(__WXMOTIF__) || \
|
|
defined(__WXX11__)
|
|
#include "wx/generic/dirdlgg.h" // Other ports use generic implementation
|
|
#define wxDirDialog wxGenericDirDialog
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/dirdlg.h"
|
|
#endif
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// common ::wxDirSelector() function
|
|
// ----------------------------------------------------------------------------
|
|
|
|
WXDLLIMPEXP_CORE wxString
|
|
wxDirSelector(const wxString& message = wxDirSelectorPromptStr,
|
|
const wxString& defaultPath = wxEmptyString,
|
|
long style = wxDD_DEFAULT_STYLE,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
wxWindow *parent = NULL);
|
|
|
|
#endif // wxUSE_DIRDLG
|
|
|
|
#endif
|
|
// _WX_DIRDLG_H_BASE_
|