mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-26 07:39:45 -06:00
wxWidgets3: update to svn r70933
This commit is contained in:
49
Externals/wxWidgets3/include/wx/window.h
vendored
49
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 67280 2011-03-22 14:17:38Z DS $
|
||||
// RCS-ID: $Id: window.h 70838 2012-03-07 23:50:21Z VZ $
|
||||
// Copyright: (c) Vadim Zeitlin
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -480,7 +480,7 @@ public:
|
||||
// windows this is just the client area of the window, but for
|
||||
// some like scrolled windows it is more or less independent of
|
||||
// the screen window size. You may override the DoXXXVirtual
|
||||
// methods below for classes where that is is the case.
|
||||
// methods below for classes where that is the case.
|
||||
|
||||
void SetVirtualSize( const wxSize &size ) { DoSetVirtualSize( size.x, size.y ); }
|
||||
void SetVirtualSize( int x, int y ) { DoSetVirtualSize( x, y ); }
|
||||
@ -623,9 +623,10 @@ public:
|
||||
|
||||
bool HasExtraStyle(int exFlag) const { return (m_exStyle & exFlag) != 0; }
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_8
|
||||
// make the window modal (all other windows unresponsive)
|
||||
virtual void MakeModal(bool modal = true);
|
||||
|
||||
wxDEPRECATED( virtual void MakeModal(bool modal = true) );
|
||||
#endif
|
||||
|
||||
// (primitive) theming support
|
||||
// ---------------------------
|
||||
@ -1029,8 +1030,7 @@ public:
|
||||
wxColour GetForegroundColour() const;
|
||||
|
||||
// Set/get the background style.
|
||||
virtual bool SetBackgroundStyle(wxBackgroundStyle style)
|
||||
{ m_backgroundStyle = style; return true; }
|
||||
virtual bool SetBackgroundStyle(wxBackgroundStyle style);
|
||||
wxBackgroundStyle GetBackgroundStyle() const
|
||||
{ return m_backgroundStyle; }
|
||||
|
||||
@ -1039,6 +1039,13 @@ public:
|
||||
// from a parent window
|
||||
virtual bool HasTransparentBackground() { return false; }
|
||||
|
||||
// Returns true if background transparency is supported for this
|
||||
// window, i.e. if calling SetBackgroundStyle(wxBG_STYLE_TRANSPARENT)
|
||||
// has a chance of succeeding. If reason argument is non-NULL, returns a
|
||||
// user-readable explanation of why it isn't supported if the return
|
||||
// value is false.
|
||||
virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const;
|
||||
|
||||
// set/retrieve the font for the window (SetFont() returns true if the
|
||||
// font really changed)
|
||||
virtual bool SetFont(const wxFont& font) = 0;
|
||||
@ -1254,6 +1261,15 @@ public:
|
||||
// get the associated tooltip or NULL if none
|
||||
wxToolTip* GetToolTip() const { return m_tooltip; }
|
||||
wxString GetToolTipText() const;
|
||||
|
||||
// Use the same tool tip as the given one (which can be NULL to indicate
|
||||
// that no tooltip should be used) for this window. This is currently only
|
||||
// used by wxCompositeWindow::DoSetToolTip() implementation and is not part
|
||||
// of the public wx API.
|
||||
//
|
||||
// Returns true if tip was valid and we copied it or false if it was NULL
|
||||
// and we reset our own tooltip too.
|
||||
bool CopyToolTip(wxToolTip *tip);
|
||||
#else // !wxUSE_TOOLTIPS
|
||||
// make it much easier to compile apps in an environment
|
||||
// that doesn't support tooltips, such as PocketPC
|
||||
@ -1422,6 +1438,15 @@ public:
|
||||
virtual wxWindow *GetMainWindowOfCompositeControl()
|
||||
{ return (wxWindow*)this; }
|
||||
|
||||
// If this function returns true, keyboard navigation events shouldn't
|
||||
// escape from it. A typical example of such "navigation domain" is a top
|
||||
// level window because pressing TAB in one of them must not transfer focus
|
||||
// to a different top level window. But it's not limited to them, e.g. MDI
|
||||
// children frames are not top level windows (and their IsTopLevel()
|
||||
// returns false) but still are self-contained navigation domains as well.
|
||||
virtual bool IsTopNavigationDomain() const { return false; }
|
||||
|
||||
|
||||
protected:
|
||||
// helper for the derived class Create() methods: the first overload, with
|
||||
// validator parameter, should be used for child windows while the second
|
||||
@ -1794,14 +1819,7 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// include the declaration of the platform-specific class
|
||||
#if defined(__WXPALMOS__)
|
||||
#ifdef __WXUNIVERSAL__
|
||||
#define wxWindowNative wxWindowPalm
|
||||
#else // !wxUniv
|
||||
#define wxWindowPalm wxWindow
|
||||
#endif // wxUniv/!wxUniv
|
||||
#include "wx/palmos/window.h"
|
||||
#elif defined(__WXMSW__)
|
||||
#if defined(__WXMSW__)
|
||||
#ifdef __WXUNIVERSAL__
|
||||
#define wxWindowNative wxWindowMSW
|
||||
#else // !wxUniv
|
||||
@ -1831,9 +1849,6 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
|
||||
#define wxWindowX11 wxWindow
|
||||
#endif // wxUniv
|
||||
#include "wx/x11/window.h"
|
||||
#elif defined(__WXMGL__)
|
||||
#define wxWindowNative wxWindowMGL
|
||||
#include "wx/mgl/window.h"
|
||||
#elif defined(__WXDFB__)
|
||||
#define wxWindowNative wxWindowDFB
|
||||
#include "wx/dfb/window.h"
|
||||
|
Reference in New Issue
Block a user