mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-26 07:39:45 -06:00
Update to wxWidgets r67291.
Fixes a wxFileSelector regression on OS X. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7404 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
8
Externals/wxWidgets3/include/wx/window.h
vendored
8
Externals/wxWidgets3/include/wx/window.h
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by: Ron Lee
|
||||
// Created: 01/02/97
|
||||
// RCS-ID: $Id: window.h 66862 2011-02-08 13:36:13Z VZ $
|
||||
// RCS-ID: $Id: window.h 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Vadim Zeitlin
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -408,7 +408,7 @@ public:
|
||||
void Centre(int dir = wxBOTH) { DoCentre(dir); }
|
||||
void Center(int dir = wxBOTH) { DoCentre(dir); }
|
||||
|
||||
// centre with respect to the the parent window
|
||||
// centre with respect to the parent window
|
||||
void CentreOnParent(int dir = wxBOTH) { DoCentre(dir); }
|
||||
void CenterOnParent(int dir = wxBOTH) { CentreOnParent(dir); }
|
||||
|
||||
@ -446,7 +446,7 @@ public:
|
||||
|
||||
|
||||
// Call these to override what GetBestSize() returns. This
|
||||
// method is only virtual because it is overriden in wxTLW
|
||||
// method is only virtual because it is overridden in wxTLW
|
||||
// as a different API for SetSizeHints().
|
||||
virtual void SetMinSize(const wxSize& minSize);
|
||||
virtual void SetMaxSize(const wxSize& maxSize);
|
||||
@ -1658,7 +1658,7 @@ protected:
|
||||
// (GetBorderSize() will be used to add them)
|
||||
virtual wxSize DoGetBestClientSize() const { return wxDefaultSize; }
|
||||
|
||||
// this is the virtual function to be overriden in any derived class which
|
||||
// this is the virtual function to be overridden in any derived class which
|
||||
// wants to change how SetSize() or Move() works - it is called by all
|
||||
// versions of these functions in the base class
|
||||
virtual void DoSetSize(int x, int y,
|
||||
|
Reference in New Issue
Block a user