mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-17 19:49:12 +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.
64 lines
2.0 KiB
C++
64 lines
2.0 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/dirdlg.h
|
|
// Purpose: wxDirDialog
|
|
// Author: Francesco Montorsi
|
|
// Copyright: (c) 2006 Francesco Montorsi
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef __GTKDIRDLGH__
|
|
#define __GTKDIRDLGH__
|
|
|
|
//-------------------------------------------------------------------------
|
|
// wxDirDialog
|
|
//-------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase
|
|
{
|
|
public:
|
|
wxDirDialog() { }
|
|
|
|
wxDirDialog(wxWindow *parent,
|
|
const wxString& message = wxDirSelectorPromptStr,
|
|
const wxString& defaultPath = wxEmptyString,
|
|
long style = wxDD_DEFAULT_STYLE,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
const wxString& name = wxDirDialogNameStr);
|
|
bool Create(wxWindow *parent,
|
|
const wxString& message = wxDirSelectorPromptStr,
|
|
const wxString& defaultPath = wxEmptyString,
|
|
long style = wxDD_DEFAULT_STYLE,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
const wxString& name = wxDirDialogNameStr);
|
|
virtual ~wxDirDialog() { }
|
|
|
|
|
|
public: // overrides from wxGenericDirDialog
|
|
|
|
wxString GetPath() const wxOVERRIDE;
|
|
void SetPath(const wxString& path) wxOVERRIDE;
|
|
|
|
|
|
// Implementation only.
|
|
|
|
void GTKOnAccept();
|
|
void GTKOnCancel();
|
|
|
|
protected:
|
|
// override this from wxTLW since the native
|
|
// form doesn't have any m_wxwindow
|
|
virtual void DoSetSize(int x, int y,
|
|
int width, int height,
|
|
int sizeFlags = wxSIZE_AUTO) wxOVERRIDE;
|
|
|
|
|
|
private:
|
|
wxString m_selectedDirectory;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS(wxDirDialog);
|
|
};
|
|
|
|
#endif // __GTKDIRDLGH__
|