mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-22 12:21:41 +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.
90 lines
3.4 KiB
C++
90 lines
3.4 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/combobox.h
|
|
// Purpose: wxComboBox declaration
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 24.12.00
|
|
// Copyright: (c) 1996-2000 wxWidgets team
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_COMBOBOX_H_BASE_
|
|
#define _WX_COMBOBOX_H_BASE_
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_COMBOBOX
|
|
|
|
// For compatibility with 2.8 include this header to allow using wxTE_XXX
|
|
// styles with wxComboBox without explicitly including it in the user code.
|
|
#include "wx/textctrl.h"
|
|
|
|
extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxComboBoxBase: this interface defines the methods wxComboBox must implement
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#include "wx/ctrlsub.h"
|
|
#include "wx/textentry.h"
|
|
|
|
class WXDLLIMPEXP_CORE wxComboBoxBase : public wxItemContainer,
|
|
public wxTextEntry
|
|
{
|
|
public:
|
|
// override these methods to disambiguate between two base classes versions
|
|
virtual void Clear() wxOVERRIDE
|
|
{
|
|
wxTextEntry::Clear();
|
|
wxItemContainer::Clear();
|
|
}
|
|
|
|
// IsEmpty() is ambiguous because we inherit it from both wxItemContainer
|
|
// and wxTextEntry, and even if defined it here to help the compiler with
|
|
// choosing one of them, it would still be confusing for the human users of
|
|
// this class. So instead define the clearly named methods below and leave
|
|
// IsEmpty() ambiguous to trigger a compilation error if it's used.
|
|
bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
|
|
bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
|
|
|
|
// also bring in GetSelection() versions of both base classes in scope
|
|
//
|
|
// NB: GetSelection(from, to) could be already implemented in wxTextEntry
|
|
// but still make it pure virtual because for some platforms it's not
|
|
// implemented there and also because the derived class has to override
|
|
// it anyhow to avoid ambiguity with the other GetSelection()
|
|
virtual int GetSelection() const wxOVERRIDE = 0;
|
|
virtual void GetSelection(long *from, long *to) const wxOVERRIDE = 0;
|
|
|
|
virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }
|
|
virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }
|
|
|
|
// may return value different from GetSelection() when the combobox
|
|
// dropdown is shown and the user selected, but not yet accepted, a value
|
|
// different from the old one in it
|
|
virtual int GetCurrentSelection() const { return GetSelection(); }
|
|
};
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// include the platform-dependent header defining the real class
|
|
// ----------------------------------------------------------------------------
|
|
|
|
#if defined(__WXUNIVERSAL__)
|
|
#include "wx/univ/combobox.h"
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/combobox.h"
|
|
#elif defined(__WXMOTIF__)
|
|
#include "wx/motif/combobox.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/combobox.h"
|
|
#elif defined(__WXGTK__)
|
|
#include "wx/gtk1/combobox.h"
|
|
#elif defined(__WXMAC__)
|
|
#include "wx/osx/combobox.h"
|
|
#elif defined(__WXQT__)
|
|
#include "wx/qt/combobox.h"
|
|
#endif
|
|
|
|
#endif // wxUSE_COMBOBOX
|
|
|
|
#endif // _WX_COMBOBOX_H_BASE_
|