mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-29 00:59:44 -06:00
Upgrade WX to r74856, mainly to support @2x.
This commit is contained in:
11
Externals/wxWidgets3/include/wx/gtk/collpane.h
vendored
11
Externals/wxWidgets3/include/wx/gtk/collpane.h
vendored
@ -4,7 +4,6 @@
|
||||
// Author: Francesco Montorsi
|
||||
// Modified by:
|
||||
// Created: 8/10/2006
|
||||
// RCS-ID: $Id: collpane.h 58632 2009-02-03 09:53:33Z RR $
|
||||
// Copyright: (c) Francesco Montorsi
|
||||
// Licence: wxWindows Licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -35,11 +34,6 @@ public:
|
||||
Create(parent, winid, label, pos, size, style, val, name);
|
||||
}
|
||||
|
||||
void Init()
|
||||
{
|
||||
m_bIgnoreNextChange = false;
|
||||
}
|
||||
|
||||
bool Create(wxWindow *parent,
|
||||
wxWindowID winid,
|
||||
const wxString& label,
|
||||
@ -69,6 +63,11 @@ public: // used by GTK callbacks
|
||||
wxString m_strLabel;
|
||||
|
||||
private:
|
||||
void Init()
|
||||
{
|
||||
m_bIgnoreNextChange = false;
|
||||
}
|
||||
|
||||
void OnSize(wxSizeEvent&);
|
||||
virtual void AddChildGTK(wxWindowGTK* child);
|
||||
GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
|
||||
|
Reference in New Issue
Block a user