mirror of
https://github.com/izzy2lost/dolphin.git
synced 2026-06-19 01:16:48 -07:00
Update wxWidgets to 2.8.10. I thought this would fix an issue with something I was trying to add, but it doesn't. might as well update it anyways...See http://www.wxwidgets.org/downloads/ for changelog
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2686 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
+5
-5
@@ -3,7 +3,7 @@
|
||||
ProjectType="Visual C++"
|
||||
Version="9.00"
|
||||
Name="wxAdv28"
|
||||
ProjectGUID="{71B16F46-0B00-4EDA-B253-D6D9D03A215C}"
|
||||
ProjectGUID="{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}"
|
||||
RootNamespace="wxAdv28"
|
||||
TargetFrameworkVersion="0"
|
||||
>
|
||||
@@ -2125,10 +2125,6 @@
|
||||
<Filter
|
||||
Name="Setup Headers"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\univ\setup.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\setup.h"
|
||||
>
|
||||
@@ -2193,6 +2189,10 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\univ\setup.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="MSW Headers"
|
||||
|
||||
+5
-5
@@ -3,7 +3,7 @@
|
||||
ProjectType="Visual C++"
|
||||
Version="9.00"
|
||||
Name="wxBase28"
|
||||
ProjectGUID="{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}"
|
||||
ProjectGUID="{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}"
|
||||
RootNamespace="wxBase28"
|
||||
TargetFrameworkVersion="131072"
|
||||
>
|
||||
@@ -5734,10 +5734,6 @@
|
||||
<Filter
|
||||
Name="Setup Headers"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\univ\setup.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\setup.h"
|
||||
>
|
||||
@@ -5802,6 +5798,10 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\univ\setup.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="MSW Headers"
|
||||
|
||||
-6398
File diff suppressed because it is too large
Load Diff
+5
-5
@@ -3,7 +3,7 @@
|
||||
ProjectType="Visual C++"
|
||||
Version="9.00"
|
||||
Name="wxCore28"
|
||||
ProjectGUID="{0318BA30-EF48-441A-9E10-DC85EFAE39F0}"
|
||||
ProjectGUID="{11F55366-12EC-4C44-A8CB-1D4E315D61ED}"
|
||||
RootNamespace="wxCore"
|
||||
TargetFrameworkVersion="131072"
|
||||
>
|
||||
@@ -16956,6 +16956,10 @@
|
||||
<Filter
|
||||
Name="Setup Headers"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\univ\setup.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\msw\setup.h"
|
||||
>
|
||||
@@ -17020,10 +17024,6 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\univ\setup.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="MSW Headers"
|
||||
|
||||
-20128
File diff suppressed because it is too large
Load Diff
+7
-1
@@ -3,7 +3,7 @@
|
||||
// Purpose: declaration of wxAboutDialog class
|
||||
// Author: Vadim Zeitlin
|
||||
// Created: 2006-10-07
|
||||
// RCS-ID: $Id: aboutdlg.h 41813 2006-10-09 16:56:18Z RD $
|
||||
// RCS-ID: $Id: aboutdlg.h 58748 2009-02-08 09:46:03Z VZ $
|
||||
// Copyright: (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@@ -128,6 +128,12 @@ public:
|
||||
// artists and translators) as a one long multiline string
|
||||
wxString GetDescriptionAndCredits() const;
|
||||
|
||||
#if wxABI_VERSION >= 20810
|
||||
// returns the copyright with the (C) string substituted by the Unicode
|
||||
// character U+00A9
|
||||
wxString GetCopyrightToDisplay() const;
|
||||
#endif // wx 2.8.10+
|
||||
|
||||
private:
|
||||
wxString m_name,
|
||||
m_version,
|
||||
|
||||
+6
-1
@@ -4,7 +4,7 @@
|
||||
// Author: Mattia Barbon and Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 07/07/03
|
||||
// RCS-ID: $Id: arrstr.h 33888 2005-04-26 19:24:12Z MBN $
|
||||
// RCS-ID: $Id: arrstr.h 56758 2008-11-13 22:32:21Z VS $
|
||||
// Copyright: (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@@ -364,6 +364,11 @@ public:
|
||||
m_strings[i] = m_array[i];
|
||||
return m_strings;
|
||||
}
|
||||
|
||||
#if wxABI_VERSION >= 20810
|
||||
wxString* Release();
|
||||
#endif // wxABI_VERSION >= 20810
|
||||
|
||||
private:
|
||||
const wxArrayString& m_array;
|
||||
wxString* m_strings;
|
||||
|
||||
+5
-1
@@ -4,7 +4,7 @@
|
||||
// Author: Vaclav Slavik
|
||||
// Modified by:
|
||||
// Created: 18/03/2002
|
||||
// RCS-ID: $Id: artprov.h 53135 2008-04-12 02:31:04Z VZ $
|
||||
// RCS-ID: $Id: artprov.h 57701 2008-12-31 23:40:06Z VS $
|
||||
// Copyright: (c) Vaclav Slavik
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -122,6 +122,10 @@ public:
|
||||
|
||||
// Add new provider to the bottom of providers stack (i.e. the provider
|
||||
// will be queried as the last one).
|
||||
#if wxABI_VERSION >= 20810
|
||||
static void PushBack(wxArtProvider *provider);
|
||||
#endif
|
||||
// same as PushBack()
|
||||
static void Insert(wxArtProvider *provider);
|
||||
|
||||
// Remove latest added provider and delete it.
|
||||
|
||||
+2
-1
@@ -4,7 +4,7 @@
|
||||
// Author: Benjamin I. Williams
|
||||
// Modified by:
|
||||
// Created: 2005-05-17
|
||||
// RCS-ID: $Id: aui.h 40232 2006-07-22 13:14:07Z BIW $
|
||||
// RCS-ID: $Id: aui.h 55195 2008-08-23 06:31:01Z BIW $
|
||||
// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
|
||||
// Licence: wxWindows Library Licence, Version 3.1
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@@ -15,6 +15,7 @@
|
||||
#include "wx/aui/framemanager.h"
|
||||
#include "wx/aui/dockart.h"
|
||||
#include "wx/aui/floatpane.h"
|
||||
#include "wx/aui/auibar.h"
|
||||
#include "wx/aui/auibook.h"
|
||||
#include "wx/aui/tabmdi.h"
|
||||
|
||||
|
||||
+6
-4
@@ -469,15 +469,17 @@ protected:
|
||||
void OnRightDown(wxMouseEvent& evt);
|
||||
void OnRightUp(wxMouseEvent& evt);
|
||||
void OnLeftDClick(wxMouseEvent& evt);
|
||||
void OnSetFocus(wxFocusEvent& event);
|
||||
void OnKillFocus(wxFocusEvent& event);
|
||||
void OnChar(wxKeyEvent& event);
|
||||
void OnSetFocus(wxFocusEvent& evt);
|
||||
void OnKillFocus(wxFocusEvent& evt);
|
||||
void OnChar(wxKeyEvent& evt);
|
||||
#endif
|
||||
#if wxABI_VERSION >= 20809
|
||||
void OnCaptureLost(wxMouseCaptureLostEvent& evt);
|
||||
#endif
|
||||
void OnMotion(wxMouseEvent& evt);
|
||||
void OnLeaveWindow(wxMouseEvent& evt);
|
||||
void OnButton(wxAuiNotebookEvent& evt);
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
wxPoint m_click_pt;
|
||||
|
||||
+23
-18
@@ -4,7 +4,7 @@
|
||||
// Author: Benjamin I. Williams
|
||||
// Modified by:
|
||||
// Created: 2005-05-17
|
||||
// RCS-ID: $Id: framemanager.h 53135 2008-04-12 02:31:04Z VZ $
|
||||
// RCS-ID: $Id: framemanager.h 57885 2009-01-07 14:51:49Z JS $
|
||||
// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
|
||||
// Licence: wxWindows Library Licence, Version 3.1
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@@ -47,6 +47,7 @@ enum wxAuiManagerOption
|
||||
wxAUI_MGR_RECTANGLE_HINT = 1 << 5,
|
||||
wxAUI_MGR_HINT_FADE = 1 << 6,
|
||||
wxAUI_MGR_NO_VENETIAN_BLINDS_FADE = 1 << 7,
|
||||
wxAUI_MGR_LIVE_RESIZE = 1 << 8,
|
||||
|
||||
wxAUI_MGR_DEFAULT = wxAUI_MGR_ALLOW_FLOATING |
|
||||
wxAUI_MGR_TRANSPARENT_HINT |
|
||||
@@ -166,7 +167,7 @@ public:
|
||||
}
|
||||
|
||||
~wxAuiPaneInfo() {}
|
||||
|
||||
|
||||
#ifndef SWIG
|
||||
wxAuiPaneInfo(const wxAuiPaneInfo& c)
|
||||
{
|
||||
@@ -350,12 +351,12 @@ public:
|
||||
#ifdef SWIG
|
||||
%typemap(out) wxAuiPaneInfo& ;
|
||||
#endif
|
||||
|
||||
|
||||
public:
|
||||
|
||||
// NOTE: You can add and subtract flags from this list,
|
||||
// but do not change the values of the flags, because
|
||||
// they are stored in a binary integer format in the
|
||||
// they are stored in a binary integer format in the
|
||||
// perspective string. If you really need to change the
|
||||
// values around, you'll have to ensure backwards-compatibility
|
||||
// in the perspective loading code.
|
||||
@@ -384,11 +385,11 @@ public:
|
||||
buttonMaximize = 1 << 22,
|
||||
buttonMinimize = 1 << 23,
|
||||
buttonPin = 1 << 24,
|
||||
|
||||
|
||||
buttonCustom1 = 1 << 26,
|
||||
buttonCustom2 = 1 << 27,
|
||||
buttonCustom3 = 1 << 28,
|
||||
|
||||
|
||||
savedHiddenState = 1 << 30, // used internally
|
||||
actionPane = 1 << 31 // used internally
|
||||
};
|
||||
@@ -451,7 +452,7 @@ public:
|
||||
|
||||
bool AddPane(wxWindow* window,
|
||||
const wxAuiPaneInfo& pane_info);
|
||||
|
||||
|
||||
bool AddPane(wxWindow* window,
|
||||
const wxAuiPaneInfo& pane_info,
|
||||
const wxPoint& drop_pos);
|
||||
@@ -465,7 +466,7 @@ public:
|
||||
int insert_level = wxAUI_INSERT_PANE);
|
||||
|
||||
bool DetachPane(wxWindow* window);
|
||||
|
||||
|
||||
void Update();
|
||||
|
||||
wxString SavePaneInfo(wxAuiPaneInfo& pane);
|
||||
@@ -475,7 +476,7 @@ public:
|
||||
|
||||
void SetDockSizeConstraint(double width_pct, double height_pct);
|
||||
void GetDockSizeConstraint(double* width_pct, double* height_pct) const;
|
||||
|
||||
|
||||
void ClosePane(wxAuiPaneInfo& pane_info);
|
||||
void MaximizePane(wxAuiPaneInfo& pane_info);
|
||||
void RestorePane(wxAuiPaneInfo& pane_info);
|
||||
@@ -493,12 +494,12 @@ public:
|
||||
wxWindow* pane_window,
|
||||
const wxPoint& pt,
|
||||
const wxPoint& offset);
|
||||
|
||||
|
||||
void DrawHintRect(
|
||||
wxWindow* pane_window,
|
||||
const wxPoint& pt,
|
||||
const wxPoint& offset);
|
||||
|
||||
|
||||
virtual void ShowHint(const wxRect& rect);
|
||||
virtual void HideHint();
|
||||
|
||||
@@ -506,14 +507,14 @@ public:
|
||||
|
||||
// deprecated -- please use SetManagedWindow() and
|
||||
// and GetManagedWindow() instead
|
||||
|
||||
|
||||
wxDEPRECATED( void SetFrame(wxFrame* frame) );
|
||||
wxDEPRECATED( wxFrame* GetFrame() const );
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
void UpdateHintWindowConfig();
|
||||
|
||||
|
||||
void DoFrameLayout();
|
||||
|
||||
void LayoutAddPane(wxSizer* container,
|
||||
@@ -559,6 +560,10 @@ protected:
|
||||
wxArrayInt& positions,
|
||||
wxArrayInt& sizes);
|
||||
|
||||
#if wxABI_VERSION >= 20810
|
||||
/// Ends a resize action, or for live update, resizes the sash
|
||||
bool DoEndResizeAction(wxMouseEvent& event);
|
||||
#endif
|
||||
|
||||
public:
|
||||
|
||||
@@ -623,7 +628,7 @@ protected:
|
||||
wxTimer m_hint_fadetimer; // transparent fade timer
|
||||
wxByte m_hint_fadeamt; // transparent fade amount
|
||||
wxByte m_hint_fademax; // maximum value of hint fade
|
||||
|
||||
|
||||
void* m_reserved;
|
||||
|
||||
#ifndef SWIG
|
||||
@@ -665,17 +670,17 @@ public:
|
||||
void SetPane(wxAuiPaneInfo* p) { pane = p; }
|
||||
void SetButton(int b) { button = b; }
|
||||
void SetDC(wxDC* pdc) { dc = pdc; }
|
||||
|
||||
|
||||
wxAuiManager* GetManager() const { return manager; }
|
||||
wxAuiPaneInfo* GetPane() const { return pane; }
|
||||
int GetButton() const { return button; }
|
||||
wxDC* GetDC() const { return dc; }
|
||||
|
||||
|
||||
void Veto(bool veto = true) { veto_flag = veto; }
|
||||
bool GetVeto() const { return veto_flag; }
|
||||
void SetCanVeto(bool can_veto) { canveto_flag = can_veto; }
|
||||
bool CanVeto() const { return canveto_flag && veto_flag; }
|
||||
|
||||
|
||||
public:
|
||||
wxAuiManager* manager;
|
||||
wxAuiPaneInfo* pane;
|
||||
|
||||
+2
-2
@@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by: Wlodzimierz ABX Skiba from wx/listbook.h
|
||||
// Created: 15.09.04
|
||||
// RCS-ID: $Id: choicebk.h 49804 2007-11-10 01:09:42Z VZ $
|
||||
// RCS-ID: $Id: choicebk.h 56623 2008-10-31 23:07:49Z VZ $
|
||||
// Copyright: (c) Vadim Zeitlin, Wlodzimierz Skiba
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@@ -93,7 +93,7 @@ protected:
|
||||
|
||||
void UpdateSelectedPage(size_t newsel)
|
||||
{
|
||||
m_selection = newsel;
|
||||
m_selection = wx_static_cast(int, newsel);
|
||||
GetChoiceCtrl()->Select(newsel);
|
||||
}
|
||||
|
||||
|
||||
+2
-7
@@ -5,7 +5,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 10.02.99
|
||||
// RCS-ID: $Id: datetime.h 53135 2008-04-12 02:31:04Z VZ $
|
||||
// RCS-ID: $Id: datetime.h 57502 2008-12-22 19:52:20Z VZ $
|
||||
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -577,7 +577,7 @@ public:
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
// default ctor does not initialize the object, use Set()!
|
||||
wxDateTime() { m_time = wxLongLong((long)ULONG_MAX, ULONG_MAX); }
|
||||
wxDateTime() { m_time = wxLongLong((wxInt32)UINT_MAX, UINT_MAX); }
|
||||
|
||||
// from time_t: seconds since the Epoch 00:00:00 UTC, Jan 1, 1970)
|
||||
#if (!(defined(__VISAGECPP__) && __IBMCPP__ >= 400))
|
||||
@@ -1100,13 +1100,8 @@ public:
|
||||
// another one to get the current time broken down
|
||||
static struct tm *GetTmNow()
|
||||
{
|
||||
#ifdef __WXWINCE__
|
||||
static struct tm l_CurrentTime;
|
||||
return GetTmNow(&l_CurrentTime);
|
||||
#else
|
||||
time_t t = GetTimeNow();
|
||||
return localtime(&t);
|
||||
#endif
|
||||
}
|
||||
|
||||
// get current time using thread-safe function
|
||||
|
||||
Vendored
+10
-5
@@ -17,7 +17,7 @@
|
||||
// databases operate the same in that respect
|
||||
//
|
||||
// Created: 9.96
|
||||
// RCS-ID: $Id: db.h 45498 2007-04-16 13:03:05Z VZ $
|
||||
// RCS-ID: $Id: db.h 56697 2008-11-07 22:45:47Z VZ $
|
||||
// Copyright: (c) 1996 Remstar International, Inc.
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
@@ -78,10 +78,15 @@
|
||||
// defined in many other places on other systems (Motif, at least on
|
||||
// OpenVMS; Cocoa and X11) so prevent the problem by defining it before
|
||||
// including these headers
|
||||
#define BOOL int
|
||||
#include <sql.h>
|
||||
#include <sqlext.h>
|
||||
#undef BOOL
|
||||
#ifndef BOOL
|
||||
#define BOOL int
|
||||
#include <sql.h>
|
||||
#include <sqlext.h>
|
||||
#undef BOOL
|
||||
#else
|
||||
#include <sql.h>
|
||||
#include <sqlext.h>
|
||||
#endif
|
||||
#endif // wxUSE_BUILTIN_IODBC/!wxUSE_BUILTIN_IODBC
|
||||
}
|
||||
#endif
|
||||
|
||||
Vendored
+8
-2
@@ -4,7 +4,7 @@
|
||||
// Author: Vadim Zeitlin
|
||||
// Modified by:
|
||||
// Created: 05/25/99
|
||||
// RCS-ID: $Id: dc.h 53135 2008-04-12 02:31:04Z VZ $
|
||||
// RCS-ID: $Id: dc.h 55927 2008-09-28 09:12:16Z VS $
|
||||
// Copyright: (c) wxWidgets team
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -466,7 +466,6 @@ public:
|
||||
bool GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
|
||||
{ return DoGetPartialTextExtents(text, widths); }
|
||||
|
||||
|
||||
// size and resolution
|
||||
// -------------------
|
||||
|
||||
@@ -793,6 +792,13 @@ protected:
|
||||
virtual void DoDrawSpline(wxList *points);
|
||||
#endif
|
||||
|
||||
#if wxABI_VERSION >= 20810
|
||||
// returns adjustment factor for converting wxFont "point size"; in wx
|
||||
// it is point size on screen and needs to be multiplied by this value
|
||||
// for rendering on higher-resolution DCs such as printer ones
|
||||
static float GetFontPointSizeAdjustment(float dpi);
|
||||
#endif
|
||||
|
||||
protected:
|
||||
// unset clipping variables (after clipping region was destroyed)
|
||||
void ResetClipping()
|
||||
|
||||
+13
-5
@@ -4,7 +4,7 @@
|
||||
* Author: Vadim Zeitlin
|
||||
* Modified by: Ryan Norton (Converted to C)
|
||||
* Created: 29/01/98
|
||||
* RCS-ID: $Id: debug.h 53711 2008-05-22 22:58:28Z SN $
|
||||
* RCS-ID: $Id: debug.h 54492 2008-07-05 17:54:03Z SN $
|
||||
* Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
||||
* Licence: wxWindows licence
|
||||
*/
|
||||
@@ -190,6 +190,17 @@
|
||||
|
||||
/* as wxCHECK2 but with a message explaining why we fail */
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define wxFORCE_SEMICOLON typedef int wxDummyCheckInt
|
||||
/* Note: old gcc versions (e.g. 2.8) give an internal compiler error */
|
||||
/* on a simple forward declaration, when used in a template */
|
||||
/* function, so rather use a dummy typedef which does work... */
|
||||
#else
|
||||
#define wxFORCE_SEMICOLON struct wxDummyCheckStruct
|
||||
/* Note2: however, some other compilers (notably Digital Mars */
|
||||
/* don't like multiple typedefs (even though the standard */
|
||||
/* does allow them), so use a forward declaration for non-gcc. */
|
||||
#endif
|
||||
/* see comment near the definition of wxASSERT_MSG for the # if/else reason */
|
||||
#if defined(__MWERKS__)
|
||||
#define wxCHECK2_MSG(cond, op, msg) \
|
||||
@@ -210,10 +221,7 @@
|
||||
wxFAIL_COND_MSG(#cond, msg); \
|
||||
op; \
|
||||
} \
|
||||
typedef int wxDummyCheckInt /* just to force a semicolon */
|
||||
/* NB: old gcc versions (e.g. 2.8) give an internal compiler error */
|
||||
/* on a simple forward declaration, when used in a template */
|
||||
/* function, so rather use a dummy typedef which does work... */
|
||||
wxFORCE_SEMICOLON /* just to force a semicolon */
|
||||
#endif
|
||||
|
||||
/* special form of wxCHECK2: as wxCHECK, but for use in void functions */
|
||||
|
||||
+35
-1
@@ -4,7 +4,7 @@
|
||||
// Author: Guilhem Lavaux, Vadim Zeitlin, Vaclav Slavik
|
||||
// Modified by:
|
||||
// Created: 20/07/98
|
||||
// RCS-ID: $Id: dynlib.h 53135 2008-04-12 02:31:04Z VZ $
|
||||
// RCS-ID: $Id: dynlib.h 58750 2009-02-08 10:01:03Z VZ $
|
||||
// Copyright: (c) 1998 Guilhem Lavaux
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -76,6 +76,18 @@ enum wxDLFlags
|
||||
wxDL_NOSHARE = 0x00000010, // load new DLL, don't reuse already loaded
|
||||
// (only for wxPluginManager)
|
||||
|
||||
wxDL_QUIET = 0x00000020, // don't log an error if failed to load
|
||||
|
||||
#if wxABI_VERSION >= 20810
|
||||
// this flag is dangerous, for internal use of wxMSW only, don't use at all
|
||||
// and especially don't use directly, use wxLoadedDLL instead if you really
|
||||
// do need it
|
||||
wxDL_GET_LOADED = 0x00000040, // Win32 only: return handle of already
|
||||
// loaded DLL or NULL otherwise; Unload()
|
||||
// should not be called so don't forget to
|
||||
// Detach() if you use this function
|
||||
#endif // wx 2.8.10+
|
||||
|
||||
wxDL_DEFAULT = wxDL_NOW // default flags correspond to Win32
|
||||
};
|
||||
|
||||
@@ -309,6 +321,28 @@ protected:
|
||||
DECLARE_NO_COPY_CLASS(wxDynamicLibrary)
|
||||
};
|
||||
|
||||
#if defined(__WXMSW__) && wxABI_VERSION >= 20810
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxLoadedDLL is a MSW-only internal helper class allowing to dynamically bind
|
||||
// to a DLL already loaded into the project address space
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class wxLoadedDLL : public wxDynamicLibrary
|
||||
{
|
||||
public:
|
||||
wxLoadedDLL(const wxString& dllname)
|
||||
: wxDynamicLibrary(dllname, wxDL_GET_LOADED | wxDL_VERBATIM | wxDL_QUIET)
|
||||
{
|
||||
}
|
||||
|
||||
~wxLoadedDLL()
|
||||
{
|
||||
Detach();
|
||||
}
|
||||
};
|
||||
|
||||
#endif // __WXMSW__
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Interesting defines
|
||||
|
||||
+6
-1
@@ -4,7 +4,7 @@
|
||||
// Author: Julian Smart and Guillermo Rodriguez Garcia
|
||||
// Modified by: Francesco Montorsi
|
||||
// Created: 13/8/99
|
||||
// RCS-ID: $Id: animate.h 43898 2006-12-10 14:18:37Z VZ $
|
||||
// RCS-ID: $Id: animate.h 58350 2009-01-24 10:00:38Z FM $
|
||||
// Copyright: (c) Julian Smart and Guillermo Rodriguez Garcia
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -23,6 +23,11 @@ WX_DECLARE_LIST_WITH_DECL(wxAnimationDecoder, wxAnimationDecoderList, class WXDL
|
||||
class WXDLLIMPEXP_ADV wxAnimation : public wxAnimationBase
|
||||
{
|
||||
public:
|
||||
#if wxABI_VERSION >= 20810
|
||||
wxAnimation() {}
|
||||
wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY)
|
||||
{ LoadFile(name, type); }
|
||||
#endif
|
||||
virtual bool IsOk() const
|
||||
{ return m_refData != NULL; }
|
||||
|
||||
|
||||
+12
-2
@@ -5,7 +5,7 @@
|
||||
// Modified by:
|
||||
// Created: 14/4/2006
|
||||
// Copyright: (c) Vadim Zeitlin, Francesco Montorsi
|
||||
// RCS-ID: $Id: clrpickerg.h 40322 2006-07-25 11:41:53Z ABX $
|
||||
// RCS-ID: $Id: clrpickerg.h 58967 2009-02-17 13:31:28Z SC $
|
||||
// Licence: wxWindows Licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -25,8 +25,18 @@
|
||||
// the default style
|
||||
#define wxCLRBTN_DEFAULT_STYLE (wxCLRBTN_SHOW_LABEL)
|
||||
|
||||
#ifndef wxCLRBTN_USES_BMP_BUTTON
|
||||
#define wxCLRBTN_USES_BMP_BUTTON 0
|
||||
#endif
|
||||
|
||||
class WXDLLIMPEXP_CORE wxGenericColourButton : public wxButton,
|
||||
#if wxCLRBTN_USES_BMP_BUTTON
|
||||
#include "wx/bmpbutton.h"
|
||||
#define wxCLRBTN_BASE_CLASS wxBitmapButton
|
||||
#else
|
||||
#define wxCLRBTN_BASE_CLASS wxButton
|
||||
#endif
|
||||
|
||||
class WXDLLIMPEXP_CORE wxGenericColourButton : public wxCLRBTN_BASE_CLASS,
|
||||
public wxColourPickerWidgetBase
|
||||
{
|
||||
public:
|
||||
|
||||
+2
-2
@@ -4,7 +4,7 @@
|
||||
// Author: Michael Bedward (based on code by Julian Smart, Robin Dunn)
|
||||
// Modified by: Santiago Palacios
|
||||
// Created: 1/08/1999
|
||||
// RCS-ID: $Id: grid.h 53135 2008-04-12 02:31:04Z VZ $
|
||||
// RCS-ID: $Id: grid.h 55568 2008-09-12 12:49:11Z VZ $
|
||||
// Copyright: (c) Michael Bedward
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -2256,7 +2256,7 @@ typedef void (wxEvtHandler::*wxGridEditorCreatedEventFunction)(wxGridEditorCreat
|
||||
#define EVT_GRID_CMD_LABEL_RIGHT_DCLICK(id, fn) wx__DECLARE_GRIDEVT(LABEL_RIGHT_DCLICK, id, fn)
|
||||
#define EVT_GRID_CMD_ROW_SIZE(id, fn) wx__DECLARE_GRIDSIZEEVT(ROW_SIZE, id, fn)
|
||||
#define EVT_GRID_CMD_COL_SIZE(id, fn) wx__DECLARE_GRIDSIZEEVT(COL_SIZE, id, fn)
|
||||
#define EVT_GRID_CMD_COL_MOVE(id, fn) wx__DECLARE_GRIDSIZEEVT(COL_MOVE, id, fn)
|
||||
#define EVT_GRID_CMD_COL_MOVE(id, fn) wx__DECLARE_GRIDEVT(COL_MOVE, id, fn)
|
||||
#define EVT_GRID_CMD_RANGE_SELECT(id, fn) wx__DECLARE_GRIDRANGESELEVT(RANGE_SELECT, id, fn)
|
||||
#define EVT_GRID_CMD_CELL_CHANGE(id, fn) wx__DECLARE_GRIDEVT(CELL_CHANGE, id, fn)
|
||||
#define EVT_GRID_CMD_SELECT_CELL(id, fn) wx__DECLARE_GRIDEVT(SELECT_CELL, id, fn)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user