mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-14 10:09: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.
112 lines
3.6 KiB
C++
112 lines
3.6 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/osx/filedlg.h
|
|
// Purpose: wxFileDialog class
|
|
// Author: Stefan Csomor
|
|
// Modified by:
|
|
// Created: 1998-01-01
|
|
// Copyright: (c) Stefan Csomor
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_FILEDLG_H_
|
|
#define _WX_FILEDLG_H_
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxChoice;
|
|
|
|
//-------------------------------------------------------------------------
|
|
// wxFileDialog
|
|
//-------------------------------------------------------------------------
|
|
|
|
// set this system option to 1 in order to always show the filetypes popup in
|
|
// file open dialogs if possible
|
|
|
|
#define wxOSX_FILEDIALOG_ALWAYS_SHOW_TYPES wxT("osx.openfiledialog.always-show-types")
|
|
|
|
class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase
|
|
{
|
|
wxDECLARE_DYNAMIC_CLASS(wxFileDialog);
|
|
protected:
|
|
wxArrayString m_fileNames;
|
|
wxArrayString m_paths;
|
|
|
|
public:
|
|
wxFileDialog() { Init(); }
|
|
wxFileDialog(wxWindow *parent,
|
|
const wxString& message = wxFileSelectorPromptStr,
|
|
const wxString& defaultDir = wxEmptyString,
|
|
const wxString& defaultFile = wxEmptyString,
|
|
const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
|
|
long style = wxFD_DEFAULT_STYLE,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& sz = wxDefaultSize,
|
|
const wxString& name = wxFileDialogNameStr)
|
|
{
|
|
Init();
|
|
|
|
Create(parent,message,defaultDir,defaultFile,wildCard,style,pos,sz,name);
|
|
}
|
|
|
|
void Create(wxWindow *parent,
|
|
const wxString& message = wxFileSelectorPromptStr,
|
|
const wxString& defaultDir = wxEmptyString,
|
|
const wxString& defaultFile = wxEmptyString,
|
|
const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
|
|
long style = wxFD_DEFAULT_STYLE,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& sz = wxDefaultSize,
|
|
const wxString& name = wxFileDialogNameStr);
|
|
|
|
#if wxOSX_USE_COCOA
|
|
~wxFileDialog();
|
|
#endif
|
|
|
|
virtual void GetPaths(wxArrayString& paths) const { paths = m_paths; }
|
|
virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; }
|
|
|
|
virtual int ShowModal();
|
|
|
|
#if wxOSX_USE_COCOA
|
|
virtual void ShowWindowModal();
|
|
virtual void ModalFinishedCallback(void* panel, int resultCode);
|
|
#endif
|
|
|
|
virtual bool SupportsExtraControl() const;
|
|
|
|
// implementation only
|
|
|
|
#if wxOSX_USE_COCOA
|
|
// returns true if the file can be shown as active
|
|
bool CheckFile( const wxString& filename );
|
|
#endif
|
|
|
|
protected:
|
|
// not supported for file dialog, RR
|
|
virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
|
|
int WXUNUSED(width), int WXUNUSED(height),
|
|
int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
|
|
|
|
void SetupExtraControls(WXWindow nativeWindow);
|
|
|
|
#if wxOSX_USE_COCOA
|
|
virtual wxWindow* CreateFilterPanel(wxWindow *extracontrol);
|
|
void DoOnFilterSelected(int index);
|
|
virtual void OnFilterSelected(wxCommandEvent &event);
|
|
|
|
wxArrayString m_filterExtensions;
|
|
wxArrayString m_filterNames;
|
|
wxChoice* m_filterChoice;
|
|
wxWindow* m_filterPanel;
|
|
bool m_useFileTypeFilter;
|
|
int m_firstFileTypeFilter;
|
|
wxArrayString m_currentExtensions;
|
|
WX_NSObject m_delegate;
|
|
WX_NSObject m_sheetDelegate;
|
|
#endif
|
|
|
|
private:
|
|
// Common part of all ctors.
|
|
void Init();
|
|
};
|
|
|
|
#endif // _WX_FILEDLG_H_
|