piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 15:49:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade WX to r74856, mainly to support @2x.

Browse Source
This commit is contained in:
comex
2013-09-22 18:44:55 -04:00
parent 0bdef3932f
commit 66ed9a1804
1935 changed files with 45373 additions and 22739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Externals/wxWidgets3/include/wx/sizer.h vendored
View File

@ -4,7 +4,6 @@
// Author: Robert Roebling and Robin Dunn
// Modified by: Ron Lee, Vadim Zeitlin (wxSizerFlags)
// Created:
// RCS-ID: $Id: sizer.h 69970 2011-12-10 04:34:06Z RD $
// Copyright: (c) Robin Dunn, Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -125,6 +124,10 @@ public:
wxSizerFlags& Border(int direction, int borderInPixels)
{
wxCHECK_MSG( !(direction & ~wxALL), *this,
wxS("direction must be a combination of wxDirection ")
wxS("enum values.") );
m_flags &= ~wxALL;
m_flags |= direction;
@ -311,6 +314,10 @@ public:
{ return m_minSize; }
wxSize GetMinSizeWithBorder() const;
wxSize GetMaxSize() const
{ return IsWindow() ? m_window->GetMaxSize() : wxDefaultSize; }
wxSize GetMaxSizeWithBorder() const;
void SetMinSize(const wxSize& size)
{
if ( IsWindow() )
@ -436,6 +443,10 @@ protected:
void DoSetSizer(wxSizer *sizer);
void DoSetSpacer(const wxSize& size);
// Add the border specified for this item to the given size
// if it's != wxDefaultSize, just return wxDefaultSize otherwise.
wxSize AddBorderToSize(const wxSize& size) const;
// discriminated union: depending on m_kind one of the fields is valid
enum
{
@ -601,7 +612,7 @@ public:
virtual void DeleteWindows();
// Inform sizer about the first direction that has been decided (by parent item)
// Returns true if it made use of the informtion (and recalculated min size)
// Returns true if it made use of the information (and recalculated min size)
virtual bool InformFirstDirection( int WXUNUSED(direction), int WXUNUSED(size), int WXUNUSED(availableOtherDir) )
{ return false; }
@ -703,6 +714,10 @@ public:
void Show(bool show) { ShowItems(show); }
// This is the ShowItems() counterpart and returns true if any of the sizer
// items are shown.
virtual bool AreAnyItemsShown() const;
protected:
wxSize m_size;
wxSize m_minSize;
@ -798,7 +813,7 @@ protected:
"Can't calculate number of cols if number of rows is not specified"
);
return (m_children.GetCount() + m_rows - 1) / m_rows;
return int(m_children.GetCount() + m_rows - 1) / m_rows;
}
int CalcRows() const
@ -809,7 +824,7 @@ protected:
"Can't calculate number of cols if number of rows is not specified"
);
return (m_children.GetCount() + m_cols - 1) / m_cols;
return int(m_children.GetCount() + m_cols - 1) / m_cols;
}
private:
@ -1021,6 +1036,7 @@ public:
// override to hide/show the static box as well
virtual void ShowItems (bool show);
virtual bool AreAnyItemsShown() const;
virtual bool Detach( wxWindow *window );
virtual bool Detach( wxSizer *sizer ) { return wxBoxSizer::Detach(sizer); }