piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update to wxWidgets r67291.

Browse Source 
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:
Soren Jorvang
2011-03-23 09:13:01 +00:00
parent c990f12932
commit 35508d7a99
115 changed files with 1263 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Externals/wxWidgets3/include/wx/accel.h vendored
View File

@ -4,7 +4,7 @@
// Author: Julian Smart, Robert Roebling, Vadim Zeitlin
// Modified by:
// Created: 31.05.01 (extracted from other files)
// RCS-ID: $Id: accel.h 65497 2010-09-10 11:44:35Z VZ $
// RCS-ID: $Id: accel.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -116,7 +116,7 @@ public:
// returns a wxString for the this accelerator.
// this function formats it using the <flags>-<keycode> format
// where <flags> maybe a hyphen-separed list of "shift|alt|ctrl"
// where <flags> maybe a hyphen-separated list of "shift|alt|ctrl"
wxString ToString() const;
// returns true if the given string correctly initialized this object

4
Externals/wxWidgets3/include/wx/caret.h vendored
View File

@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 23.05.99
// RCS-ID: $Id: caret.h 58757 2009-02-08 11:45:59Z VZ $
// RCS-ID: $Id: caret.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -147,7 +147,7 @@ public:
virtual void OnKillFocus() { }
protected:
// these functions may be overriden in the derived classes, but they
// these functions may be overridden in the derived classes, but they
// should call the base class version first
virtual bool DoCreate(wxWindowBase *window, int width, int height)
{

6
Externals/wxWidgets3/include/wx/chkconf.h vendored
View File

@ -4,7 +4,7 @@
* Author: Vadim Zeitlin
* Modified by:
* Created: 09.08.00
* RCS-ID: $Id: chkconf.h 67128 2011-03-05 11:16:55Z VZ $
* RCS-ID: $Id: chkconf.h 67280 2011-03-22 14:17:38Z DS $
* Copyright: (c) 2000 Vadim Zeitlin <vadim@wxwidgets.org>
* Licence: wxWindows licence
*/
@ -21,10 +21,10 @@
If you get an error saying "wxUSE_FOO must be defined", it means that you
are not using the correct up-to-date version of setup.h. This happens most
often when using svn or daily snapshots and a new symbol was added to
setup0.h and you haven't updated your local setup.h to to reflect it. If
setup0.h and you haven't updated your local setup.h to reflect it. If
this is the case, you need to propagate the changes from setup0.h to your
setup.h and, if using makefiles under MSW, also remove setup.h under the
build directory (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that it
build directory (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that
the new setup.h is copied there.
If you get an error of the form "wxFoo requires wxBar", then the settings

4
Externals/wxWidgets3/include/wx/cocoa/NSApplication.h vendored
View File

@ -4,7 +4,7 @@
// Author: David Elliott
// Modified by:
// Created: 2004/01/26
// RCS-ID: $Id: NSApplication.h 46227 2007-05-27 04:52:04Z DE $
// RCS-ID: $Id: NSApplication.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 2003,2004 David Elliott
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -19,7 +19,7 @@
// ========================================================================
/*!
@class wxNSApplicationDelegate
@discussion Implements an NSApplication delegate which can respond to messages sent by Cocoa to change Cocoa's behavior.
@discussion Implements an NSApplication delegate which can respond to messages sent by Cocoa to change Cocoa's behaviour.
wxCocoa will set a singleton instance of this class as the NSApplication delegate upon startup unless wxWidgets is running
in a "plugin" manner in which case it would not be appropriate to do this.

6
Externals/wxWidgets3/include/wx/cocoa/objc/objc_uniquifying.h vendored
View File

@ -7,7 +7,7 @@
// Author: David Elliott <dfe@cox.net>
// Modified by:
// Created: 2007/05/15
// RCS-ID: $Id: objc_uniquifying.h 51891 2008-02-18 20:36:16Z DE $
// RCS-ID: $Id: objc_uniquifying.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 2007 Software 2000 Ltd.
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -205,7 +205,7 @@ struct objc_class* wx_GetObjcClass_ ## ObjcClass();
// _s_objc_class_ptr_ObjcClass:
// .long L_OBJC_CLASS_ObjcClass
// Once that static symbol is defined, the function implementation is easy for GCC to generate.
// Do note that return &s_objc_class_data_ObjcClass won't work. The code is wrong in the case.
// Do note that return &s_objc_class_data_ObjcClass won't work. The code is wrong in this case.
#define WX_IMPLEMENT_OBJC_GET_COMPILED_CLASS(ObjcClass) \
extern "C" objc_class s_objc_class_data_ ## ObjcClass asm("L_OBJC_CLASS_" #ObjcClass); \
static objc_class * s_objc_class_ptr_ ## ObjcClass = &s_objc_class_data_ ## ObjcClass; \
@ -278,7 +278,7 @@ inline objc_class * wxObjcCompilerInformation<ObjcClass>::GetCompiledClass() \
}
// TODO: __x86_64__, __ppc64__
#else // Can't wrie inline asm to bust into __OBJC segment
#else // Can't write inline asm to bust into __OBJC segment
// This won't be used since the generic implementation takes precedence.
#warning "Don't know how to implement wxObjcCompilerInformation<ObjcClass>::GetCompiledClass on this platform"

4
Externals/wxWidgets3/include/wx/cocoa/private/scrollview.h vendored
View File

@ -4,7 +4,7 @@
// Author: David Elliott
// Modified by:
// Created: 2008/02/14
// RCS-ID: $Id: scrollview.h 67254 2011-03-20 00:14:35Z DS $
// RCS-ID: $Id: scrollview.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 2003- David Elliott
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -48,7 +48,7 @@ protected:
virtual void Cocoa_synthesizeMouseMoved(void) {}
/*!
Flag as to whether we're scrolling for a native view or a custom
wxWindow. This controls the scrolling behavior. When providing
wxWindow. This controls the scrolling behaviour. When providing
scrolling for a native view we don't catch scroller action messages
and thus don't send scroll events and we don't actually scroll the
window when the application calls ScrollWindow.

4
Externals/wxWidgets3/include/wx/cocoa/radiobox.h vendored
View File

@ -4,7 +4,7 @@
// Author: David Elliott
// Modified by:
// Created: 2003/03/18
// RCS-ID: $Id: radiobox.h 52834 2008-03-26 15:06:00Z FM $
// RCS-ID: $Id: radiobox.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -110,7 +110,7 @@ public:
virtual void SetString(unsigned int n, const wxString& label);
// change the individual radio button state
protected:
// We don't want the typical wxCocoaNSBox behavior because our real
// We don't want the typical wxCocoaNSBox behaviour because our real
// implementation is by using an NSMatrix as the NSBox's contentView.
WX_NSMatrix GetNSMatrix() const;
void AssociateNSBox(WX_NSBox theBox);

6
Externals/wxWidgets3/include/wx/combo.h vendored
View File

@ -4,7 +4,7 @@
// Author: Jaakko Salli
// Modified by:
// Created: Apr-30-2006
// RCS-ID: $Id: combo.h 67256 2011-03-20 11:15:17Z JMS $
// RCS-ID: $Id: combo.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) Jaakko Salli
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -87,7 +87,7 @@ enum
wxCC_IFLAG_CREATED = 0x0100,
// Internal use: really put button outside
wxCC_IFLAG_BUTTON_OUTSIDE = 0x0200,
// Internal use: SetMargins has been succesfully called
// Internal use: SetMargins has been successfully called
wxCC_IFLAG_LEFT_MARGIN_SET = 0x0400,
// Internal use: Set wxTAB_TRAVERSAL to parent when popup is dismissed
wxCC_IFLAG_PARENT_TAB_TRAVERSAL = 0x0800,
@ -674,7 +674,7 @@ protected:
wxRect m_tcArea;
wxRect m_btnArea;
// Colour of the the text area, in case m_text is NULL
// Colour of the text area, in case m_text is NULL
wxColour m_tcBgCol;
// current button state (uses renderer flags)

4
Externals/wxWidgets3/include/wx/datetime.h vendored
View File

@ -5,7 +5,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 10.02.99
// RCS-ID: $Id: datetime.h 65649 2010-09-26 22:11:21Z VZ $
// RCS-ID: $Id: datetime.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -173,7 +173,7 @@ public:
// the time in the current time zone
Local,
// zones from GMT (= Greenwhich Mean Time): they're guaranteed to be
// zones from GMT (= Greenwich Mean Time): they're guaranteed to be
// consequent numbers, so writing something like `GMT0 + offset' is
// safe if abs(offset) <= 12

4
Externals/wxWidgets3/include/wx/debug.h vendored
View File

@ -3,7 +3,7 @@
// Purpose: Misc debug functions and macros
// Author: Vadim Zeitlin
// Created: 29/01/98
// RCS-ID: $Id: debug.h 64531 2010-06-09 13:23:13Z FM $
// RCS-ID: $Id: debug.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 1998-2009 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -312,7 +312,7 @@ extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
wxCHECK_RET( p != NULL, "pointer can't be NULL" )
*/
// the generic macro: takes the condition to check, the statement to be execute
// the generic macro: takes the condition to check, the statement to be executed
// in case the condition is false and the message to pass to the assert handler
#define wxCHECK2_MSG(cond, op, msg) \
if ( cond ) \

6
Externals/wxWidgets3/include/wx/docview.h vendored
View File

@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id: docview.h 66852 2011-02-06 01:01:09Z VZ $
// RCS-ID: $Id: docview.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -184,8 +184,8 @@ protected:
bool m_savedYet;
// Called by OnSaveDocument and OnOpenDocument to implement standard
// Save/Load behavior. Re-implement in derived class for custom
// behavior.
// Save/Load behaviour. Re-implement in derived class for custom
// behaviour.
virtual bool DoSaveDocument(const wxString& file);
virtual bool DoOpenDocument(const wxString& file);

4
Externals/wxWidgets3/include/wx/gauge.h vendored
View File

@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 20.02.01
// RCS-ID: $Id: gauge.h 58757 2009-02-08 11:45:59Z VZ $
// RCS-ID: $Id: gauge.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 1996-2001 wxWidgets team
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -84,7 +84,7 @@ public:
virtual void SetBezelFace(int w);
virtual int GetBezelFace() const;
// overriden base class virtuals
// overridden base class virtuals
virtual bool AcceptsFocus() const { return false; }
protected:

4
Externals/wxWidgets3/include/wx/gtk/gnome/gprint.h vendored
View File

@ -3,7 +3,7 @@
// Author: Robert Roebling
// Purpose: GNOME printing support
// Created: 09/20/04
// RCS-ID: $Id: gprint.h 61724 2009-08-21 10:41:26Z VZ $
// RCS-ID: $Id: gprint.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: Robert Roebling
// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
@ -290,7 +290,7 @@ protected:
void SetPrintData(const wxPrintData& data);
wxPrintData& GetPrintData() { return m_printData; }
// overriden for wxPrinterDC Impl
// overridden for wxPrinterDC Impl
virtual wxRect GetPaperRect() const;
virtual int GetResolution() const;

4
Externals/wxWidgets3/include/wx/gtk/print.h vendored
View File

@ -3,7 +3,7 @@
// Author: Anthony Bretaudeau
// Purpose: GTK printing support
// Created: 2007-08-25
// RCS-ID: $Id: print.h 67232 2011-03-18 15:10:15Z DS $
// RCS-ID: $Id: print.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) Anthony Bretaudeau
// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
@ -249,7 +249,7 @@ public:
void SetPalette(const wxPalette& WXUNUSED(palette)) { }
void SetResolution(int ppi);
// overriden for wxPrinterDC Impl
// overridden for wxPrinterDC Impl
virtual int GetResolution() const;
virtual wxRect GetPaperRect() const;

4
Externals/wxWidgets3/include/wx/mediactrl.h vendored
View File

@ -4,7 +4,7 @@
// Author: Ryan Norton <wxprojects@comcast.net>
// Modified by:
// Created: 11/07/04
// RCS-ID: $Id: mediactrl.h 64533 2010-06-09 14:28:08Z FM $
// RCS-ID: $Id: mediactrl.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) Ryan Norton
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -58,7 +58,7 @@ enum wxMediaState
enum wxMediaCtrlPlayerControls
{
wxMEDIACTRLPLAYERCONTROLS_NONE = 0,
//Step controls like fastfoward, step one frame etc.
//Step controls like fastforward, step one frame etc.
wxMEDIACTRLPLAYERCONTROLS_STEP = 1 << 0,
//Volume controls like the speaker icon, volume slider, etc.
wxMEDIACTRLPLAYERCONTROLS_VOLUME = 1 << 1,

8
Externals/wxWidgets3/include/wx/msw/apptbase.h vendored
View File

@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 22.06.2003
// RCS-ID: $Id: apptbase.h 67185 2011-03-14 11:54:32Z VZ $
// RCS-ID: $Id: apptbase.h 67288 2011-03-22 17:15:56Z VZ $
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -31,6 +31,7 @@ public:
virtual void AfterChildWaitLoop(void *data) = 0;
#if wxUSE_THREADS
// wxThread helpers
// ----------------
@ -41,6 +42,7 @@ public:
// wait for the handle to be signaled, return WAIT_OBJECT_0 if it is or, in
// the GUI code, WAIT_OBJECT_0 + 1 if a Windows message arrived
virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags) = 0;
#endif // wxUSE_THREADS
#ifndef __WXWINCE__
@ -60,9 +62,11 @@ public:
#endif // !__WXWINCE__
protected:
#if wxUSE_THREADS
// implementation of WaitForThread() for the console applications which is
// also used by the GUI code if it doesn't [yet|already} dispatch events
// also used by the GUI code if it doesn't [yet|already] dispatch events
WXDWORD DoSimpleWaitForThread(WXHANDLE hThread);
#endif // wxUSE_THREADS
};
#endif // _WX_MSW_APPTBASE_H_

12
Externals/wxWidgets3/include/wx/msw/apptrait.h vendored
View File

@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 21.06.2003
// RCS-ID: $Id: apptrait.h 67185 2011-03-14 11:54:32Z VZ $
// RCS-ID: $Id: apptrait.h 67288 2011-03-22 17:15:56Z VZ $
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -24,9 +24,11 @@ public:
virtual void AfterChildWaitLoop(void *data);
#if wxUSE_TIMER
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
#endif
#endif // wxUSE_TIMER
#if wxUSE_THREADS
virtual bool DoMessageFromThreadWait();
virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);
#endif // wxUSE_THREADS
#ifndef __WXWINCE__
virtual bool CanUseStderr() { return true; }
virtual bool WriteToStderr(const wxString& text);
@ -43,10 +45,12 @@ public:
virtual void AfterChildWaitLoop(void *data);
#if wxUSE_TIMER
virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
#endif
#endif // wxUSE_TIMER
#if wxUSE_THREADS
virtual bool DoMessageFromThreadWait();
virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
virtual WXDWORD WaitForThread(WXHANDLE hThread, int flags);
#endif // wxUSE_THREADS
virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
#ifndef __WXWINCE__
virtual bool CanUseStderr();

4
Externals/wxWidgets3/include/wx/msw/combo.h vendored
View File

@ -4,7 +4,7 @@
// Author: Jaakko Salli
// Modified by:
// Created: Apr-30-2006
// RCS-ID: $Id: combo.h 66385 2010-12-16 17:21:49Z JMS $
// RCS-ID: $Id: combo.h 67276 2011-03-22 09:56:40Z JMS $
// Copyright: (c) Jaakko Salli
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -94,6 +94,8 @@ protected:
void OnPaintEvent( wxPaintEvent& event );
void OnMouseEvent( wxMouseEvent& event );
virtual bool HasTransparentBackground() { return IsDoubleBuffered(); }
private:
void Init();

4
Externals/wxWidgets3/include/wx/msw/gauge.h vendored
View File

@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id: gauge.h 64648 2010-06-20 17:43:02Z VZ $
// RCS-ID: $Id: gauge.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -47,7 +47,7 @@ public:
virtual void SetRange(int range);
virtual void SetValue(int pos);
// overriden base class virtuals
// overridden base class virtuals
virtual bool SetForegroundColour(const wxColour& col);
virtual bool SetBackgroundColour(const wxColour& col);

4
Externals/wxWidgets3/include/wx/msw/registry.h vendored
View File

@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 03.04.1998
// RCS-ID: $Id: registry.h 66851 2011-02-06 01:01:01Z VZ $
// RCS-ID: $Id: registry.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -92,7 +92,7 @@ public:
// get StdKey from root HKEY
static StdKey GetStdKeyFromHkey(WXHKEY hkey);
// extacts the std key prefix from the string (return value) and
// extracts the std key prefix from the string (return value) and
// leaves only the part after it (i.e. modifies the string passed!)
static StdKey ExtractKeyName(wxString& str);

4
Externals/wxWidgets3/include/wx/msw/statline.h vendored
View File

@ -3,7 +3,7 @@
// Purpose: MSW version of wxStaticLine class
// Author: Vadim Zeitlin
// Created: 28.06.99
// Version: $Id: statline.h 67254 2011-03-20 00:14:35Z DS $
// Version: $Id: statline.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 1998 Vadim Zeitlin
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -38,7 +38,7 @@ public:
long style = wxLI_HORIZONTAL,
const wxString &name = wxStaticLineNameStr );
// overriden base class virtuals
// overridden base class virtuals
virtual bool AcceptsFocus() const { return false; }
// usually overridden base class virtuals

