mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-29 17:19:44 -06:00
Update wx to r75363 to address a wx bug that was breaking netplay on OS X.
This commit is contained in:
@ -227,6 +227,9 @@ public: // utility functions not part of the API
|
||||
// return the index of the given column in m_cols
|
||||
int GetColumnIndex(const wxDataViewColumn *column) const;
|
||||
|
||||
// Return the index of the column having the given model index.
|
||||
int GetModelColumnIndex(unsigned int model_column) const;
|
||||
|
||||
// return the column displayed at the given position in the control
|
||||
wxDataViewColumn *GetColumnAt(unsigned int pos) const;
|
||||
|
||||
|
@ -15,6 +15,8 @@
|
||||
|
||||
#if wxUSE_GRID
|
||||
|
||||
#include "wx/scopedptr.h"
|
||||
|
||||
class wxGridCellEditorEvtHandler : public wxEvtHandler
|
||||
{
|
||||
public:
|
||||
|
@ -79,6 +79,9 @@ public:
|
||||
// (default font is a larger and bold version of the normal one)
|
||||
virtual bool SetFont(const wxFont& font);
|
||||
|
||||
// same thing with the colour: this affects the text colour
|
||||
virtual bool SetForegroundColour(const wxColor& colour);
|
||||
|
||||
protected:
|
||||
// info bar shouldn't have any border by default, the colour difference
|
||||
// between it and the main window separates it well enough
|
||||
|
@ -60,8 +60,8 @@ public:
|
||||
private:
|
||||
wxSize GetBitmapSize()
|
||||
{
|
||||
return m_bitmap.IsOk() ? wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight())
|
||||
: wxSize(16, 16); // this is completely arbitrary
|
||||
return m_bitmap.IsOk() ? m_bitmap.GetScaledSize()
|
||||
: wxSize(16, 16); // this is completely arbitrary
|
||||
}
|
||||
|
||||
void OnPaint(wxPaintEvent& event);
|
||||
|
Reference in New Issue
Block a user