mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-03-10 19:47:40 +01: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:
parent
c990f12932
commit
35508d7a99
3
Externals/wxWidgets3/SConscript
vendored
3
Externals/wxWidgets3/SConscript
vendored
@ -13,7 +13,7 @@ wxenv = env.Clone()
|
||||
wxenv['CCFLAGS'] += ['-Wno-deprecated-declarations', '-Wno-shadow']
|
||||
wxenv['CPPDEFINES'] += ['WXBUILDING']
|
||||
|
||||
# gtk, msw, osx and shared files as of r67258
|
||||
# gtk, msw, osx and shared files as of r67291
|
||||
|
||||
aui = [
|
||||
'src/aui/auibar.cpp',
|
||||
@ -843,6 +843,7 @@ osx = [
|
||||
'src/osx/cocoa/gauge.mm',
|
||||
'src/osx/cocoa/glcanvas.mm',
|
||||
'src/osx/cocoa/listbox.mm',
|
||||
#'src/osx/cocoa/mediactrl.mm',
|
||||
'src/osx/cocoa/menu.mm',
|
||||
'src/osx/cocoa/menuitem.mm',
|
||||
'src/osx/cocoa/msgdlg.mm',
|
||||
|
4
Externals/wxWidgets3/include/wx/accel.h
vendored
4
Externals/wxWidgets3/include/wx/accel.h
vendored
@ -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
4
Externals/wxWidgets3/include/wx/caret.h
vendored
@ -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
6
Externals/wxWidgets3/include/wx/chkconf.h
vendored
@ -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,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.
|
||||
|
@ -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,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,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
6
Externals/wxWidgets3/include/wx/combo.h
vendored
@ -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
4
Externals/wxWidgets3/include/wx/datetime.h
vendored
@ -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
4
Externals/wxWidgets3/include/wx/debug.h
vendored
@ -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
6
Externals/wxWidgets3/include/wx/docview.h
vendored
@ -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
4
Externals/wxWidgets3/include/wx/gauge.h
vendored
@ -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:
|
||||
|
@ -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
4
Externals/wxWidgets3/include/wx/gtk/print.h
vendored
@ -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
4
Externals/wxWidgets3/include/wx/mediactrl.h
vendored
@ -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,
|
||||
|
@ -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
12
Externals/wxWidgets3/include/wx/msw/apptrait.h
vendored
@ -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
4
Externals/wxWidgets3/include/wx/msw/combo.h
vendored
@ -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
4
Externals/wxWidgets3/include/wx/msw/gauge.h
vendored
@ -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,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);
|
||||
|
||||
|
@ -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,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,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
|
||||
|
@ -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.
|
||||
|
@ -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
4
Externals/wxWidgets3/include/wx/osx/window.h
vendored
@ -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 );
|
||||
|
||||
|
@ -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
4
Externals/wxWidgets3/include/wx/statbmp.h
vendored
@ -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
4
Externals/wxWidgets3/include/wx/statbox.h
vendored
@ -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
4
Externals/wxWidgets3/include/wx/statline.h
vendored
@ -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
4
Externals/wxWidgets3/include/wx/stattext.h
vendored
@ -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
4
Externals/wxWidgets3/include/wx/strvararg.h
vendored
@ -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
6
Externals/wxWidgets3/include/wx/txtstrm.h
vendored
@ -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
4
Externals/wxWidgets3/include/wx/weakref.h
vendored
@ -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
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,
|
||||
|
2
Externals/wxWidgets3/src/aui/auibook.cpp
vendored
2
Externals/wxWidgets3/src/aui/auibook.cpp
vendored
@ -2931,7 +2931,7 @@ void wxAuiNotebook::SetArtProvider(wxAuiTabArt* art)
|
||||
// specified tab ctrl height, overriding all other considerations,
|
||||
// such as text or bitmap height. It overrides any call to
|
||||
// SetUniformBitmapSize(). Specifying a height of -1 reverts
|
||||
// any previous call and returns to the default behavior
|
||||
// any previous call and returns to the default behaviour
|
||||
|
||||
void wxAuiNotebook::SetTabCtrlHeight(int height)
|
||||
{
|
||||
|
10
Externals/wxWidgets3/src/aui/framemanager.cpp
vendored
10
Externals/wxWidgets3/src/aui/framemanager.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Benjamin I. Williams
|
||||
// Modified by:
|
||||
// Created: 2005-05-17
|
||||
// RCS-ID: $Id: framemanager.cpp 66796 2011-01-28 02:21:42Z BP $
|
||||
// RCS-ID: $Id: framemanager.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved
|
||||
// Licence: wxWindows Library Licence, Version 3.1
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -801,7 +801,7 @@ wxAuiManager* wxAuiManager::GetManager(wxWindow* window)
|
||||
|
||||
void wxAuiManager::UpdateHintWindowConfig()
|
||||
{
|
||||
// find out if the the system can do transparent frames
|
||||
// find out if the system can do transparent frames
|
||||
bool can_do_transparent = false;
|
||||
|
||||
wxWindow* w = m_frame;
|
||||
@ -3401,7 +3401,7 @@ void wxAuiManager::OnHintActivate(wxActivateEvent& WXUNUSED(event))
|
||||
// Do nothing so this event isn't handled in the base handlers.
|
||||
|
||||
// Letting the hint window activate without this handler can lead to
|
||||
// weird behavior on Mac where the menu is switched out to the top
|
||||
// weird behaviour on Mac where the menu is switched out to the top
|
||||
// window's menu in MDI applications when it shouldn't be. So since
|
||||
// we don't want user interaction with the hint window anyway, we just
|
||||
// prevent it from activating here.
|
||||
@ -3434,7 +3434,7 @@ void wxAuiManager::StartPaneDrag(wxWindow* pane_window,
|
||||
// CalculateHintRect() calculates the drop hint rectangle. The method
|
||||
// first calls DoDrop() to determine the exact position the pane would
|
||||
// be at were if dropped. If the pane would indeed become docked at the
|
||||
// specified drop point, the the rectangle hint will be returned in
|
||||
// specified drop point, the rectangle hint will be returned in
|
||||
// screen coordinates. Otherwise, an empty rectangle is returned.
|
||||
// |pane_window| is the window pointer of the pane being dragged, |pt| is
|
||||
// the mouse position, in client coordinates. |offset| describes the offset
|
||||
@ -3851,7 +3851,7 @@ void wxAuiManager::OnRender(wxAuiManagerEvent& evt)
|
||||
// Render() fire a render event, which is normally handled by
|
||||
// wxAuiManager::OnRender(). This allows the render function to
|
||||
// be overridden via the render event. This can be useful for paintin
|
||||
// custom graphics in the main window. Default behavior can be
|
||||
// custom graphics in the main window. Default behaviour can be
|
||||
// invoked in the overridden function by calling OnRender()
|
||||
|
||||
void wxAuiManager::Render(wxDC* dc)
|
||||
|
4
Externals/wxWidgets3/src/common/any.cpp
vendored
4
Externals/wxWidgets3/src/common/any.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Jaakko Salli
|
||||
// Modified by:
|
||||
// Created: 07/05/2009
|
||||
// RCS-ID: $Id: any.cpp 66630 2011-01-07 17:49:18Z SC $
|
||||
// RCS-ID: $Id: any.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) wxWidgets team
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -152,7 +152,7 @@ bool wxConvertAnyToVariant(const wxAny& any, wxVariant* variant)
|
||||
if ( any.GetAs(&ll) )
|
||||
{
|
||||
// NB: Do not use LONG_MAX here. Explicitly using 32-bit
|
||||
// integer constraint yields more consistent behavior across
|
||||
// integer constraint yields more consistent behaviour across
|
||||
// builds.
|
||||
if ( ll > wxINT32_MAX || ll < wxINT32_MIN )
|
||||
*variant = wxLongLong(ll);
|
||||
|
60
Externals/wxWidgets3/src/common/combocmn.cpp
vendored
60
Externals/wxWidgets3/src/common/combocmn.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Jaakko Salli
|
||||
// Modified by:
|
||||
// Created: Apr-30-2006
|
||||
// RCS-ID: $Id: combocmn.cpp 67256 2011-03-20 11:15:17Z JMS $
|
||||
// RCS-ID: $Id: combocmn.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 2005 Jaakko Salli
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -160,7 +160,7 @@ wxCONSTRUCTOR_5( wxComboBox, wxWindow*, Parent, wxWindowID, Id, \
|
||||
#endif
|
||||
|
||||
// NB: Let's not be afraid to use wxGTK's wxPopupTransientWindow as a
|
||||
// 'perfect' popup, as it can succesfully host child controls even in
|
||||
// 'perfect' popup, as it can successfully host child controls even in
|
||||
// popups that are shown in modal dialogs.
|
||||
|
||||
#define USE_TRANSIENT_POPUP 1 // Use wxPopupWindowTransient (preferred, if it works properly on platform)
|
||||
@ -1647,28 +1647,29 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int flags )
|
||||
if ( !enabled )
|
||||
drawState |= wxCONTROL_DISABLED;
|
||||
|
||||
// Need to clear button background even if m_btn is present
|
||||
// and also when using custom bitmap for the button
|
||||
if ( (flags & Button_PaintBackground) &&
|
||||
(!HasTransparentBackground() ||
|
||||
!(m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE)) )
|
||||
{
|
||||
wxColour bgCol;
|
||||
|
||||
if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE )
|
||||
bgCol = GetParent()->GetBackgroundColour();
|
||||
else
|
||||
bgCol = GetBackgroundColour();
|
||||
|
||||
dc.SetBrush(bgCol);
|
||||
dc.SetPen(bgCol);
|
||||
dc.DrawRectangle(rect);
|
||||
}
|
||||
|
||||
if ( !m_bmpNormal.Ok() )
|
||||
{
|
||||
if ( flags & Button_BitmapOnly )
|
||||
return;
|
||||
|
||||
// Need to clear button background even if m_btn is present
|
||||
if ( (flags & Button_PaintBackground) &&
|
||||
(!HasTransparentBackground() ||
|
||||
!(m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE)) )
|
||||
{
|
||||
wxColour bgCol;
|
||||
|
||||
if ( m_iFlags & wxCC_IFLAG_BUTTON_OUTSIDE )
|
||||
bgCol = GetParent()->GetBackgroundColour();
|
||||
else
|
||||
bgCol = GetBackgroundColour();
|
||||
|
||||
dc.SetBrush(bgCol);
|
||||
dc.SetPen(bgCol);
|
||||
dc.DrawRectangle(rect);
|
||||
}
|
||||
|
||||
// Draw standard button
|
||||
wxRendererNative::Get().DrawComboBoxDropButton(this,
|
||||
dc,
|
||||
@ -1692,17 +1693,6 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int flags )
|
||||
|
||||
if ( m_blankButtonBg )
|
||||
{
|
||||
// If using blank button background, we need to clear its background
|
||||
// with button face colour instead of colour for rest of the control.
|
||||
if ( flags & Button_PaintBackground )
|
||||
{
|
||||
wxColour bgCol = GetParent()->GetBackgroundColour(); //wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
|
||||
//wxColour bgCol = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
|
||||
dc.SetPen(bgCol);
|
||||
dc.SetBrush(bgCol);
|
||||
dc.DrawRectangle(rect);
|
||||
}
|
||||
|
||||
if ( !(flags & Button_BitmapOnly) )
|
||||
{
|
||||
wxRendererNative::Get().DrawPushButton(this,
|
||||
@ -1711,14 +1701,6 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int flags )
|
||||
drawState);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
{
|
||||
// Need to clear button background even if m_btn is present
|
||||
// (assume non-button background was cleared just before this call so brushes are good)
|
||||
if ( flags & Button_PaintBackground )
|
||||
dc.DrawRectangle(rect);
|
||||
}
|
||||
|
||||
// Draw bitmap centered in drawRect
|
||||
dc.DrawBitmap(*pBmp,
|
||||
@ -2663,7 +2645,7 @@ void wxComboCtrlBase::OnSetValue(const wxString& value)
|
||||
bool found = true;
|
||||
wxString trueValue = value;
|
||||
|
||||
// Conform to wxComboBox behavior: read-only control can only accept
|
||||
// Conform to wxComboBox behaviour: read-only control can only accept
|
||||
// valid list items and empty string
|
||||
if ( m_popupInterface && HasFlag(wxCB_READONLY) && value.length() )
|
||||
{
|
||||
|
4
Externals/wxWidgets3/src/common/dcgraph.cpp
vendored
4
Externals/wxWidgets3/src/common/dcgraph.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Stefan Csomor
|
||||
// Modified by:
|
||||
// Created:
|
||||
// RCS-ID: $Id: dcgraph.cpp 67254 2011-03-20 00:14:35Z DS $
|
||||
// RCS-ID: $Id: dcgraph.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Stefan Csomor
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -341,7 +341,7 @@ void wxGCDCImpl::DestroyClippingRegion()
|
||||
{
|
||||
m_graphicContext->ResetClip();
|
||||
// currently the clip eg of a window extends to the area between the scrollbars
|
||||
// so we must explicitely make sure it only covers the area we want it to draw
|
||||
// so we must explicitly make sure it only covers the area we want it to draw
|
||||
int width, height ;
|
||||
GetOwner()->GetSize( &width , &height ) ;
|
||||
m_graphicContext->Clip( DeviceToLogicalX(0) , DeviceToLogicalY(0) , DeviceToLogicalXRel(width), DeviceToLogicalYRel(height) );
|
||||
|
5
Externals/wxWidgets3/src/common/descrip.mms
vendored
5
Externals/wxWidgets3/src/common/descrip.mms
vendored
@ -2,7 +2,7 @@
|
||||
# *
|
||||
# Make file for VMS *
|
||||
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
|
||||
# Date : 28 January 2011 *
|
||||
# Date : 21 March 2011 *
|
||||
# *
|
||||
#*****************************************************************************
|
||||
.first
|
||||
@ -222,7 +222,7 @@ OBJECTS2=tbarbase.obj,srchcmn.obj,\
|
||||
statlinecmn.obj,radiobtncmn.obj,bmpbtncmn.obj,checklstcmn.obj,\
|
||||
statbmpcmn.obj,dirctrlcmn.obj,gridcmn.obj,odcombocmn.obj,\
|
||||
spinbtncmn.obj,scrolbarcmn.obj,colourdata.obj,fontdata.obj,\
|
||||
valnum.obj,numformatter.obj
|
||||
valnum.obj,numformatter.obj,markupparser.obj
|
||||
|
||||
OBJECTS_MOTIF=radiocmn.obj,combocmn.obj
|
||||
|
||||
@ -699,3 +699,4 @@ colourdata.obj : colourdata.cpp
|
||||
fontdata.obj : fontdata.cpp
|
||||
valnum.obj : valnum.cpp
|
||||
numformatter.obj : numformatter.cpp
|
||||
markupparser.obj : markupparser.cpp
|
||||
|
4
Externals/wxWidgets3/src/common/docview.cpp
vendored
4
Externals/wxWidgets3/src/common/docview.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by: Vadim Zeitlin
|
||||
// Created: 01/02/97
|
||||
// RCS-ID: $Id: docview.cpp 66852 2011-02-06 01:01:09Z VZ $
|
||||
// RCS-ID: $Id: docview.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -425,7 +425,7 @@ bool wxDocument::Revert()
|
||||
#if WXWIN_COMPATIBILITY_2_8
|
||||
bool wxDocument::GetPrintableName(wxString& buf) const
|
||||
{
|
||||
// this function can not only be overridden by the user code but also
|
||||
// this function cannot only be overridden by the user code but also
|
||||
// called by it so we need to ensure that we return the same thing as
|
||||
// GetUserReadableName() but we can't call it because this would result in
|
||||
// an infinite recursion, hence we use the helper DoGetUserReadableName()
|
||||
|
4
Externals/wxWidgets3/src/common/event.cpp
vendored
4
Externals/wxWidgets3/src/common/event.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 01/02/97
|
||||
// RCS-ID: $Id: event.cpp 65521 2010-09-11 10:18:41Z VZ $
|
||||
// RCS-ID: $Id: event.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -959,7 +959,7 @@ void wxEventHashTable::InitHashTable()
|
||||
table = table->baseTable;
|
||||
}
|
||||
|
||||
// Lets free some memory.
|
||||
// Let's free some memory.
|
||||
size_t i;
|
||||
for(i = 0; i < m_size; i++)
|
||||
{
|
||||
|
4
Externals/wxWidgets3/src/common/fileconf.cpp
vendored
4
Externals/wxWidgets3/src/common/fileconf.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 07.04.98 (adapted from appconf.cpp)
|
||||
// RCS-ID: $Id: fileconf.cpp 65209 2010-08-08 11:35:49Z VZ $
|
||||
// RCS-ID: $Id: fileconf.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1997 Karsten Ballueder & Vadim Zeitlin
|
||||
// Ballueder@usa.net <zeitlin@dptmaths.ens-cachan.fr>
|
||||
// Licence: wxWindows licence
|
||||
@ -146,7 +146,7 @@ private:
|
||||
|
||||
wxString m_strName, // entry name
|
||||
m_strValue; // value
|
||||
bool m_bImmutable:1, // can be overriden locally?
|
||||
bool m_bImmutable:1, // can be overridden locally?
|
||||
m_bHasValue:1; // set after first call to SetValue()
|
||||
|
||||
int m_nLine; // used if m_pLine == NULL only
|
||||
|
4
Externals/wxWidgets3/src/common/filefn.cpp
vendored
4
Externals/wxWidgets3/src/common/filefn.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 29/01/98
|
||||
// RCS-ID: $Id: filefn.cpp 66996 2011-02-22 13:26:06Z VZ $
|
||||
// RCS-ID: $Id: filefn.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1998 Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -1345,7 +1345,7 @@ wxString wxFindFirstFile(const wxString& spec, int flags)
|
||||
|
||||
if ( !gs_dir->IsOpened() )
|
||||
{
|
||||
wxLogSysError(_("Can not enumerate files '%s'"), spec);
|
||||
wxLogSysError(_("Cannot enumerate files '%s'"), spec);
|
||||
return wxEmptyString;
|
||||
}
|
||||
|
||||
|
6
Externals/wxWidgets3/src/common/fontcmn.cpp
vendored
6
Externals/wxWidgets3/src/common/fontcmn.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 20.09.99
|
||||
// RCS-ID: $Id: fontcmn.cpp 67052 2011-02-27 12:47:05Z VZ $
|
||||
// RCS-ID: $Id: fontcmn.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) wxWidgets team
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -1020,7 +1020,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
|
||||
SetFamily(family);
|
||||
}
|
||||
// NB: the check on the facename is implemented in wxFontBase::SetFaceName
|
||||
// and not in wxNativeFontInfo::SetFaceName thus we need to explicitely
|
||||
// and not in wxNativeFontInfo::SetFaceName thus we need to explicitly
|
||||
// call here wxFontEnumerator::IsValidFacename
|
||||
else if (
|
||||
#if wxUSE_FONTENUM
|
||||
@ -1039,7 +1039,7 @@ bool wxNativeFontInfo::FromUserString(const wxString& s)
|
||||
if ( !face.empty() )
|
||||
{
|
||||
// NB: the check on the facename is implemented in wxFontBase::SetFaceName
|
||||
// and not in wxNativeFontInfo::SetFaceName thus we need to explicitely
|
||||
// and not in wxNativeFontInfo::SetFaceName thus we need to explicitly
|
||||
// call here wxFontEnumerator::IsValidFacename
|
||||
if (
|
||||
#if wxUSE_FONTENUM
|
||||
|
4
Externals/wxWidgets3/src/common/ftp.cpp
vendored
4
Externals/wxWidgets3/src/common/ftp.cpp
vendored
@ -9,7 +9,7 @@
|
||||
// robust Abort(), support for arbitrary FTP commands, ...)
|
||||
// Randall Fox (support for active mode)
|
||||
// Created: 07/07/1997
|
||||
// RCS-ID: $Id: ftp.cpp 67254 2011-03-20 00:14:35Z DS $
|
||||
// RCS-ID: $Id: ftp.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1997, 1998 Guilhem Lavaux
|
||||
// (c) 1998-2004 wxWidgets team
|
||||
// Licence: wxWindows licence
|
||||
@ -686,7 +686,7 @@ public:
|
||||
|
||||
// when checking the result, the stream will
|
||||
// almost always show an error, even if the file was
|
||||
// properly transfered, thus, lets just grab the result
|
||||
// properly transfered, thus, let's just grab the result
|
||||
|
||||
// we are looking for "226 transfer completed"
|
||||
char code = m_ftp->GetResult();
|
||||
|
4
Externals/wxWidgets3/src/common/imagpng.cpp
vendored
4
Externals/wxWidgets3/src/common/imagpng.cpp
vendored
@ -2,7 +2,7 @@
|
||||
// Name: src/common/imagpng.cpp
|
||||
// Purpose: wxImage PNG handler
|
||||
// Author: Robert Roebling
|
||||
// RCS-ID: $Id: imagpng.cpp 67219 2011-03-16 12:46:03Z DS $
|
||||
// RCS-ID: $Id: imagpng.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -43,7 +43,7 @@
|
||||
// constants
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// image can not have any transparent pixels at all, have only 100% opaque
|
||||
// image cannot have any transparent pixels at all, have only 100% opaque
|
||||
// and/or 100% transparent pixels in which case a simple mask is enough to
|
||||
// store this information in wxImage or have a real alpha channel in which case
|
||||
// we need to have it in wxImage as well
|
||||
|
76
Externals/wxWidgets3/src/common/imagtiff.cpp
vendored
76
Externals/wxWidgets3/src/common/imagtiff.cpp
vendored
@ -2,7 +2,7 @@
|
||||
// Name: src/common/imagtiff.cpp
|
||||
// Purpose: wxImage TIFF handler
|
||||
// Author: Robert Roebling
|
||||
// RCS-ID: $Id: imagtiff.cpp 66717 2011-01-19 13:47:18Z DS $
|
||||
// RCS-ID: $Id: imagtiff.cpp 67264 2011-03-20 19:48:03Z DS $
|
||||
// Copyright: (c) Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -402,42 +402,78 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
|
||||
alpha -= 2*w;
|
||||
}
|
||||
|
||||
// set the image resolution if it's available
|
||||
uint16 tiffRes;
|
||||
if ( TIFFGetField(tif, TIFFTAG_RESOLUTIONUNIT, &tiffRes) )
|
||||
|
||||
uint16 spp, bpp, compression;
|
||||
/*
|
||||
Read some baseline TIFF tags which helps when re-saving a TIFF
|
||||
to be similar to the original image.
|
||||
*/
|
||||
if ( TIFFGetFieldDefaulted(tif, TIFFTAG_SAMPLESPERPIXEL, &spp) )
|
||||
{
|
||||
wxImageResolution res;
|
||||
switch ( tiffRes )
|
||||
image->SetOption(wxIMAGE_OPTION_SAMPLESPERPIXEL, spp);
|
||||
}
|
||||
|
||||
if ( TIFFGetFieldDefaulted(tif, TIFFTAG_BITSPERSAMPLE, &bpp) )
|
||||
{
|
||||
image->SetOption(wxIMAGE_OPTION_BITSPERSAMPLE, bpp);
|
||||
}
|
||||
|
||||
if ( TIFFGetFieldDefaulted(tif, TIFFTAG_COMPRESSION, &compression) )
|
||||
{
|
||||
image->SetOption(wxIMAGE_OPTION_COMPRESSION, compression);
|
||||
}
|
||||
|
||||
// Set the resolution unit.
|
||||
wxImageResolution resUnit = wxIMAGE_RESOLUTION_NONE;
|
||||
uint16 tiffRes;
|
||||
if ( TIFFGetFieldDefaulted(tif, TIFFTAG_RESOLUTIONUNIT, &tiffRes) )
|
||||
{
|
||||
switch (tiffRes)
|
||||
{
|
||||
default:
|
||||
wxLogWarning(_("Unknown TIFF resolution unit %d ignored"),
|
||||
tiffRes);
|
||||
tiffRes);
|
||||
// fall through
|
||||
|
||||
case RESUNIT_NONE:
|
||||
res = wxIMAGE_RESOLUTION_NONE;
|
||||
resUnit = wxIMAGE_RESOLUTION_NONE;
|
||||
break;
|
||||
|
||||
case RESUNIT_INCH:
|
||||
res = wxIMAGE_RESOLUTION_INCHES;
|
||||
resUnit = wxIMAGE_RESOLUTION_INCHES;
|
||||
break;
|
||||
|
||||
case RESUNIT_CENTIMETER:
|
||||
res = wxIMAGE_RESOLUTION_CM;
|
||||
resUnit = wxIMAGE_RESOLUTION_CM;
|
||||
break;
|
||||
}
|
||||
|
||||
if ( res != wxIMAGE_RESOLUTION_NONE )
|
||||
{
|
||||
float xres, yres;
|
||||
if ( TIFFGetField(tif, TIFFTAG_XRESOLUTION, &xres) )
|
||||
image->SetOption(wxIMAGE_OPTION_RESOLUTIONX, wxRound(xres));
|
||||
|
||||
if ( TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres) )
|
||||
image->SetOption(wxIMAGE_OPTION_RESOLUTIONY, wxRound(yres));
|
||||
}
|
||||
}
|
||||
|
||||
image->SetOption(wxIMAGE_OPTION_RESOLUTIONUNIT, resUnit);
|
||||
|
||||
/*
|
||||
Set the image resolution if it's available. Resolution tag is not
|
||||
dependant on RESOLUTIONUNIT != RESUNIT_NONE (according to TIFF spec).
|
||||
*/
|
||||
float resX, resY;
|
||||
|
||||
if ( TIFFGetField(tif, TIFFTAG_XRESOLUTION, &resX) )
|
||||
{
|
||||
/*
|
||||
Use a string value to not lose precision.
|
||||
rounding to int as cm and then converting to inch may
|
||||
result in whole integer rounding error, eg. 201 instead of 200 dpi.
|
||||
If an app wants an int, GetOptionInt will convert and round down.
|
||||
*/
|
||||
image->SetOption(wxIMAGE_OPTION_RESOLUTIONX,
|
||||
wxString::FromCDouble((double) resX));
|
||||
}
|
||||
|
||||
if ( TIFFGetField(tif, TIFFTAG_YRESOLUTION, &resY) )
|
||||
{
|
||||
image->SetOption(wxIMAGE_OPTION_RESOLUTIONY,
|
||||
wxString::FromCDouble((double) resY));
|
||||
}
|
||||
|
||||
_TIFFfree( raster );
|
||||
|
||||
|
4
Externals/wxWidgets3/src/common/intl.cpp
vendored
4
Externals/wxWidgets3/src/common/intl.cpp
vendored
@ -5,7 +5,7 @@
|
||||
// Modified by: Michael N. Filippov <michael@idisys.iae.nsk.su>
|
||||
// (2003/09/30 - PluralForms support)
|
||||
// Created: 29/01/98
|
||||
// RCS-ID: $Id: intl.cpp 66002 2010-11-03 16:29:13Z VZ $
|
||||
// RCS-ID: $Id: intl.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -293,7 +293,7 @@ bool wxLocale::DoInit(const wxString& name,
|
||||
|
||||
if ( m_pszOldLocale == NULL )
|
||||
{
|
||||
wxLogError(_("locale '%s' can not be set."), szLocale);
|
||||
wxLogError(_("locale '%s' cannot be set."), szLocale);
|
||||
}
|
||||
|
||||
// the short name will be used to look for catalog files as well,
|
||||
|
14
Externals/wxWidgets3/src/common/log.cpp
vendored
14
Externals/wxWidgets3/src/common/log.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 29/01/98
|
||||
// RCS-ID: $Id: log.cpp 65956 2010-10-30 23:50:28Z VZ $
|
||||
// RCS-ID: $Id: log.cpp 67268 2011-03-21 10:59:59Z VZ $
|
||||
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -676,16 +676,8 @@ void wxLog::TimeStamp(wxString *str)
|
||||
#if wxUSE_DATETIME
|
||||
if ( !ms_timestamp.empty() )
|
||||
{
|
||||
wxChar buf[256];
|
||||
time_t timeNow;
|
||||
(void)time(&timeNow);
|
||||
|
||||
struct tm tm;
|
||||
wxStrftime(buf, WXSIZEOF(buf),
|
||||
ms_timestamp, wxLocaltime_r(&timeNow, &tm));
|
||||
|
||||
str->Empty();
|
||||
*str << buf << wxS(": ");
|
||||
*str = wxDateTime::UNow().Format(ms_timestamp);
|
||||
*str += wxS(": ");
|
||||
}
|
||||
#endif // wxUSE_DATETIME
|
||||
}
|
||||
|
4
Externals/wxWidgets3/src/common/sizer.cpp
vendored
4
Externals/wxWidgets3/src/common/sizer.cpp
vendored
@ -5,7 +5,7 @@
|
||||
// Dirk Holtwick, Ron Lee
|
||||
// Modified by: Ron Lee
|
||||
// Created:
|
||||
// RCS-ID: $Id: sizer.cpp 67029 2011-02-26 15:44:14Z SC $
|
||||
// RCS-ID: $Id: sizer.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Robin Dunn, Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -2093,7 +2093,7 @@ void wxBoxSizer::RecalcSizes()
|
||||
|
||||
// Check for the degenerated case when we don't have enough space for even
|
||||
// the min sizes of all the items: in this case we really can't do much
|
||||
// more than to to allocate the min size to as many of fixed size items as
|
||||
// more than to allocate the min size to as many of fixed size items as
|
||||
// possible (on the assumption that variable size items such as text zones
|
||||
// or list boxes may use scrollbars to show their content even if their
|
||||
// size is less than min size but that fixed size items such as buttons
|
||||
|
16
Externals/wxWidgets3/src/common/string.cpp
vendored
16
Externals/wxWidgets3/src/common/string.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin, Ryan Norton
|
||||
// Modified by:
|
||||
// Created: 29/01/98
|
||||
// RCS-ID: $Id: string.cpp 67181 2011-03-13 13:53:54Z VZ $
|
||||
// RCS-ID: $Id: string.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
||||
// (c) 2004 Ryan Norton <wxprojects@comcast.net>
|
||||
// Licence: wxWindows licence
|
||||
@ -2008,16 +2008,16 @@ int wxString::DoPrintfUtf8(const char *format, ...)
|
||||
Since EILSEQ and EINVAL are rather common but EOVERFLOW is not and since
|
||||
EILSEQ and EINVAL are specifically defined to mean the error is other than
|
||||
an undersized buffer and no other errno are defined we treat those two
|
||||
as meaning hard errors and everything else gets the old behavior which
|
||||
as meaning hard errors and everything else gets the old behaviour which
|
||||
is to keep looping and increasing buffer size until the function succeeds.
|
||||
|
||||
In practice it's impossible to determine before compilation which behavior
|
||||
may be used. The vswprintf function may have vsnprintf-like behavior or
|
||||
vice-versa. Behavior detected on one release can theoretically change
|
||||
In practice it's impossible to determine before compilation which behaviour
|
||||
may be used. The vswprintf function may have vsnprintf-like behaviour or
|
||||
vice-versa. Behaviour detected on one release can theoretically change
|
||||
with an updated release. Not to mention that configure testing for it
|
||||
would require the test to be run on the host system, not the build system
|
||||
which makes cross compilation difficult. Therefore, we make no assumptions
|
||||
about behavior and try our best to handle every known case, including the
|
||||
about behaviour and try our best to handle every known case, including the
|
||||
case where wxVsnprintf returns a negative number and fails to set errno.
|
||||
|
||||
There is yet one more non-standard implementation and that is our own.
|
||||
@ -2028,9 +2028,9 @@ int wxString::DoPrintfUtf8(const char *format, ...)
|
||||
at the given buffer size minus 1. It is supposed to do this even if it
|
||||
turns out that the buffer is sized too small.
|
||||
|
||||
Darwin (tested on 10.5) follows the C99 behavior exactly.
|
||||
Darwin (tested on 10.5) follows the C99 behaviour exactly.
|
||||
|
||||
Glibc 2.6 almost follows the C99 behavior except vswprintf never sets
|
||||
Glibc 2.6 almost follows the C99 behaviour except vswprintf never sets
|
||||
errno even when it fails. However, it only seems to ever fail due
|
||||
to an undersized buffer.
|
||||
*/
|
||||
|
4
Externals/wxWidgets3/src/common/sysopt.cpp
vendored
4
Externals/wxWidgets3/src/common/sysopt.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 2001-07-10
|
||||
// RCS-ID: $Id: sysopt.cpp 64651 2010-06-20 17:43:15Z VZ $
|
||||
// RCS-ID: $Id: sysopt.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -76,7 +76,7 @@ wxString wxSystemOptions::GetOption(const wxString& name)
|
||||
{
|
||||
val = gs_optionValues[idx];
|
||||
}
|
||||
else // not set explicitely
|
||||
else // not set explicitly
|
||||
{
|
||||
// look in the environment: first for a variable named "wx_appname_name"
|
||||
// which can be set to affect the behaviour or just this application
|
||||
|
@ -5,7 +5,7 @@
|
||||
// Michael N. Filippov <michael@idisys.iae.nsk.su>
|
||||
// (2003/09/30 - PluralForms support)
|
||||
// Created: 2010-04-23
|
||||
// RCS-ID: $Id: translation.cpp 66728 2011-01-22 14:38:36Z DS $
|
||||
// RCS-ID: $Id: translation.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -904,7 +904,7 @@ bool wxMsgCatalogFile::LoadFile(const wxString& filename,
|
||||
if ( !fileMsg.IsOpened() )
|
||||
return false;
|
||||
|
||||
// get the file size (assume it is less than 4Gb...)
|
||||
// get the file size (assume it is less than 4GB...)
|
||||
wxFileOffset lenFile = fileMsg.Length();
|
||||
if ( lenFile == wxInvalidOffset )
|
||||
return false;
|
||||
|
4
Externals/wxWidgets3/src/common/wincmn.cpp
vendored
4
Externals/wxWidgets3/src/common/wincmn.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart, Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 13/07/98
|
||||
// RCS-ID: $Id: wincmn.cpp 67254 2011-03-20 00:14:35Z DS $
|
||||
// RCS-ID: $Id: wincmn.cpp 67285 2011-03-22 17:15:38Z VZ $
|
||||
// Copyright: (c) wxWidgets team
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -1064,7 +1064,7 @@ void wxWindowBase::SendSizeEvent(int flags)
|
||||
wxSizeEvent event(GetSize(), GetId());
|
||||
event.SetEventObject(this);
|
||||
if ( flags & wxSEND_EVENT_POST )
|
||||
wxPostEvent(this, event);
|
||||
wxPostEvent(GetEventHandler(), event);
|
||||
else
|
||||
HandleWindowEvent(event);
|
||||
}
|
||||
|
6
Externals/wxWidgets3/src/common/zipstrm.cpp
vendored
6
Externals/wxWidgets3/src/common/zipstrm.cpp
vendored
@ -2,7 +2,7 @@
|
||||
// Name: src/common/zipstrm.cpp
|
||||
// Purpose: Streams for Zip files
|
||||
// Author: Mike Wetherell
|
||||
// RCS-ID: $Id: zipstrm.cpp 61508 2009-07-23 20:30:22Z VZ $
|
||||
// RCS-ID: $Id: zipstrm.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Mike Wetherell
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -1773,7 +1773,7 @@ bool wxZipInputStream::OpenDecompressor(bool raw /*=false*/)
|
||||
return IsOk();
|
||||
}
|
||||
|
||||
// Can be overriden to add support for additional decompression methods
|
||||
// Can be overridden to add support for additional decompression methods
|
||||
//
|
||||
wxInputStream *wxZipInputStream::OpenDecompressor(wxInputStream& stream)
|
||||
{
|
||||
@ -2128,7 +2128,7 @@ bool wxZipOutputStream::DoCreate(wxZipEntry *entry, bool raw /*=false*/)
|
||||
return true;
|
||||
}
|
||||
|
||||
// Can be overriden to add support for additional compression methods
|
||||
// Can be overridden to add support for additional compression methods
|
||||
//
|
||||
wxOutputStream *wxZipOutputStream::OpenCompressor(
|
||||
wxOutputStream& stream,
|
||||
|
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart and Guillermo Rodriguez Garcia
|
||||
// Modified by: Francesco Montorsi
|
||||
// Created: 13/8/99
|
||||
// RCS-ID: $Id: animateg.cpp 67254 2011-03-20 00:14:35Z DS $
|
||||
// RCS-ID: $Id: animateg.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Julian Smart and Guillermo Rodriguez Garcia
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -504,7 +504,7 @@ void wxAnimationCtrl::IncrementalUpdateBackingStore()
|
||||
|
||||
case wxANIM_TOPREVIOUS:
|
||||
// this disposal should never be used too often.
|
||||
// E.g. GIF specification explicitely say to keep the usage of this
|
||||
// E.g. GIF specification explicitly say to keep the usage of this
|
||||
// disposal limited to the minimum.
|
||||
// In fact it may require a lot of time to restore
|
||||
if (m_currentFrame == 1)
|
||||
@ -627,7 +627,7 @@ void wxAnimationCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
|
||||
|
||||
if ( m_backingStore.IsOk() )
|
||||
{
|
||||
// NOTE: we draw the bitmap explicitely ignoring the mask (if any);
|
||||
// NOTE: we draw the bitmap explicitly ignoring the mask (if any);
|
||||
// i.e. we don't want to combine the backing store with the
|
||||
// possibly wrong preexisting contents of the window!
|
||||
dc.DrawBitmap(m_backingStore, 0, 0, false /* no mask */);
|
||||
|
@ -4,7 +4,7 @@
|
||||
// Author: Francesco Montorsi (readapted code written by Vadim Zeitlin)
|
||||
// Modified by:
|
||||
// Created: 15/04/2006
|
||||
// RCS-ID: $Id: clrpickerg.cpp 52836 2008-03-26 15:49:31Z JS $
|
||||
// RCS-ID: $Id: clrpickerg.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Vadim Zeitlin, Francesco Montorsi
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -83,7 +83,7 @@ void wxGenericColourButton::InitColourData()
|
||||
|
||||
void wxGenericColourButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
|
||||
{
|
||||
// update the wxColouData to be shown in the the dialog
|
||||
// update the wxColouData to be shown in the dialog
|
||||
ms_data.SetColour(m_colour);
|
||||
|
||||
// create the colour dialog and display it
|
||||
|
@ -4,7 +4,7 @@
|
||||
// Author: Francesco Montorsi
|
||||
// Modified By:
|
||||
// Created: 8/10/2006
|
||||
// Id: $Id: collpaneg.cpp 62431 2009-10-16 16:25:43Z VZ $
|
||||
// Id: $Id: collpaneg.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Francesco Montorsi
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -168,7 +168,7 @@ void wxGenericCollapsiblePane::OnStateChange(const wxSize& sz)
|
||||
|
||||
if (this->HasFlag(wxCP_NO_TLW_RESIZE))
|
||||
{
|
||||
// the user asked to explicitely handle the resizing itself...
|
||||
// the user asked to explicitly handle the resizing itself...
|
||||
return;
|
||||
}
|
||||
|
||||
|
8
Externals/wxWidgets3/src/generic/descrip.mms
vendored
8
Externals/wxWidgets3/src/generic/descrip.mms
vendored
@ -2,7 +2,7 @@
|
||||
# *
|
||||
# Make file for VMS *
|
||||
# Author : J.Jansen (joukj@hrem.nano.tudelft.nl) *
|
||||
# Date : 15 December 2010 *
|
||||
# Date : 21 March 2011 *
|
||||
# *
|
||||
#*****************************************************************************
|
||||
.first
|
||||
@ -94,7 +94,8 @@ OBJECTS = \
|
||||
filectrlg.obj,srchctlg.obj,notifmsgg.obj,headerctrlg.obj,\
|
||||
grideditors.obj,vlbox.obj,vscroll.obj,stattextg.obj,\
|
||||
editlbox.obj,datavgen.obj,dbgrptg.obj,dragimgg.obj,\
|
||||
richmsgdlgg.obj,commandlinkbuttong.obj,spinctlg.obj
|
||||
richmsgdlgg.obj,commandlinkbuttong.obj,spinctlg.obj,\
|
||||
markuptext.obj
|
||||
|
||||
SOURCES = \
|
||||
aboutdlgg.cpp,\
|
||||
@ -166,7 +167,7 @@ SOURCES = \
|
||||
icon.cpp,bmpcboxg.cpp,filectrlg.cpp,srchctlg.cpp,notifmsgg.cpp\
|
||||
,headerctrlg.cpp,grideditors.cpp,stattextg.cpp,editlbox.cpp,\
|
||||
datavgen.cpp,dbgrptg.cpp,dragimgg.cpp,richmsgdlgg.cpp,\
|
||||
commandlinkbuttong.cpp,spinctlg.cpp
|
||||
commandlinkbuttong.cpp,spinctlg.cpp markuptext.cpp
|
||||
|
||||
.ifdef __WXMOTIF__
|
||||
OBJECTS0=statusbr.obj,statline.obj,notebook.obj,spinctlg.obj,collpaneg.obj,\
|
||||
@ -302,3 +303,4 @@ dragimgg.obj : dragimgg.cpp
|
||||
richmsgdlgg.obj : richmsgdlgg.cpp
|
||||
commandlinkbuttong.obj : commandlinkbuttong.cpp
|
||||
spinctlg.obj : spinctlg.cpp
|
||||
markuptext.obj : markuptext.cpp
|
||||
|
@ -4,7 +4,7 @@
|
||||
// Author: Francesco Montorsi
|
||||
// Modified by:
|
||||
// Created: 15/04/2006
|
||||
// RCS-ID: $Id: fontpickerg.cpp 63945 2010-04-12 00:37:02Z VZ $
|
||||
// RCS-ID: $Id: fontpickerg.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Francesco Montorsi
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -79,7 +79,7 @@ void wxGenericFontButton::InitFontData()
|
||||
|
||||
void wxGenericFontButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
|
||||
{
|
||||
// update the wxFontData to be shown in the the dialog
|
||||
// update the wxFontData to be shown in the dialog
|
||||
m_data.SetInitialFont(m_selectedFont);
|
||||
|
||||
// create the font dialog and display it
|
||||
|
6
Externals/wxWidgets3/src/generic/grid.cpp
vendored
6
Externals/wxWidgets3/src/generic/grid.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Michael Bedward (based on code by Julian Smart, Robin Dunn)
|
||||
// Modified by: Robin Dunn, Vadim Zeitlin, Santiago Palacios
|
||||
// Created: 1/08/1999
|
||||
// RCS-ID: $Id: grid.cpp 66792 2011-01-27 18:35:01Z SC $
|
||||
// RCS-ID: $Id: grid.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Michael Bedward (mbedward@ozemail.com.au)
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -6918,7 +6918,7 @@ void wxGrid::SetCellHighlightPenWidth(int width)
|
||||
m_cellHighlightPenWidth = width;
|
||||
|
||||
// Just redrawing the cell highlight is not enough since that won't
|
||||
// make any visible change if the the thickness is getting smaller.
|
||||
// make any visible change if the thickness is getting smaller.
|
||||
int row = m_currentCellCoords.GetRow();
|
||||
int col = m_currentCellCoords.GetCol();
|
||||
if ( row == -1 || col == -1 || GetColWidth(col) <= 0 || GetRowHeight(row) <= 0 )
|
||||
@ -6936,7 +6936,7 @@ void wxGrid::SetCellHighlightROPenWidth(int width)
|
||||
m_cellHighlightROPenWidth = width;
|
||||
|
||||
// Just redrawing the cell highlight is not enough since that won't
|
||||
// make any visible change if the the thickness is getting smaller.
|
||||
// make any visible change if the thickness is getting smaller.
|
||||
int row = m_currentCellCoords.GetRow();
|
||||
int col = m_currentCellCoords.GetCol();
|
||||
if ( row == -1 || col == -1 ||
|
||||
|
@ -2,7 +2,7 @@
|
||||
// Name: src/generic/imaglist.cpp
|
||||
// Purpose:
|
||||
// Author: Robert Roebling
|
||||
// Id: $Id: imaglist.cpp 61508 2009-07-23 20:30:22Z VZ $
|
||||
// Id: $Id: imaglist.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1998 Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -76,7 +76,7 @@ int wxGenericImageList::Add( const wxBitmap &bitmap )
|
||||
}
|
||||
else
|
||||
{
|
||||
// Mimic behavior of Windows ImageList_Add that automatically breaks up the added
|
||||
// Mimic behaviour of Windows ImageList_Add that automatically breaks up the added
|
||||
// bitmap into sub-images of the correct size
|
||||
if (m_width > 0 && bitmap.GetWidth() > m_width && bitmap.GetHeight() >= m_height)
|
||||
{
|
||||
|
@ -3,7 +3,7 @@
|
||||
// Purpose: generic implementation of wxListCtrl
|
||||
// Author: Robert Roebling
|
||||
// Vadim Zeitlin (virtual list control support)
|
||||
// Id: $Id: listctrl.cpp 67018 2011-02-25 09:38:35Z JS $
|
||||
// Id: $Id: listctrl.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1998 Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -1046,7 +1046,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
|
||||
|
||||
// NB: The code below is not really Mac-specific, but since we are close
|
||||
// to 2.8 release and I don't have time to test on other platforms, I
|
||||
// defined this only for wxMac. If this behavior is desired on
|
||||
// defined this only for wxMac. If this behaviour is desired on
|
||||
// other platforms, please go ahead and revise or remove the #ifdef.
|
||||
#ifdef __WXMAC__
|
||||
if ( !m_owner->IsVirtual() && (item.m_mask & wxLIST_MASK_STATE) &&
|
||||
|
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 01/02/97
|
||||
// RCS-ID: $Id: splitter.cpp 66232 2010-11-22 01:23:16Z VZ $
|
||||
// RCS-ID: $Id: splitter.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -741,7 +741,7 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode,
|
||||
return false;
|
||||
|
||||
wxCHECK_MSG( window1 && window2, false,
|
||||
wxT("can not split with NULL window(s)") );
|
||||
wxT("cannot split with NULL window(s)") );
|
||||
|
||||
wxCHECK_MSG( window1->GetParent() == this && window2->GetParent() == this, false,
|
||||
wxT("windows in the splitter should have it as parent!") );
|
||||
|
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by: Francesco Montorsi
|
||||
// Created: 01/02/97
|
||||
// RCS-ID: $Id: statusbr.cpp 62432 2009-10-16 21:32:51Z VZ $
|
||||
// RCS-ID: $Id: statusbr.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -345,7 +345,7 @@ int wxStatusBarGeneric::GetFieldFromPoint(const wxPoint& pt) const
|
||||
if (m_widthsAbs.IsEmpty())
|
||||
return wxNOT_FOUND;
|
||||
|
||||
// NOTE: we explicitely don't take in count the borders since they are only
|
||||
// NOTE: we explicitly don't take in count the borders since they are only
|
||||
// useful when rendering the status text, not for hit-test computations
|
||||
|
||||
if (pt.y <= 0 || pt.y >= m_lastClientHeight)
|
||||
|
4
Externals/wxWidgets3/src/generic/timer.cpp
vendored
4
Externals/wxWidgets3/src/generic/timer.cpp
vendored
@ -2,7 +2,7 @@
|
||||
// Name: src/generic/timer.cpp
|
||||
// Purpose: wxTimer implementation
|
||||
// Author: Vaclav Slavik
|
||||
// Id: $Id: timer.cpp 64656 2010-06-20 18:18:23Z VZ $
|
||||
// Id: $Id: timer.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Vaclav Slavik
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -49,7 +49,7 @@
|
||||
|
||||
#ifdef __DOS__
|
||||
// Under DOS the MGL timer has a 24hr period, so consider the 12 hours
|
||||
// before y to be 'less' and the the 12 hours after 'greater' modulo
|
||||
// before y to be 'less' and the 12 hours after 'greater' modulo
|
||||
// 24 hours.
|
||||
inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y)
|
||||
{
|
||||
|
@ -4,7 +4,7 @@
|
||||
// Author: Robert Roebling
|
||||
// Created: 01/02/97
|
||||
// Modified: 22/10/98 - almost total rewrite, simpler interface (VZ)
|
||||
// Id: $Id: treectlg.cpp 67214 2011-03-16 07:22:56Z SC $
|
||||
// Id: $Id: treectlg.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1998 Robert Roebling and Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -3699,7 +3699,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
|
||||
event.Skip(!GetEventHandler()->ProcessEvent(nevent));
|
||||
|
||||
// Consistent with MSW (for now), send the ITEM_MENU *after*
|
||||
// the RIGHT_CLICK event. TODO: This behavior may change.
|
||||
// the RIGHT_CLICK event. TODO: This behaviour may change.
|
||||
wxTreeEvent nevent2(wxEVT_COMMAND_TREE_ITEM_MENU, this, item);
|
||||
nevent2.m_pointDrag = CalcScrolledPosition(pt);
|
||||
GetEventHandler()->ProcessEvent(nevent2);
|
||||
|
6
Externals/wxWidgets3/src/generic/vscroll.cpp
vendored
6
Externals/wxWidgets3/src/generic/vscroll.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by: Brad Anderson, David Warkentin
|
||||
// Created: 30.05.03
|
||||
// RCS-ID: $Id: vscroll.cpp 63761 2010-03-28 14:37:30Z VS $
|
||||
// RCS-ID: $Id: vscroll.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -822,7 +822,7 @@ void wxVarHVScrollHelper::RefreshRowColumn(size_t row, size_t column)
|
||||
h_rect.x += OnGetColumnWidth(n);
|
||||
}
|
||||
|
||||
// refresh but specialize the behavior if we have a single target window
|
||||
// refresh but specialize the behaviour if we have a single target window
|
||||
if ( wxVarVScrollHelper::GetTargetWindow() == wxVarHScrollHelper::GetTargetWindow() )
|
||||
{
|
||||
v_rect.x = h_rect.x;
|
||||
@ -889,7 +889,7 @@ void wxVarHVScrollHelper::RefreshRowsColumns(size_t fromRow, size_t toRow,
|
||||
h_rect.width += OnGetColumnWidth(nBetween);
|
||||
}
|
||||
|
||||
// refresh but specialize the behavior if we have a single target window
|
||||
// refresh but specialize the behaviour if we have a single target window
|
||||
if ( wxVarVScrollHelper::GetTargetWindow() == wxVarHScrollHelper::GetTargetWindow() )
|
||||
{
|
||||
v_rect.x = h_rect.x;
|
||||
|
4
Externals/wxWidgets3/src/generic/wizard.cpp
vendored
4
Externals/wxWidgets3/src/generic/wizard.cpp
vendored
@ -8,7 +8,7 @@
|
||||
// 3) Fixed ShowPage() bug on displaying bitmaps
|
||||
// Robert Vazan (sizers)
|
||||
// Created: 15.08.99
|
||||
// RCS-ID: $Id: wizard.cpp 66985 2011-02-20 18:18:51Z VS $
|
||||
// RCS-ID: $Id: wizard.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -316,7 +316,7 @@ void wxWizard::AddBitmapRow(wxBoxSizer *mainColumn)
|
||||
mainColumn->Add(
|
||||
m_sizerBmpAndPage,
|
||||
1, // Vertically stretchable
|
||||
wxEXPAND // Horizonal stretching, no border
|
||||
wxEXPAND // Horizontal stretching, no border
|
||||
);
|
||||
mainColumn->Add(0,5,
|
||||
0, // No vertical stretching
|
||||
|
4
Externals/wxWidgets3/src/gtk/aboutdlg.cpp
vendored
4
Externals/wxWidgets3/src/gtk/aboutdlg.cpp
vendored
@ -3,7 +3,7 @@
|
||||
// Purpose: native GTK+ wxAboutBox() implementation
|
||||
// Author: Vadim Zeitlin
|
||||
// Created: 2006-10-08
|
||||
// RCS-ID: $Id: aboutdlg.cpp 61508 2009-07-23 20:30:22Z VZ $
|
||||
// RCS-ID: $Id: aboutdlg.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -192,7 +192,7 @@ void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* WXUNUSED(parent))
|
||||
transCredits << translators[n] << wxT('\n');
|
||||
}
|
||||
}
|
||||
else // no translators explicitely specified
|
||||
else // no translators explicitly specified
|
||||
{
|
||||
// maybe we have translator credits in the message catalog?
|
||||
wxString translator = _("translator-credits");
|
||||
|
8
Externals/wxWidgets3/src/gtk/app.cpp
vendored
8
Externals/wxWidgets3/src/gtk/app.cpp
vendored
@ -2,7 +2,7 @@
|
||||
// Name: src/gtk/app.cpp
|
||||
// Purpose:
|
||||
// Author: Robert Roebling
|
||||
// Id: $Id: app.cpp 66120 2010-11-11 12:09:30Z VZ $
|
||||
// Id: $Id: app.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1998 Robert Roebling, Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -86,7 +86,7 @@ static void wx_add_idle_hooks()
|
||||
}
|
||||
}
|
||||
// "size_allocate" hook
|
||||
// Needed to match the behavior of the old idle system,
|
||||
// Needed to match the behaviour of the old idle system,
|
||||
// but probably not necessary.
|
||||
{
|
||||
static bool hook_installed;
|
||||
@ -125,7 +125,7 @@ bool wxApp::DoIdle()
|
||||
|
||||
#if wxDEBUG_LEVEL
|
||||
// don't generate the idle events while the assert modal dialog is shown,
|
||||
// this matches the behavior of wxMSW
|
||||
// this matches the behaviour of wxMSW
|
||||
if (m_isInAssert)
|
||||
return false;
|
||||
#endif
|
||||
@ -439,7 +439,7 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
|
||||
return false;
|
||||
}
|
||||
|
||||
// we can not enter threads before gtk_init is done
|
||||
// we cannot enter threads before gtk_init is done
|
||||
gdk_threads_enter();
|
||||
|
||||
#if wxUSE_INTL
|
||||
|
6
Externals/wxWidgets3/src/gtk/collpane.cpp
vendored
6
Externals/wxWidgets3/src/gtk/collpane.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Francesco Montorsi
|
||||
// Modified By:
|
||||
// Created: 8/10/2006
|
||||
// Id: $Id: collpane.cpp 65680 2010-09-30 11:44:45Z VZ $
|
||||
// Id: $Id: collpane.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Francesco Montorsi
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -104,7 +104,7 @@ gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object),
|
||||
wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed());
|
||||
p->HandleWindowEvent(ev);
|
||||
|
||||
// the user asked to explicitely handle the resizing itself...
|
||||
// the user asked to explicitly handle the resizing itself...
|
||||
return;
|
||||
}
|
||||
|
||||
@ -272,7 +272,7 @@ void wxCollapsiblePane::OnSize(wxSizeEvent &ev)
|
||||
// is expanded or shrunk, the pane window won't be updated!
|
||||
m_pPane->SetSize(ev.GetSize().x, ev.GetSize().y - m_szCollapsed.y);
|
||||
|
||||
// we need to explicitely call m_pPane->Layout() or else it won't correctly relayout
|
||||
// we need to explicitly call m_pPane->Layout() or else it won't correctly relayout
|
||||
// (even if SetAutoLayout(true) has been called on it!)
|
||||
m_pPane->Layout();
|
||||
}
|
||||
|
4
Externals/wxWidgets3/src/gtk/print.cpp
vendored
4
Externals/wxWidgets3/src/gtk/print.cpp
vendored
@ -3,7 +3,7 @@
|
||||
// Author: Anthony Bretaudeau
|
||||
// Purpose: GTK printing support
|
||||
// Created: 2007-08-25
|
||||
// RCS-ID: $Id: print.cpp 67254 2011-03-20 00:14:35Z DS $
|
||||
// RCS-ID: $Id: print.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 2007 wxWidgets development team
|
||||
// Licence: wxWindows Licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -2213,7 +2213,7 @@ void wxGtkPrinterDCImpl::SetPrintData(const wxPrintData& data)
|
||||
m_printData = data;
|
||||
}
|
||||
|
||||
// overriden for wxPrinterDC Impl
|
||||
// overridden for wxPrinterDC Impl
|
||||
|
||||
wxRect wxGtkPrinterDCImpl::GetPaperRect() const
|
||||
{
|
||||
|
4
Externals/wxWidgets3/src/gtk/renderer.cpp
vendored
4
Externals/wxWidgets3/src/gtk/renderer.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 20.07.2003
|
||||
// RCS-ID: $Id: renderer.cpp 65947 2010-10-30 15:57:32Z VS $
|
||||
// RCS-ID: $Id: renderer.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -632,7 +632,7 @@ void wxRendererGTK::DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, in
|
||||
);
|
||||
}
|
||||
|
||||
// Draw the equivallent of a wxComboBox
|
||||
// Draw the equivalent of a wxComboBox
|
||||
void wxRendererGTK::DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
|
||||
{
|
||||
GtkWidget *combo = wxGTKPrivate::GetComboBoxWidget();
|
||||
|
4
Externals/wxWidgets3/src/gtk/window.cpp
vendored
4
Externals/wxWidgets3/src/gtk/window.cpp
vendored
@ -2,7 +2,7 @@
|
||||
// Name: src/gtk/window.cpp
|
||||
// Purpose: wxWindowGTK implementation
|
||||
// Author: Robert Roebling
|
||||
// Id: $Id: window.cpp 67191 2011-03-14 11:55:01Z VZ $
|
||||
// Id: $Id: window.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1998 Robert Roebling, Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -3162,7 +3162,7 @@ void wxWindowGTK::SetFocus()
|
||||
// within its toplevel", i.e. returns true for one widget per TLW, not
|
||||
// globally) returns true immediately after grabbing focus,
|
||||
// GTK_WIDGET_HAS_FOCUS (which returns true only for the one widget that
|
||||
// has focus at the moment) takes affect only after the window is shown
|
||||
// has focus at the moment) takes effect only after the window is shown
|
||||
// (if it was hidden at the moment of the call) or at the next event loop
|
||||
// iteration.
|
||||
//
|
||||
|
4
Externals/wxWidgets3/src/msw/app.cpp
vendored
4
Externals/wxWidgets3/src/msw/app.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 04/01/98
|
||||
// RCS-ID: $Id: app.cpp 67185 2011-03-14 11:54:32Z VZ $
|
||||
// RCS-ID: $Id: app.cpp 67288 2011-03-22 17:15:56Z VZ $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -219,6 +219,7 @@ void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
|
||||
delete data;
|
||||
}
|
||||
|
||||
#if wxUSE_THREADS
|
||||
bool wxGUIAppTraits::DoMessageFromThreadWait()
|
||||
{
|
||||
// we should return false only if the app should exit, i.e. only if
|
||||
@ -258,6 +259,7 @@ DWORD wxGUIAppTraits::WaitForThread(WXHANDLE hThread, int flags)
|
||||
QS_ALLPOSTMESSAGE
|
||||
);
|
||||
}
|
||||
#endif // wxUSE_THREADS
|
||||
|
||||
wxPortId wxGUIAppTraits::GetToolkitVersion(int *majVer, int *minVer) const
|
||||
{
|
||||
|
16
Externals/wxWidgets3/src/msw/basemsw.cpp
vendored
16
Externals/wxWidgets3/src/msw/basemsw.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 22.06.2003
|
||||
// RCS-ID: $Id: basemsw.cpp 67254 2011-03-20 00:14:35Z DS $
|
||||
// RCS-ID: $Id: basemsw.cpp 67288 2011-03-22 17:15:56Z VZ $
|
||||
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -43,10 +43,12 @@
|
||||
// wxAppTraits implementation
|
||||
// ============================================================================
|
||||
|
||||
#if wxUSE_THREADS
|
||||
WXDWORD wxAppTraits::DoSimpleWaitForThread(WXHANDLE hThread)
|
||||
{
|
||||
return ::WaitForSingleObject((HANDLE)hThread, INFINITE);
|
||||
}
|
||||
#endif // wxUSE_THREADS
|
||||
|
||||
// ============================================================================
|
||||
// wxConsoleAppTraits implementation
|
||||
@ -63,12 +65,19 @@ void wxConsoleAppTraits::AfterChildWaitLoop(void * WXUNUSED(data))
|
||||
// nothing to do here
|
||||
}
|
||||
|
||||
#if wxUSE_THREADS
|
||||
bool wxConsoleAppTraits::DoMessageFromThreadWait()
|
||||
{
|
||||
// nothing to process here
|
||||
return true;
|
||||
}
|
||||
|
||||
WXDWORD wxConsoleAppTraits::WaitForThread(WXHANDLE hThread, int WXUNUSED(flags))
|
||||
{
|
||||
return DoSimpleWaitForThread(hThread);
|
||||
}
|
||||
#endif // wxUSE_THREADS
|
||||
|
||||
#if wxUSE_TIMER
|
||||
|
||||
wxTimerImpl *wxConsoleAppTraits::CreateTimerImpl(wxTimer *timer)
|
||||
@ -88,11 +97,6 @@ wxEventLoopBase *wxConsoleAppTraits::CreateEventLoop()
|
||||
}
|
||||
|
||||
|
||||
WXDWORD wxConsoleAppTraits::WaitForThread(WXHANDLE hThread, int WXUNUSED(flags))
|
||||
{
|
||||
return DoSimpleWaitForThread(hThread);
|
||||
}
|
||||
|
||||
bool wxConsoleAppTraits::WriteToStderr(const wxString& text)
|
||||
{
|
||||
return wxFprintf(stderr, "%s", text) != -1;
|
||||
|
25
Externals/wxWidgets3/src/msw/button.cpp
vendored
25
Externals/wxWidgets3/src/msw/button.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 04/01/98
|
||||
// RCS-ID: $Id: button.cpp 67187 2011-03-14 11:54:39Z VZ $
|
||||
// RCS-ID: $Id: button.cpp 67284 2011-03-22 17:15:34Z VZ $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -115,6 +115,10 @@ using namespace wxMSWImpl;
|
||||
#define BCM_SETSHIELD 0x160c
|
||||
#endif
|
||||
|
||||
#if wxUSE_UXTHEME
|
||||
extern wxWindowMSW *wxWindowBeingErased; // From src/msw/window.cpp
|
||||
#endif // wxUSE_UXTHEME
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// button image data
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -153,6 +157,7 @@ public:
|
||||
wxODButtonImageData(wxButton *btn, const wxBitmap& bitmap)
|
||||
{
|
||||
SetBitmap(bitmap, wxButton::State_Normal);
|
||||
SetBitmap(bitmap.ConvertToDisabled(), wxButton::State_Disabled);
|
||||
|
||||
m_dir = wxLEFT;
|
||||
|
||||
@ -221,10 +226,11 @@ public:
|
||||
wxButton::State_Max),
|
||||
m_hwndBtn(GetHwndOf(btn))
|
||||
{
|
||||
// initialize all bitmaps to normal state
|
||||
// initialize all bitmaps except for the disabled one to normal state
|
||||
for ( int n = 0; n < wxButton::State_Max; n++ )
|
||||
{
|
||||
m_iml.Add(bitmap);
|
||||
m_iml.Add(n == wxButton::State_Disabled ? bitmap.ConvertToDisabled()
|
||||
: bitmap);
|
||||
}
|
||||
|
||||
m_data.himl = GetHimagelistOf(&m_iml);
|
||||
@ -1315,7 +1321,20 @@ void DrawXPBackground(wxButton *button, HDC hdc, RECT& rectBtn, UINT state)
|
||||
iState
|
||||
) )
|
||||
{
|
||||
// Set this button as the one whose background is being erased: this
|
||||
// allows our WM_ERASEBKGND handler used by DrawThemeParentBackground()
|
||||
// to correctly align the background brush with this window instead of
|
||||
// the parent window to which WM_ERASEBKGND is sent. Notice that this
|
||||
// doesn't work with custom user-defined EVT_ERASE_BACKGROUND handlers
|
||||
// as they won't be aligned but unfortunately all the attempts to fix
|
||||
// it by shifting DC origin before calling DrawThemeParentBackground()
|
||||
// failed to work so we at least do this, even though this is far from
|
||||
// being the perfect solution.
|
||||
wxWindowBeingErased = button;
|
||||
|
||||
engine->DrawThemeParentBackground(GetHwndOf(button), hdc, &rectBtn);
|
||||
|
||||
wxWindowBeingErased = NULL;
|
||||
}
|
||||
|
||||
// draw background
|
||||
|
4
Externals/wxWidgets3/src/msw/checklst.cpp
vendored
4
Externals/wxWidgets3/src/msw/checklst.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 16.11.97
|
||||
// RCS-ID: $Id: checklst.cpp 66557 2011-01-04 09:13:49Z SC $
|
||||
// RCS-ID: $Id: checklst.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -410,7 +410,7 @@ void wxCheckListBox::OnLeftClick(wxMouseEvent& event)
|
||||
}
|
||||
else
|
||||
{
|
||||
// implement default behavior on click outside of client zone
|
||||
// implement default behaviour on click outside of client zone
|
||||
event.Skip();
|
||||
}
|
||||
}
|
||||
|
4
Externals/wxWidgets3/src/msw/choice.cpp
vendored
4
Externals/wxWidgets3/src/msw/choice.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by: Vadim Zeitlin to derive from wxChoiceBase
|
||||
// Created: 04/01/98
|
||||
// RCS-ID: $Id: choice.cpp 66555 2011-01-04 08:31:53Z SC $
|
||||
// RCS-ID: $Id: choice.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -556,7 +556,7 @@ void wxChoice::DoSetSize(int x, int y,
|
||||
// make the control itself of the requested height: notice that this
|
||||
// must be done after changing its size or it has no effect (apparently
|
||||
// the height is reset to default during the control layout) and that it's
|
||||
// useless to to do it when using the deferred sizing -- in this case it
|
||||
// useless to do it when using the deferred sizing -- in this case it
|
||||
// will be done from MSWEndDeferWindowPos()
|
||||
#if wxUSE_DEFERRED_SIZING
|
||||
if ( m_pendingSize == wxDefaultSize )
|
||||
|
4
Externals/wxWidgets3/src/msw/clipbrd.cpp
vendored
4
Externals/wxWidgets3/src/msw/clipbrd.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 04/01/98
|
||||
// RCS-ID: $Id: clipbrd.cpp 61475 2009-07-20 16:47:54Z VZ $
|
||||
// RCS-ID: $Id: clipbrd.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -98,7 +98,7 @@ bool wxOpenClipboard()
|
||||
}
|
||||
else
|
||||
{
|
||||
wxLogDebug(wxT("Can not open clipboard without a main window."));
|
||||
wxLogDebug(wxT("Cannot open clipboard without a main window."));
|
||||
|
||||
return false;
|
||||
}
|
||||
|
16
Externals/wxWidgets3/src/msw/combo.cpp
vendored
16
Externals/wxWidgets3/src/msw/combo.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Jaakko Salli
|
||||
// Modified by:
|
||||
// Created: Apr-30-2006
|
||||
// RCS-ID: $Id: combo.cpp 66385 2010-12-16 17:21:49Z JMS $
|
||||
// RCS-ID: $Id: combo.cpp 67276 2011-03-22 09:56:40Z JMS $
|
||||
// Copyright: (c) 2005 Jaakko Salli
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -202,15 +202,18 @@ bool wxComboCtrl::Create(wxWindow *parent,
|
||||
if ( style & wxCC_STD_BUTTON )
|
||||
m_iFlags |= wxCC_POPUP_ON_MOUSE_UP;
|
||||
|
||||
// Prepare background for double-buffering or better background theme
|
||||
// support, whichever is possible.
|
||||
SetDoubleBuffered(true);
|
||||
if ( !IsDoubleBuffered() )
|
||||
SetBackgroundStyle( wxBG_STYLE_PAINT );
|
||||
|
||||
// Create textctrl, if necessary
|
||||
CreateTextCtrl( wxNO_BORDER );
|
||||
|
||||
// Add keyboard input handlers for main control and textctrl
|
||||
InstallInputHandlers();
|
||||
|
||||
// Prepare background for double-buffering
|
||||
SetBackgroundStyle( wxBG_STYLE_CUSTOM );
|
||||
|
||||
// SetInitialSize should be called last
|
||||
SetInitialSize(size);
|
||||
|
||||
@ -434,7 +437,8 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
|
||||
// TODO: Convert drawing in this function to Windows API Code
|
||||
|
||||
wxSize sz = GetClientSize();
|
||||
wxAutoBufferedPaintDC dc(this);
|
||||
wxDC* dcPtr = wxAutoBufferedPaintDCFactory(this);
|
||||
wxDC& dc = *dcPtr;
|
||||
|
||||
const wxRect& rectButton = m_btnArea;
|
||||
wxRect rectTextField = m_tcArea;
|
||||
@ -640,6 +644,8 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
|
||||
else
|
||||
wxComboPopup::DefaultPaintComboControl(this,dc,rectTextField);
|
||||
}
|
||||
|
||||
delete dcPtr;
|
||||
}
|
||||
|
||||
void wxComboCtrl::OnMouseEvent( wxMouseEvent& event )
|
||||
|
33
Externals/wxWidgets3/src/msw/dib.cpp
vendored
33
Externals/wxWidgets3/src/msw/dib.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 03.03.03 (replaces the old file with the same name)
|
||||
// RCS-ID: $Id: dib.cpp 66157 2010-11-15 00:22:01Z VZ $
|
||||
// RCS-ID: $Id: dib.cpp 67287 2011-03-22 17:15:49Z VZ $
|
||||
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -760,7 +760,14 @@ wxImage wxDIB::ConvertToImage() const
|
||||
}
|
||||
|
||||
const int bpp = GetDepth();
|
||||
|
||||
// Remember if we have any "real" transparency, i.e. either any partially
|
||||
// transparent pixels or not all pixels are fully opaque or fully
|
||||
// transparent.
|
||||
bool hasAlpha = false;
|
||||
bool hasOpaque = false;
|
||||
bool hasTransparent = false;
|
||||
|
||||
if ( bpp == 32 )
|
||||
{
|
||||
// 32 bit bitmaps may be either 0RGB or ARGB and we don't know in
|
||||
@ -793,13 +800,30 @@ wxImage wxDIB::ConvertToImage() const
|
||||
// premultiplication done in Create() above
|
||||
const unsigned char a = *src;
|
||||
*alpha++ = a;
|
||||
|
||||
// Check what kind of alpha do we have.
|
||||
switch ( a )
|
||||
{
|
||||
case 0:
|
||||
hasTransparent = true;
|
||||
break;
|
||||
|
||||
default:
|
||||
// Anything in between means we have real transparency
|
||||
// and must use alpha channel.
|
||||
hasAlpha = true;
|
||||
break;
|
||||
|
||||
case 255:
|
||||
hasOpaque = true;
|
||||
break;
|
||||
}
|
||||
|
||||
if ( a > 0 )
|
||||
{
|
||||
dst[0] = (dst[0] * 255) / a;
|
||||
dst[1] = (dst[1] * 255) / a;
|
||||
dst[2] = (dst[2] * 255) / a;
|
||||
|
||||
hasAlpha = true;
|
||||
}
|
||||
|
||||
src++;
|
||||
@ -817,6 +841,9 @@ wxImage wxDIB::ConvertToImage() const
|
||||
srcLineStart += srcBytesPerLine;
|
||||
}
|
||||
|
||||
if ( hasOpaque && hasTransparent )
|
||||
hasAlpha = true;
|
||||
|
||||
if ( !hasAlpha && image.HasAlpha() )
|
||||
image.ClearAlpha();
|
||||
|
||||
|
4
Externals/wxWidgets3/src/msw/dir.cpp
vendored
4
Externals/wxWidgets3/src/msw/dir.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 08.12.99
|
||||
// RCS-ID: $Id: dir.cpp 67254 2011-03-20 00:14:35Z DS $
|
||||
// RCS-ID: $Id: dir.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -208,7 +208,7 @@ bool wxDirData::Read(wxString *filename)
|
||||
|
||||
if ( err != ERROR_FILE_NOT_FOUND && err != ERROR_NO_MORE_FILES )
|
||||
{
|
||||
wxLogSysError(err, _("Can not enumerate files in directory '%s'"),
|
||||
wxLogSysError(err, _("Cannot enumerate files in directory '%s'"),
|
||||
m_dirname.c_str());
|
||||
}
|
||||
#endif // __WIN32__
|
||||
|
4
Externals/wxWidgets3/src/msw/display.cpp
vendored
4
Externals/wxWidgets3/src/msw/display.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Royce Mitchell III, Vadim Zeitlin
|
||||
// Modified by: Ryan Norton (IsPrimary override)
|
||||
// Created: 06/21/02
|
||||
// RCS-ID: $Id: display.cpp 65557 2010-09-16 11:05:46Z VZ $
|
||||
// RCS-ID: $Id: display.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) wxWidgets team
|
||||
// Copyright: (c) 2002-2006 wxWidgets team
|
||||
// Licence: wxWindows licence
|
||||
@ -417,7 +417,7 @@ bool wxDisplayMSW::ChangeMode(const wxVideoMode& mode)
|
||||
// ok
|
||||
{
|
||||
// If we have a top-level, full-screen frame, emulate
|
||||
// the DirectX behavior and resize it. This makes this
|
||||
// the DirectX behaviour and resize it. This makes this
|
||||
// API quite a bit easier to use.
|
||||
wxWindow *winTop = wxTheApp->GetTopWindow();
|
||||
wxFrame *frameTop = wxDynamicCast(winTop, wxFrame);
|
||||
|
4
Externals/wxWidgets3/src/msw/fdrepdlg.cpp
vendored
4
Externals/wxWidgets3/src/msw/fdrepdlg.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Markus Greither and Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 23/03/2001
|
||||
// RCS-ID: $Id: fdrepdlg.cpp 64656 2010-06-20 18:18:23Z VZ $
|
||||
// RCS-ID: $Id: fdrepdlg.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Markus Greither
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -217,7 +217,7 @@ wxFindReplaceDialogImpl::FindMessageHandler(wxWindow * WXUNUSED(win),
|
||||
#if wxUSE_UNICODE_MSLU
|
||||
// This is a hack for a MSLU problem: Versions up to 1.0.4011
|
||||
// of UNICOWS.DLL send the correct UNICODE item after button press
|
||||
// and a bogus ANSI mode item right after this, so lets ignore
|
||||
// and a bogus ANSI mode item right after this, so let's ignore
|
||||
// the second bogus message
|
||||
if ( wxUsingUnicowsDll() && s_lastMsgFlags == pFR->Flags )
|
||||
{
|
||||
|
4
Externals/wxWidgets3/src/msw/filedlg.cpp
vendored
4
Externals/wxWidgets3/src/msw/filedlg.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 01/02/97
|
||||
// RCS-ID: $Id: filedlg.cpp 62722 2009-11-26 16:17:00Z VZ $
|
||||
// RCS-ID: $Id: filedlg.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -225,7 +225,7 @@ void wxFileDialog::DoCentre(int dir)
|
||||
|
||||
void wxFileDialog::MSWOnInitDone(WXHWND hDlg)
|
||||
{
|
||||
// note the the dialog is the parent window: hDlg is a child of it when
|
||||
// note the dialog is the parent window: hDlg is a child of it when
|
||||
// OFN_EXPLORER is used
|
||||
HWND hFileDlg = ::GetParent((HWND)hDlg);
|
||||
|
||||
|
4
Externals/wxWidgets3/src/msw/mdi.cpp
vendored
4
Externals/wxWidgets3/src/msw/mdi.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by: Vadim Zeitlin on 2008-11-04 to use the base classes
|
||||
// Created: 04/01/98
|
||||
// RCS-ID: $Id: mdi.cpp 64656 2010-06-20 18:18:23Z VZ $
|
||||
// RCS-ID: $Id: mdi.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1998 Julian Smart
|
||||
// (c) 2008-2009 Vadim Zeitlin
|
||||
// Licence: wxWindows licence
|
||||
@ -1111,7 +1111,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
|
||||
|
||||
WXHMENU hMenuParent = parent->m_hMenu;
|
||||
|
||||
// activate the the parent menu only when there is no other child
|
||||
// activate the parent menu only when there is no other child
|
||||
// that has been activated
|
||||
if ( hMenuParent && !hwndAct )
|
||||
hMenuToSet = hMenuParent;
|
||||
|
@ -4,7 +4,7 @@
|
||||
// Author: Ryan Norton <wxprojects@comcast.net>
|
||||
// Modified by:
|
||||
// Created: 01/29/05
|
||||
// RCS-ID: $Id: mediactrl_am.cpp 65845 2010-10-18 23:43:14Z VZ $
|
||||
// RCS-ID: $Id: mediactrl_am.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Ryan Norton
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -1823,8 +1823,8 @@ void wxAMMediaBackend::FinishLoad()
|
||||
bool wxAMMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
|
||||
{
|
||||
// Note that IMediaPlayer doesn't have a statusbar by
|
||||
// default but IActiveMovie does - so lets try to keep
|
||||
// the interface consistant
|
||||
// default but IActiveMovie does - so let's try to keep
|
||||
// the interface consistent.
|
||||
if(!flags)
|
||||
{
|
||||
GetAM()->put_Enabled(VARIANT_FALSE);
|
||||
|
@ -5,7 +5,7 @@
|
||||
// Modified by: Robin Dunn (moved QT code from mediactrl.cpp)
|
||||
//
|
||||
// Created: 11/07/04
|
||||
// RCS-ID: $Id: mediactrl_qt.cpp 65486 2010-09-09 20:33:56Z VZ $
|
||||
// RCS-ID: $Id: mediactrl_qt.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Ryan Norton
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -1162,7 +1162,7 @@ bool wxQTMediaBackend::ShowPlayerControls(wxMediaCtrlPlayerControls flags)
|
||||
//---------------------------------------------------------------------------
|
||||
// wxQTMediaBackend::MCFilterProc (static)
|
||||
//
|
||||
// Callback for when the movie controller recieves a message
|
||||
// Callback for when the movie controller receives a message
|
||||
//---------------------------------------------------------------------------
|
||||
Boolean wxQTMediaBackend::MCFilterProc(MovieController WXUNUSED(theController),
|
||||
short action,
|
||||
|
3
Externals/wxWidgets3/src/msw/panel.cpp
vendored
3
Externals/wxWidgets3/src/msw/panel.cpp
vendored
@ -3,7 +3,7 @@
|
||||
// Purpose: Implementation of wxMSW-specific wxPanel class.
|
||||
// Author: Vadim Zeitlin
|
||||
// Created: 2011-03-18
|
||||
// RCS-ID: $Id: panel.cpp 67253 2011-03-20 00:00:49Z VZ $
|
||||
// RCS-ID: $Id: panel.cpp 67269 2011-03-21 11:00:03Z VZ $
|
||||
// Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -24,6 +24,7 @@
|
||||
#endif
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/bitmap.h"
|
||||
#include "wx/brush.h"
|
||||
#include "wx/panel.h"
|
||||
#endif // WX_PRECOMP
|
||||
|
10
Externals/wxWidgets3/src/msw/regconf.cpp
vendored
10
Externals/wxWidgets3/src/msw/regconf.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 27.04.98
|
||||
// RCS-ID: $Id: regconf.cpp 61508 2009-07-23 20:30:22Z VZ $
|
||||
// RCS-ID: $Id: regconf.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@ -79,7 +79,7 @@ wxRegConfig::wxRegConfig(const wxString& appName, const wxString& vendorName,
|
||||
bool bDoUseGlobal = (style & wxCONFIG_USE_GLOBAL_FILE) != 0;
|
||||
|
||||
// the convention is to put the programs keys under <vendor>\<appname>
|
||||
// (but it can be overriden by specifying the pathes explicitly in strLocal
|
||||
// (but it can be overridden by specifying the pathes explicitly in strLocal
|
||||
// and/or strGlobal)
|
||||
if ( strLocal.empty() || (strGlobal.empty() && bDoUseGlobal) )
|
||||
{
|
||||
@ -563,7 +563,7 @@ bool wxRegConfig::DoReadString(const wxString& key, wxString *pStr) const
|
||||
bool bQueryGlobal = true;
|
||||
|
||||
// if immutable key exists in global key we must check that it's not
|
||||
// overriden by the local key with the same name
|
||||
// overridden by the local key with the same name
|
||||
if ( IsImmutable(path.Name()) ) {
|
||||
if ( TryGetValue(m_keyGlobal, path.Name(), *pStr) ) {
|
||||
if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) {
|
||||
@ -600,7 +600,7 @@ bool wxRegConfig::DoReadLong(const wxString& key, long *plResult) const
|
||||
bool bQueryGlobal = true;
|
||||
|
||||
// if immutable key exists in global key we must check that it's not
|
||||
// overriden by the local key with the same name
|
||||
// overridden by the local key with the same name
|
||||
if ( IsImmutable(path.Name()) ) {
|
||||
if ( TryGetValue(m_keyGlobal, path.Name(), plResult) ) {
|
||||
if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) {
|
||||
@ -634,7 +634,7 @@ bool wxRegConfig::DoReadBinary(const wxString& key, wxMemoryBuffer *buf) const
|
||||
bool bQueryGlobal = true;
|
||||
|
||||
// if immutable key exists in global key we must check that it's not
|
||||
// overriden by the local key with the same name
|
||||
// overridden by the local key with the same name
|
||||
if ( IsImmutable(path.Name()) ) {
|
||||
if ( TryGetValue(m_keyGlobal, path.Name(), *buf) ) {
|
||||
if ( m_keyLocal.Exists() && LocalKey().HasValue(path.Name()) ) {
|
||||
|
12
Externals/wxWidgets3/src/msw/thread.cpp
vendored
12
Externals/wxWidgets3/src/msw/thread.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Original from Wolfram Gloger/Guilhem Lavaux
|
||||
// Modified by: Vadim Zeitlin to make it work :-)
|
||||
// Created: 04/22/98
|
||||
// RCS-ID: $Id: thread.cpp 67185 2011-03-14 11:54:32Z VZ $
|
||||
// RCS-ID: $Id: thread.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Wolfram Gloger (1996, 1997), Guilhem Lavaux (1998);
|
||||
// Vadim Zeitlin (1999-2002)
|
||||
// Licence: wxWindows licence
|
||||
@ -546,7 +546,7 @@ THREAD_RETVAL wxThreadInternal::DoThreadStart(wxThread *thread)
|
||||
// store the thread object in the TLS
|
||||
if ( !::TlsSetValue(gs_tlsThisThread, thread) )
|
||||
{
|
||||
wxLogSysError(_("Can not start thread: error writing TLS."));
|
||||
wxLogSysError(_("Cannot start thread: error writing TLS."));
|
||||
|
||||
return THREAD_ERROR_EXIT;
|
||||
}
|
||||
@ -806,7 +806,7 @@ wxThreadInternal::WaitForTerminate(wxCriticalSection& cs,
|
||||
{
|
||||
case 0xFFFFFFFF:
|
||||
// error
|
||||
wxLogSysError(_("Can not wait for thread termination"));
|
||||
wxLogSysError(_("Cannot wait for thread termination"));
|
||||
Kill();
|
||||
return wxTHREAD_KILLED;
|
||||
|
||||
@ -883,7 +883,7 @@ bool wxThreadInternal::Suspend()
|
||||
DWORD nSuspendCount = ::SuspendThread(m_hThread);
|
||||
if ( nSuspendCount == (DWORD)-1 )
|
||||
{
|
||||
wxLogSysError(_("Can not suspend thread %x"), m_hThread);
|
||||
wxLogSysError(_("Cannot suspend thread %x"), m_hThread);
|
||||
|
||||
return false;
|
||||
}
|
||||
@ -898,7 +898,7 @@ bool wxThreadInternal::Resume()
|
||||
DWORD nSuspendCount = ::ResumeThread(m_hThread);
|
||||
if ( nSuspendCount == (DWORD)-1 )
|
||||
{
|
||||
wxLogSysError(_("Can not resume thread %x"), m_hThread);
|
||||
wxLogSysError(_("Cannot resume thread %x"), m_hThread);
|
||||
|
||||
return false;
|
||||
}
|
||||
@ -1264,7 +1264,7 @@ bool wxThreadModule::OnInit()
|
||||
::TlsFree(gs_tlsThisThread);
|
||||
gs_tlsThisThread = 0xFFFFFFFF;
|
||||
|
||||
wxLogSysError(_("Thread module initialization failed: can not store value in thread local storage"));
|
||||
wxLogSysError(_("Thread module initialization failed: cannot store value in thread local storage"));
|
||||
|
||||
return false;
|
||||
}
|
||||
|
6
Externals/wxWidgets3/src/msw/toolbar.cpp
vendored
6
Externals/wxWidgets3/src/msw/toolbar.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 04/01/98
|
||||
// RCS-ID: $Id: toolbar.cpp 67074 2011-02-27 15:09:13Z DS $
|
||||
// RCS-ID: $Id: toolbar.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -1296,7 +1296,7 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_)
|
||||
// Without the two lines of code below, if the toolbar was repainted during
|
||||
// OnLeftClick(), then it could end up without the tool bitmap temporarily
|
||||
// (see http://lists.nongnu.org/archive/html/lmi/2008-10/msg00014.html).
|
||||
// The Update() call bellow ensures that this won't happen, by repainting
|
||||
// The Update() call below ensures that this won't happen, by repainting
|
||||
// invalidated areas of the toolbar immediately.
|
||||
//
|
||||
// To complicate matters, the tool would be drawn in depressed state (this
|
||||
@ -1323,7 +1323,7 @@ bool wxToolBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_)
|
||||
::SendMessage(GetHwnd(), TB_SETSTATE, id, MAKELONG(state, 0));
|
||||
|
||||
// OnLeftClick() can veto the button state change - for buttons which
|
||||
// may be toggled only, of couse
|
||||
// may be toggled only, of course.
|
||||
if ( !allowLeftClick && tool->CanBeToggled() )
|
||||
{
|
||||
// revert back
|
||||
|
6
Externals/wxWidgets3/src/msw/treectrl.cpp
vendored
6
Externals/wxWidgets3/src/msw/treectrl.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by: Vadim Zeitlin to be less MSW-specific on 10.10.98
|
||||
// Created: 1997
|
||||
// RCS-ID: $Id: treectrl.cpp 66850 2011-02-06 01:00:48Z VZ $
|
||||
// RCS-ID: $Id: treectrl.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -77,7 +77,7 @@ typedef struct tagNMTVITEMCHANGE
|
||||
// The vista tree control includes some new code that originally broke the
|
||||
// multi-selection tree, causing seemingly spurious item selection state changes
|
||||
// during Shift or Ctrl-click item selection. (To witness the original broken
|
||||
// behavior, simply make IsLocked() below always return false). This problem was
|
||||
// behaviour, simply make IsLocked() below always return false). This problem was
|
||||
// solved by using the following class to 'unlock' an item's selection state.
|
||||
|
||||
class TreeItemUnlocker
|
||||
@ -3371,7 +3371,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
||||
// the wrong items are deselected.
|
||||
|
||||
// Fortunately, Vista provides a new notification, TVN_ITEMCHANGING
|
||||
// that can be used to regulate this incorrect behavior. The
|
||||
// that can be used to regulate this incorrect behaviour. The
|
||||
// following messages will allow only the unlocked item's selection
|
||||
// state to change
|
||||
|
||||
|
4
Externals/wxWidgets3/src/msw/utils.cpp
vendored
4
Externals/wxWidgets3/src/msw/utils.cpp
vendored
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 04/01/98
|
||||
// RCS-ID: $Id: utils.cpp 65746 2010-10-03 17:16:09Z VZ $
|
||||
// RCS-ID: $Id: utils.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -303,7 +303,7 @@ bool wxGetUserName(wxChar *buf, int maxSize)
|
||||
// Get the computer name of a DC for the domain.
|
||||
if ( NetGetDCName( NULL, wszDomain, &ComputerName ) != NERR_Success )
|
||||
{
|
||||
wxLogError(wxT("Can not find domain controller"));
|
||||
wxLogError(wxT("Cannot find domain controller"));
|
||||
|
||||
goto error;
|
||||
}
|
||||
|
@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
// Created: 2003-07-12
|
||||
// RCS-ID: $Id: tbarwce.cpp 61724 2009-08-21 10:41:26Z VZ $
|
||||
// RCS-ID: $Id: tbarwce.cpp 67280 2011-03-22 14:17:38Z DS $
|
||||
// Copyright: (c) Julian Smart
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -525,7 +525,7 @@ bool wxToolMenuBar::MSWCommand(WXUINT WXUNUSED(cmd), WXWORD id_)
|
||||
if ( !tool->CanBeToggled() || tool->GetKind() != wxITEM_RADIO || toggled )
|
||||
{
|
||||
// OnLeftClick() can veto the button state change - for buttons which
|
||||
// may be toggled only, of couse
|
||||
// may be toggled only, of course.
|
||||
if ( !OnLeftClick((int)id, toggled) && tool->CanBeToggled() )
|
||||
{
|
||||
// revert back
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user