4
Externals/wxWidgets3/include/wx/osx/carbon/statbmp.h vendored
View File

@ -4,7 +4,7 @@
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id: statbmp.h 67254 2011-03-20 00:14:35Z DS $
// RCS-ID: $Id: statbmp.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -51,7 +51,7 @@ class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase
}
void SetIcon(const wxIcon& icon) { SetBitmap( (const wxBitmap &)icon ) ; }
// overriden base class virtuals
// overridden base class virtuals
virtual bool AcceptsFocus() const { return false; }
protected:

4
Externals/wxWidgets3/include/wx/osx/core/cfdataref.h vendored
View File

@ -4,7 +4,7 @@
// Author: Stefan Csomor
// Modified by:
// Created: 2007/05/10
// RCS-ID: $Id: cfdataref.h 67232 2011-03-18 15:10:15Z DS $
// RCS-ID: $Id: cfdataref.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 2007 Stefan Csomor
// Licence: wxWindows licence
// Notes: See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFBinaryData/index.html
@ -40,7 +40,7 @@ public:
@param p The raw pointer to assume ownership of. May be NULL.
@discussion Like shared_ptr, it is assumed that the caller has a strong reference to p and intends
to transfer ownership of that reference to this ref holder. If the object comes from
a Create or Copy method then this is the correct behavior. If the object comes from
a Create or Copy method then this is the correct behaviour. If the object comes from
a Get method then you must CFRetain it yourself before passing it to this constructor.
A handy way to do this is to use the non-member wxCFRefFromGet factory funcion.
This method is templated and takes an otherType *p. This prevents implicit conversion

