mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-13 09:39:11 +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.
126 lines
3.5 KiB
C++
126 lines
3.5 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/bmpcbox.h
|
|
// Purpose: wxBitmapComboBox base header
|
|
// Author: Jaakko Salli
|
|
// Modified by:
|
|
// Created: Aug-31-2006
|
|
// Copyright: (c) Jaakko Salli
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_BMPCBOX_H_BASE_
|
|
#define _WX_BMPCBOX_H_BASE_
|
|
|
|
|
|
#include "wx/defs.h"
|
|
|
|
#if wxUSE_BITMAPCOMBOBOX
|
|
|
|
#include "wx/bitmap.h"
|
|
#include "wx/dynarray.h"
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
|
class WXDLLIMPEXP_FWD_CORE wxItemContainer;
|
|
|
|
// Define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED for platforms which
|
|
// wxBitmapComboBox implementation utilizes ownerdrawn combobox
|
|
// (either native or generic).
|
|
#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
|
|
#define wxBITMAPCOMBOBOX_OWNERDRAWN_BASED
|
|
|
|
class WXDLLIMPEXP_FWD_CORE wxDC;
|
|
#endif
|
|
|
|
extern WXDLLIMPEXP_DATA_ADV(const char) wxBitmapComboBoxNameStr[];
|
|
|
|
|
|
class WXDLLIMPEXP_ADV wxBitmapComboBoxBase
|
|
{
|
|
public:
|
|
// ctors and such
|
|
wxBitmapComboBoxBase() { Init(); }
|
|
|
|
virtual ~wxBitmapComboBoxBase() { }
|
|
|
|
// Sets the image for the given item.
|
|
virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap) = 0;
|
|
|
|
#if !defined(wxBITMAPCOMBOBOX_OWNERDRAWN_BASED)
|
|
|
|
// Returns the image of the item with the given index.
|
|
virtual wxBitmap GetItemBitmap(unsigned int n) const = 0;
|
|
|
|
// Returns size of the image used in list
|
|
virtual wxSize GetBitmapSize() const = 0;
|
|
|
|
private:
|
|
void Init() {}
|
|
|
|
#else // wxBITMAPCOMBOBOX_OWNERDRAWN_BASED
|
|
|
|
// Returns the image of the item with the given index.
|
|
virtual wxBitmap GetItemBitmap(unsigned int n) const;
|
|
|
|
// Returns size of the image used in list
|
|
virtual wxSize GetBitmapSize() const
|
|
{
|
|
return m_usedImgSize;
|
|
}
|
|
|
|
protected:
|
|
|
|
// Returns pointer to the combobox item container
|
|
virtual wxItemContainer* GetItemContainer() = 0;
|
|
|
|
// Return pointer to the owner-drawn combobox control
|
|
virtual wxWindow* GetControl() = 0;
|
|
|
|
// wxItemContainer functions
|
|
void BCBDoClear();
|
|
void BCBDoDeleteOneItem(unsigned int n);
|
|
|
|
void DoSetItemBitmap(unsigned int n, const wxBitmap& bitmap);
|
|
|
|
void DrawBackground(wxDC& dc, const wxRect& rect, int item, int flags) const;
|
|
void DrawItem(wxDC& dc, const wxRect& rect, int item, const wxString& text,
|
|
int flags) const;
|
|
wxCoord MeasureItem(size_t item) const;
|
|
|
|
// Returns true if image size was affected
|
|
virtual bool OnAddBitmap(const wxBitmap& bitmap);
|
|
|
|
// Recalculates amount of empty space needed in front of text
|
|
// in control itself. Returns number that can be passed to
|
|
// wxOwnerDrawnComboBox::SetCustomPaintWidth() and similar
|
|
// functions.
|
|
virtual int DetermineIndent();
|
|
|
|
void UpdateInternals();
|
|
|
|
wxArrayPtrVoid m_bitmaps; // Images associated with items
|
|
wxSize m_usedImgSize; // Size of bitmaps
|
|
|
|
int m_imgAreaWidth; // Width and height of area next to text field
|
|
int m_fontHeight;
|
|
int m_indent;
|
|
|
|
private:
|
|
void Init();
|
|
#endif // !wxBITMAPCOMBOBOX_OWNERDRAWN_BASED/wxBITMAPCOMBOBOX_OWNERDRAWN_BASED
|
|
};
|
|
|
|
|
|
#if defined(__WXUNIVERSAL__)
|
|
#include "wx/generic/bmpcbox.h"
|
|
#elif defined(__WXMSW__)
|
|
#include "wx/msw/bmpcbox.h"
|
|
#elif defined(__WXGTK20__)
|
|
#include "wx/gtk/bmpcbox.h"
|
|
#else
|
|
#include "wx/generic/bmpcbox.h"
|
|
#endif
|
|
|
|
#endif // wxUSE_BITMAPCOMBOBOX
|
|
|
|
#endif // _WX_BMPCBOX_H_BASE_
|