8
Externals/wxWidgets3/include/wx/osx/core/cfref.h vendored
View File

@ -4,7 +4,7 @@
// Author: David Elliott <dfe@cox.net>
// Modified by: Stefan Csomor
// Created: 2007/05/10
// RCS-ID: $Id: cfref.h 64943 2010-07-13 13:29:58Z VZ $
// RCS-ID: $Id: cfref.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 2007 David Elliott <dfe@cox.net>, Stefan Csomor
// Licence: wxWindows licence
// Notes: See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFMemoryMgmt/index.html
@ -172,7 +172,7 @@ public:
@param p The raw pointer to assume ownership of. May be NULL.
@discussion Like shared_ptr, it is assumed that the caller has a strong reference to p and intends
to transfer ownership of that reference to this ref holder. If the object comes from
a Create or Copy method then this is the correct behavior. If the object comes from
a Create or Copy method then this is the correct behaviour. If the object comes from
a Get method then you must CFRetain it yourself before passing it to this constructor.
A handy way to do this is to use the non-member wxCFRefFromGet factory funcion.
This method is templated and takes an otherType *p. This prevents implicit conversion
@ -364,7 +364,7 @@ inline wxCFWeakRef<refType> static_cfref_cast(const wxCFRef<otherRefType> &other
}
/*! @function CFRelease
@abstract Overloads CFRelease so that the user is warned of bad behavior.
@abstract Overloads CFRelease so that the user is warned of bad behaviour.
@discussion It is rarely appropriate to retain or release a wxCFRef. If one absolutely
must do it he can explicitly get() the raw pointer
Normally, this function is unimplemented resulting in a linker error if used.
@ -373,7 +373,7 @@ template <class T>
inline void CFRelease(const wxCFRef<T*> & cfref) DEPRECATED_ATTRIBUTE;
/*! @function CFRetain
@abstract Overloads CFRetain so that the user is warned of bad behavior.
@abstract Overloads CFRetain so that the user is warned of bad behaviour.
@discussion It is rarely appropriate to retain or release a wxCFRef. If one absolutely
must do it he can explicitly get() the raw pointer
Normally, this function is unimplemented resulting in a linker error if used.

2
Externals/wxWidgets3/include/wx/osx/core/dataview.h vendored
View File

@ -34,7 +34,7 @@ wxString ConcatenateDataViewItemValues(wxDataViewCtrl const* dataViewCtrlPtr, wx
// for the carbon and cocoa environment.
// ATTENTION
// All methods assume that the passed column pointers are
// valid (unless a NULL pointer is explicitely allowed
// valid (unless a NULL pointer is explicitly allowed
// to be passed)!
// ATTENTION
// ---------------------------------------------------------

4
Externals/wxWidgets3/include/wx/osx/window.h vendored
View File

@ -4,7 +4,7 @@
// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
// RCS-ID: $Id: window.h 67243 2011-03-19 08:36:23Z SC $
// RCS-ID: $Id: window.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -164,7 +164,7 @@ public:
wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;
// this should not be overriden in classes above wxWindowMac
// this should not be overridden in classes above wxWindowMac
// because it is called from its destructor via DeleteChildren
virtual void RemoveChild( wxWindowBase *child );

4
Externals/wxWidgets3/include/wx/protocol/ftp.h vendored
View File

@ -5,7 +5,7 @@
// Modified by: Mark Johnson, wxWindows@mj10777.de
// 20000917 : RmDir, GetLastResult, GetList
// Created: 07/07/1997
// RCS-ID: $Id: ftp.h 67254 2011-03-20 00:14:35Z DS $
// RCS-ID: $Id: ftp.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 1997, 1998 Guilhem Lavaux
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -81,7 +81,7 @@ public:
// this function tries its best to deliver the size in bytes using BINARY
// (the SIZE command reports different sizes depending on whether
// type is set to ASCII or BINARY)
// returns -1 if file is non-existant or size could not be found
// returns -1 if file is non-existent or size could not be found
int GetFileSize(const wxString& fileName);
// Check to see if a file exists in the current dir

4
Externals/wxWidgets3/include/wx/statbmp.h vendored
View File

@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 25.08.00
// RCS-ID: $Id: statbmp.h 58757 2009-02-08 11:45:59Z VZ $
// RCS-ID: $Id: statbmp.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 2000 Vadim Zeitlin
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -40,7 +40,7 @@ public:
return wxIcon();
}
// overriden base class virtuals
// overridden base class virtuals
virtual bool AcceptsFocus() const { return false; }
virtual bool HasTransparentBackground() { return true; }

4
Externals/wxWidgets3/include/wx/statbox.h vendored
View File

@ -5,7 +5,7 @@
// Modified by:
// Created:
// Copyright: (c) Julian Smart
// RCS-ID: $Id: statbox.h 67254 2011-03-20 00:14:35Z DS $
// RCS-ID: $Id: statbox.h 67280 2011-03-22 14:17:38Z DS $
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -29,7 +29,7 @@ class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxControl
public:
wxStaticBoxBase() { }
// overriden base class virtuals
// overridden base class virtuals
virtual bool AcceptsFocus() const { return false; }
virtual bool HasTransparentBackground() { return true; }

4
Externals/wxWidgets3/include/wx/statline.h vendored
View File

@ -3,7 +3,7 @@
// Purpose: wxStaticLine class interface
// Author: Vadim Zeitlin
// Created: 28.06.99
// Version: $Id: statline.h 58757 2009-02-08 11:45:59Z VZ $
// Version: $Id: statline.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 1999 Vadim Zeitlin
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -46,7 +46,7 @@ public:
// get the default size for the "lesser" dimension of the static line
static int GetDefaultSize() { return 2; }
// overriden base class virtuals
// overridden base class virtuals
virtual bool AcceptsFocus() const { return false; }
protected:

4
Externals/wxWidgets3/include/wx/stattext.h vendored
View File

@ -5,7 +5,7 @@
// Modified by:
// Created:
// Copyright: (c) Julian Smart
// RCS-ID: $Id: stattext.h 67254 2011-03-20 00:14:35Z DS $
// RCS-ID: $Id: stattext.h 67280 2011-03-22 14:17:38Z DS $
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -39,7 +39,7 @@ public:
// This function will modify the value returned by GetLabel()!
void Wrap(int width);
// overriden base virtuals
// overridden base virtuals
virtual bool AcceptsFocus() const { return false; }
virtual bool HasTransparentBackground() { return true; }

4
Externals/wxWidgets3/include/wx/strvararg.h vendored
View File

@ -3,7 +3,7 @@
// Purpose: macros for implementing type-safe vararg passing of strings
// Author: Vaclav Slavik
// Created: 2007-02-19
// RCS-ID: $Id: strvararg.h 65046 2010-07-22 13:42:49Z VZ $
// RCS-ID: $Id: strvararg.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 2007 REA Elektronik GmbH
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -207,7 +207,7 @@ public:
{ return const_cast<wxFormatString*>(this)->AsChar(); }
private:
// InputAsChar() returns the value passed to ctor, only converted
// to char, while AsChar() takes the the string returned by InputAsChar()
// to char, while AsChar() takes the string returned by InputAsChar()
// and does format string conversion on it as well (and similarly for
// ..AsWChar() below)
const char* InputAsChar();

6
Externals/wxWidgets3/include/wx/txtstrm.h vendored
View File

@ -4,7 +4,7 @@
// Author: Guilhem Lavaux
// Modified by:
// Created: 28/06/1998
// RCS-ID: $Id: txtstrm.h 58757 2009-02-08 11:45:59Z VZ $
// RCS-ID: $Id: txtstrm.h 67286 2011-03-22 17:15:45Z VZ $
// Copyright: (c) Guilhem Lavaux
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -45,6 +45,8 @@ public:
#endif
~wxTextInputStream();
const wxInputStream& GetInputStream() const { return m_input; }
wxUint32 Read32(int base = 10); // base may be between 2 and 36, inclusive, or the special 0 (= C format)
wxUint16 Read16(int base = 10);
wxUint8 Read8(int base = 10);
@ -116,6 +118,8 @@ public:
#endif
virtual ~wxTextOutputStream();
const wxOutputStream& GetOutputStream() const { return m_output; }
void SetMode( wxEOL mode = wxEOL_NATIVE );
wxEOL GetMode() { return m_mode; }

4
Externals/wxWidgets3/include/wx/weakref.h vendored
View File

@ -3,7 +3,7 @@
// Purpose: wxWeakRef - Generic weak references for wxWidgets
// Author: Arne Steinarson
// Created: 27 Dec 07
// RCS-ID: $Id: weakref.h 66780 2011-01-27 11:00:26Z SC $
// RCS-ID: $Id: weakref.h 67280 2011-03-22 14:17:38Z DS $
// Copyright: (c) 2007 Arne Steinarson
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -17,7 +17,7 @@
// Some compilers (VC6, Borland, g++ < 3.3) have problem with template specialization.
// However, this is only used for optimization purposes (a smaller wxWeakRef pointer)
// (and the corner case of wxWeakRef<wxObject>). So for those compilers, we can fall
// back to the non-optimal case, where we use a the same type of weak ref (static one)
// back to the non-optimal case, where we use the same type of weak ref (static one)
// in all cases. See defs.h for various setting these defines depending on compiler.
#if !defined(HAVE_PARTIAL_SPECIALIZATION) || \

8
Externals/wxWidgets3/include/wx/window.h vendored
View File

@ -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,