Updated wxwidgets to 2.8.8 - should fix http://code.google.com/p/dolphin-emu/issues/detail?id=65 - thx to prismsub7

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@73 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
fires.gc 2008-07-23 23:30:11 +00:00
parent c469243372
commit 651fdfbdb7
287 changed files with 2968 additions and 1102 deletions

View File

@ -1,5 +1,5 @@
/* XPM */
static char *addbookm_xpm[] = {
static const char * addbookm_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
". c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char * back_xpm[] = {
static const char * back_xpm[] = {
"16 15 3 1",
" c None",
". c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *cdrom_xpm[] = {
static const char * cdrom_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 36 1",
"= c #9BACC2",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *copy_xpm[] = {
static const char * copy_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 23 1",
"o c #97C4E7",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *cross_xpm[] = {
static const char * cross_xpm[] = {
/* columns rows colors chars-per-pixel */
"10 10 2 1",
" c Gray0",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *cut_xpm[] = {
static const char * cut_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 25 1",
"6 c #D8BDC0",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *deffile_xpm[] = {
static const char * deffile_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 32 1",
"= c #97C4E7",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *delbookm_xpm[] = {
static const char * delbookm_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
". c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *delete_xpm[] = {
static const char * delete_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 21 1",
"2 c #A5AEBD",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *dir_up_xpm[] = {
static const char * dir_up_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 31 1",
"6 c #9BACC2",

View File

@ -1,5 +1,5 @@
/* XPM */
static char * down_xpm[] = {
static const char * down_xpm[] = {
"16 15 3 1",
" c None",
". c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *exefile_xpm[] = {
static const char * exefile_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 51 1",
"% c #E8E8EC",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *fileopen_xpm[] = {
static const char * fileopen_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 36 1",
"6 c #9BACC2",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *filesave_xpm[] = {
static const char * filesave_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 21 1",
"O c #FFFFFF",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *filesaveas_xpm[] = {
static const char * filesaveas_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 23 1",
"X c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *find_xpm[] = {
static const char * find_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 41 1",
"y c #A06959",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *findrepl_xpm[] = {
static const char * findrepl_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 42 1",
"y c #A06959",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *floppy_xpm[] = {
static const char * floppy_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 18 1",
"& c #E3E4E6",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *folder_xpm[] = {
static const char * folder_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 22 1",
"> c #9BACC2",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *folder_open_xpm[] = {
static const char * folder_open_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 31 1",
"6 c #9BACC2",

View File

@ -1,5 +1,5 @@
/* XPM */
static char * forward_xpm[] = {
static const char * forward_xpm[] = {
"16 15 3 1",
" c None",
". c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *error_xpm[] = {
static const char * error_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 4 1",
" c None",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *info_xpm[] = {
static const char * info_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"$ c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *question_xpm[] = {
static const char * question_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 21 1",
". c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *warning_xpm[] = {
static const char * warning_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"@ c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *harddisk_xpm[] = {
static const char * harddisk_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 39 1",
"7 c #E3E4E6",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *helpicon_xpm[] = {
static const char * helpicon_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 6 1",
" c Gray0",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *home_xpm[] = {
static const char * home_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
". c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char * htmbook_xpm[] = {
static const char * htmbook_xpm[] = {
"16 16 6 1",
" c None",
". c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char * htmfoldr_xpm[] = {
static const char * htmfoldr_xpm[] = {
"16 16 6 1",
" c None",
". c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char * htmoptns_xpm[] = {
static const char * htmoptns_xpm[] = {
"16 15 2 1",
" c None",
". c #000000",

View File

@ -1,5 +1,5 @@
/* XPM */
static char * htmpage_xpm[] = {
static const char * htmpage_xpm[] = {
"16 16 4 1",
" c None",
". c #808080",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *htmsidep_xpm[] = {
static const char * htmsidep_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 6 1",
". c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *listview_xpm[] = {
static const char * listview_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *missimg_xpm[] = {
static const char * missimg_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 5 1",
"X c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *error_xpm[] = {
static const char * error_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 4 1",
" c None",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *info_xpm[] = {
static const char * info_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"$ c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *question_xpm[] = {
static const char * question_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 21 1",
". c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *warning_xpm[] = {
static const char * warning_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"@ c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *new_xpm[] = {
static const char * new_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 29 1",
"* c #97C4E7",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *new_dir_xpm[] = {
static const char * new_dir_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 22 1",
"X c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *paste_xpm[] = {
static const char * paste_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 25 1",
"< c #FEECE4",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *print_xpm[] = {
static const char * print_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 39 1",
"< c #E3E4E6",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *quit_xpm[] = {
static const char * quit_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 69 1",
"@ c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *redo_xpm[] = {
static const char * redo_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 37 1",
"4 c #9BACC2",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *removable_xpm[] = {
static const char * removable_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 23 1",
"@ c #C3C3C4",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *repview_xpm[] = {
static const char * repview_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
" c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *tick_xpm[] = {
static const char * tick_xpm[] = {
/* columns rows colors chars-per-pixel */
"10 10 2 1",
". c Gray0",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *tipicon_xpm[] = {
static const char * tipicon_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 9 1",
"$ c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char * toparent_xpm[] = {
static const char * toparent_xpm[] = {
"16 15 3 1",
" c None",
". c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *undo_xpm[] = {
static const char * undo_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 37 1",
"4 c #9BACC2",

View File

@ -1,5 +1,5 @@
/* XPM */
static char * up_xpm[] = {
static const char * up_xpm[] = {
"16 15 3 1",
" c None",
". c Black",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *wxwin16x16_xpm[] = {
static const char * wxwin16x16_xpm[] = {
"16 16 6 1",
" c None",
". c #000000",

View File

@ -1,5 +1,5 @@
/* XPM */
static char *wxwin32x32_xpm[] = {
static const char * wxwin32x32_xpm[] = {
"32 32 6 1",
" c None",
". c #000000",

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Version="8,00"
Name="wxCore28"
ProjectGUID="{0318BA30-EF48-441A-9E10-DC85EFAE39F0}"
RootNamespace="wxCore"
@ -124,7 +124,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/EHsc "
Optimization="0"
AdditionalIncludeDirectories="..\..\Include;..\..\Include\msvc;..\..\..\zlib"
AdditionalIncludeDirectories="..\..\Include;..\..\Include\msvc;..\..\..\zlib;..\..\src\png"
PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__;wxUSE_BASE=0;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -282,7 +282,7 @@
AdditionalOptions="/EHsc "
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\Include;..\..\Include\msvc;..\..\..\zlib"
AdditionalIncludeDirectories="..\..\Include;..\..\Include\msvc;..\..\..\zlib;..\..\src\png"
PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;wxUSE_BASE=0;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
@ -439,7 +439,7 @@
AdditionalOptions="/EHsc "
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\Include;..\..\Include\msvc;..\..\..\zlib"
AdditionalIncludeDirectories="..\..\Include;..\..\Include\msvc;..\..\..\zlib;..\..\src\png"
PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;wxUSE_BASE=0;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
@ -16953,10 +16953,6 @@
<Filter
Name="Setup Headers"
>
<File
RelativePath="..\..\include\wx\univ\setup.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\setup.h"
>
@ -17021,6 +17017,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\include\wx\univ\setup.h"
>
</File>
</Filter>
<Filter
Name="MSW Headers"

View File

@ -4,7 +4,7 @@
// Author: Julian Smart, Robert Roebling, Vadim Zeitlin
// Modified by:
// Created: 31.05.01 (extracted from other files)
// RCS-ID: $Id: accel.h 49563 2007-10-31 20:46:21Z VZ $
// RCS-ID: $Id: accel.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -137,7 +137,7 @@ private:
wxMenuItem *m_item;
// for compatibility with old code, use accessors now!
friend class WXDLLEXPORT wxMenu;
friend class WXDLLIMPEXP_FWD_CORE wxMenu;
};
// ----------------------------------------------------------------------------

View File

@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by:
// Created: 2003-02-12
// RCS-ID: $Id: access.h 43047 2006-11-04 17:43:58Z VZ $
// RCS-ID: $Id: access.h 51246 2008-01-16 12:56:37Z VZ $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -224,10 +224,10 @@ typedef enum
// All functions return an indication of success, failure, or not implemented.
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxAccessible;
class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxPoint;
class WXDLLEXPORT wxRect;
class WXDLLIMPEXP_FWD_CORE wxAccessible;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxPoint;
class WXDLLIMPEXP_FWD_CORE wxRect;
class WXDLLEXPORT wxAccessibleBase : public wxObject
{
DECLARE_NO_COPY_CLASS(wxAccessibleBase)

View File

@ -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 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) Julian Smart and Guillermo Rodriguez Garcia
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -21,7 +21,7 @@
#include "wx/timer.h"
#include "wx/bitmap.h"
class WXDLLIMPEXP_ADV wxAnimation;
class WXDLLIMPEXP_FWD_ADV wxAnimation;
extern WXDLLIMPEXP_DATA_ADV(wxAnimation) wxNullAnimation;
extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxAnimationCtrlNameStr[];

View File

@ -5,7 +5,7 @@
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id: app.h 49804 2007-11-10 01:09:42Z VZ $
// RCS-ID: $Id: app.h 51592 2008-02-08 08:17:41Z VZ $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -609,9 +609,16 @@ protected:
// Force an exit from main loop
extern void WXDLLIMPEXP_BASE wxExit();
// avoid redeclaring this function here if it had been already declated by
// wx/utils.h, this results in warnings from g++ with -Wredundant-decls
#ifndef wx_YIELD_DECLARED
#define wx_YIELD_DECLARED
// Yield to other apps/messages
extern bool WXDLLIMPEXP_BASE wxYield();
#endif // wx_YIELD_DECLARED
// Yield to other apps/messages
extern void WXDLLIMPEXP_BASE wxWakeUpIdle();

View File

@ -4,7 +4,7 @@
// Author: Vaclav Slavik
// Modified by:
// Created: 18/03/2002
// RCS-ID: $Id: artprov.h 42713 2006-10-30 11:56:12Z ABX $
// RCS-ID: $Id: artprov.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) Vaclav Slavik
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -16,8 +16,8 @@
#include "wx/bitmap.h"
#include "wx/icon.h"
class WXDLLEXPORT wxArtProvidersList;
class WXDLLEXPORT wxArtProviderCache;
class WXDLLIMPEXP_FWD_CORE wxArtProvidersList;
class WXDLLIMPEXP_FWD_CORE wxArtProviderCache;
class wxArtProviderModule;
// ----------------------------------------------------------------------------

View File

@ -4,7 +4,7 @@
// Author: Benjamin I. Williams
// Modified by:
// Created: 2005-05-17
// RCS-ID: $Id: framemanager.h 49465 2007-10-26 19:06:57Z RD $
// RCS-ID: $Id: framemanager.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
// Licence: wxWindows Library Licence, Version 3.1
///////////////////////////////////////////////////////////////////////////////
@ -421,7 +421,7 @@ public:
class WXDLLIMPEXP_AUI wxAuiFloatingFrame;
class WXDLLIMPEXP_FWD_AUI wxAuiFloatingFrame;
class WXDLLIMPEXP_AUI wxAuiManager : public wxEvtHandler
{

View File

@ -4,7 +4,7 @@
// Author: Hans Van Leemputten
// Modified by: Benjamin I. Williams / Kirix Corporation
// Created: 29/07/2002
// RCS-ID: $Id: tabmdi.h 45498 2007-04-16 13:03:05Z VZ $
// RCS-ID: $Id: tabmdi.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) Hans Van Leemputten
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -28,9 +28,9 @@
// classes
//-----------------------------------------------------------------------------
class WXDLLIMPEXP_AUI wxAuiMDIParentFrame;
class WXDLLIMPEXP_AUI wxAuiMDIClientWindow;
class WXDLLIMPEXP_AUI wxAuiMDIChildFrame;
class WXDLLIMPEXP_FWD_AUI wxAuiMDIParentFrame;
class WXDLLIMPEXP_FWD_AUI wxAuiMDIClientWindow;
class WXDLLIMPEXP_FWD_AUI wxAuiMDIChildFrame;
//-----------------------------------------------------------------------------
// wxAuiMDIParentFrame

View File

@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 29.12.99
// RCS-ID: $Id: calctrl.h 35530 2005-09-17 20:56:29Z VZ $
// RCS-ID: $Id: calctrl.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -159,7 +159,7 @@ private:
// wxCalendarCtrl events
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_ADV wxCalendarCtrl;
class WXDLLIMPEXP_FWD_ADV wxCalendarCtrl;
class WXDLLIMPEXP_ADV wxCalendarEvent : public wxDateEvent
{

View File

@ -5,7 +5,7 @@
// Modified by:
// Created: 14/4/2006
// Copyright: (c) Vadim Zeitlin, Francesco Montorsi
// RCS-ID: $Id: clrpicker.h 41022 2006-09-05 21:02:27Z VZ $
// RCS-ID: $Id: clrpicker.h 53135 2008-04-12 02:31:04Z VZ $
// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
@ -20,7 +20,7 @@
#include "wx/pickerbase.h"
class WXDLLIMPEXP_CORE wxColourPickerEvent;
class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent;
extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerCtrlNameStr[];

View File

@ -4,7 +4,7 @@
// Author: Julian Smart and others
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id: cmndata.h 45498 2007-04-16 13:03:05Z VZ $
// RCS-ID: $Id: cmndata.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -23,7 +23,7 @@
#endif
class WXDLLEXPORT wxPrintNativeDataBase;
class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
class WXDLLEXPORT wxColourData: public wxObject

View File

@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by: Francesco Montorsi
// Created:
// RCS-ID: $Id: colour.h 45981 2007-05-11 22:41:50Z VZ $
// RCS-ID: $Id: colour.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -16,7 +16,7 @@
#include "wx/gdiobj.h"
class WXDLLEXPORT wxColour;
class WXDLLIMPEXP_FWD_CORE wxColour;
// the standard wxColour constructors;
// this macro avoids to repeat these lines across all colour.h files, since

View File

@ -2,11 +2,11 @@
// Name: confbase.h
// Purpose: declaration of the base class of all config implementations
// (see also: fileconf.h and msw/regconf.h and iniconf.h)
// Author: Karsten Ballüder & Vadim Zeitlin
// Author: Karsten Ballueder & Vadim Zeitlin
// Modified by:
// Created: 07.04.98 (adapted from appconf.h)
// RCS-ID: $Id: confbase.h 49563 2007-10-31 20:46:21Z VZ $
// Copyright: (c) 1997 Karsten Ballüder Ballueder@usa.net
// RCS-ID: $Id: confbase.h 50711 2007-12-15 02:57:58Z VZ $
// Copyright: (c) 1997 Karsten Ballueder Ballueder@usa.net
// Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////

View File

@ -5,7 +5,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 06.08.01
// RCS-ID: $Id: containr.h 49563 2007-10-31 20:46:21Z VZ $
// RCS-ID: $Id: containr.h 50863 2007-12-20 18:32:55Z VS $
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -126,6 +126,7 @@ void classname::SetFocusIgnoringChildren() \
void classname::OnChildFocus(wxChildFocusEvent& event) \
{ \
m_container.SetLastFocus(event.GetWindow()); \
event.Skip(); \
} \
\
void classname::OnFocus(wxFocusEvent& event) \

View File

@ -3,7 +3,7 @@
// Purpose: wrapper header for CppUnit headers
// Author: Vadim Zeitlin
// Created: 15.02.04
// RCS-ID: $Id: cppunit.h 49019 2007-10-02 14:56:53Z MW $
// RCS-ID: $Id: cppunit.h 53917 2008-06-01 20:32:26Z VZ $
// Copyright: (c) 2004 Vadim Zeitlin
// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
@ -87,6 +87,10 @@
// Use this macro to compare a size_t with a literal integer
#define WX_ASSERT_SIZET_EQUAL(n, m) CPPUNIT_ASSERT_EQUAL(((size_t)n), m)
// Use this macro to compare the expected time_t value with the result of not
// necessarily time_t type
#define WX_ASSERT_TIME_T_EQUAL(t, n) CPPUNIT_ASSERT_EQUAL((t), (time_t)(n))
///////////////////////////////////////////////////////////////////////////////
// stream inserter for wxString

View File

@ -4,7 +4,7 @@
// Author: Robert Roebling
// Modified by:
// Created: 08.01.06
// RCS-ID: $Id: dataview.h 42909 2006-11-01 15:24:48Z RR $
// RCS-ID: $Id: dataview.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -39,11 +39,11 @@
// wxDataViewCtrl globals
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_ADV wxDataViewModel;
class WXDLLIMPEXP_ADV wxDataViewListModel;
class WXDLLIMPEXP_ADV wxDataViewCtrl;
class WXDLLIMPEXP_ADV wxDataViewColumn;
class WXDLLIMPEXP_ADV wxDataViewRenderer;
class WXDLLIMPEXP_FWD_ADV wxDataViewModel;
class WXDLLIMPEXP_FWD_ADV wxDataViewListModel;
class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
class WXDLLIMPEXP_FWD_ADV wxDataViewColumn;
class WXDLLIMPEXP_FWD_ADV wxDataViewRenderer;
extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxDataViewCtrlNameStr[];

View File

@ -5,7 +5,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 10.02.99
// RCS-ID: $Id: datetime.h 48283 2007-08-21 12:14:26Z JS $
// RCS-ID: $Id: datetime.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -27,9 +27,9 @@
#include "wx/longlong.h"
class WXDLLIMPEXP_BASE wxDateTime;
class WXDLLIMPEXP_BASE wxTimeSpan;
class WXDLLIMPEXP_BASE wxDateSpan;
class WXDLLIMPEXP_FWD_BASE wxDateTime;
class WXDLLIMPEXP_FWD_BASE wxTimeSpan;
class WXDLLIMPEXP_FWD_BASE wxDateSpan;
#include "wx/dynarray.h"
@ -125,7 +125,7 @@ WXDLLIMPEXP_BASE struct tm *wxGmtime_r(const time_t*, struct tm*);
// argument for arguments of type wxDateTime; it is also returned by all
// functions returning wxDateTime on failure (this is why it is also called
// wxInvalidDateTime)
class WXDLLIMPEXP_BASE wxDateTime;
class WXDLLIMPEXP_FWD_BASE wxDateTime;
extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxDefaultDateTimeFormat;
extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxDefaultTimeSpanFormat;
@ -421,8 +421,21 @@ public:
{
public:
TimeZone(TZ tz);
// don't use this ctor, it doesn't work for negative offsets (but can't
// be removed or changed to avoid breaking ABI in 2.8)
TimeZone(wxDateTime_t offset = 0) { m_offset = offset; }
#if wxABI_VERSION >= 20808
// create time zone object with the given offset
static TimeZone Make(long offset)
{
TimeZone tz;
tz.m_offset = offset;
return tz;
}
#endif // wxABI 2.8.8+
long GetOffset() const { return m_offset; }
private:
@ -1494,7 +1507,7 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxDateTime, wxDateTimeArray, WXDLLIMPEXP_BASE)
// virtual methods to work with the holidays they correspond to.
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxDateTimeHolidayAuthority;
class WXDLLIMPEXP_FWD_BASE wxDateTimeHolidayAuthority;
WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxDateTimeHolidayAuthority *,
wxHolidayAuthoritiesArray,
class WXDLLIMPEXP_BASE);

View File

@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 05/25/99
// RCS-ID: $Id: dc.h 43745 2006-12-02 14:11:15Z VZ $
// RCS-ID: $Id: dc.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -30,8 +30,8 @@
#include "wx/dynarray.h"
#include "wx/math.h"
class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxDCBase;
class WXDLLIMPEXP_FWD_CORE wxDC;
class WXDLLIMPEXP_FWD_CORE wxDCBase;
class WXDLLEXPORT wxDrawObject
{

View File

@ -5,7 +5,7 @@
// Modified by:
// Created:
// Copyright: (c) Stefan Csomor
// RCS-ID: $Id: dcgraph.h 49295 2007-10-21 18:02:10Z SC $
// RCS-ID: $Id: dcgraph.h 53390 2008-04-28 04:19:15Z KO $
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////

View File

@ -5,7 +5,7 @@
// Modified by:
// Created:
// Copyright: (c) Julian Smart
// RCS-ID: $Id: dde.h 33948 2005-05-04 18:57:50Z JS $
// RCS-ID: $Id: dde.h 53135 2008-04-12 02:31:04Z VZ $
// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
@ -14,9 +14,9 @@
#include "wx/list.h"
class WXDLLIMPEXP_BASE wxDDEClient;
class WXDLLIMPEXP_BASE wxDDEServer;
class WXDLLIMPEXP_BASE wxDDEConnection;
class WXDLLIMPEXP_FWD_BASE wxDDEClient;
class WXDLLIMPEXP_FWD_BASE wxDDEServer;
class WXDLLIMPEXP_FWD_BASE wxDDEConnection;
WX_DECLARE_USER_EXPORTED_LIST(wxDDEClient, wxDDEClientList, WXDLLIMPEXP_BASE);
WX_DECLARE_USER_EXPORTED_LIST(wxDDEServer, wxDDEServerList, WXDLLIMPEXP_BASE);

View File

@ -4,7 +4,7 @@
* Author: Vadim Zeitlin
* Modified by: Ryan Norton (Converted to C)
* Created: 29/01/98
* RCS-ID: $Id: debug.h 39943 2006-07-02 21:40:38Z SN $
* RCS-ID: $Id: debug.h 53711 2008-05-22 22:58:28Z SN $
* Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
* Licence: wxWindows licence
*/
@ -210,7 +210,10 @@
wxFAIL_COND_MSG(#cond, msg); \
op; \
} \
struct wxDummyCheckStruct /* just to force a semicolon */
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... */
#endif
/* special form of wxCHECK2: as wxCHECK, but for use in void functions */

View File

@ -4,7 +4,7 @@
* Author: Julian Smart and others
* Modified by: Ryan Norton (Converted to C)
* Created: 01/02/97
* RCS-ID: $Id: defs.h 49612 2007-11-03 23:50:04Z VZ $
* RCS-ID: $Id: defs.h 53370 2008-04-26 05:43:41Z KO $
* Copyright: (c) Julian Smart
* Licence: wxWindows licence
*/
@ -1273,6 +1273,9 @@ enum wxStretch
wxEXPAND = wxGROW,
wxSHAPED = 0x4000,
wxFIXED_MINSIZE = 0x8000,
#if wxABI_VERSION >= 20808
wxRESERVE_SPACE_EVEN_IF_HIDDEN = 0x0002,
#endif
wxTILE = 0xc000,
/* for compatibility only, default now, don't use explicitly any more */
@ -2313,6 +2316,17 @@ enum wxUpdateUI
wxUPDATE_UI_FROMIDLE = 0x0002 /* Invoked from On(Internal)Idle */
};
/* ---------------------------------------------------------------------------- */
/* Notification Event flags - used for dock icon bouncing, etc. */
/* ---------------------------------------------------------------------------- */
enum wxNotificationOptions
{
wxNOTIFY_NONE = 0x0000,
wxNOTIFY_ONCE = 0x0001,
wxNOTIFY_REPEAT = 0x0002
};
/* ---------------------------------------------------------------------------- */
/* miscellaneous */
/* ---------------------------------------------------------------------------- */

View File

@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 08.12.99
// RCS-ID: $Id: dir.h 49563 2007-10-31 20:46:21Z VZ $
// RCS-ID: $Id: dir.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -78,7 +78,7 @@ public:
// wxDir: portable equivalent of {open/read/close}dir functions
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxDirData;
class WXDLLIMPEXP_FWD_BASE wxDirData;
class WXDLLIMPEXP_BASE wxDir
{

View File

@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id: docview.h 49563 2007-10-31 20:46:21Z VZ $
// RCS-ID: $Id: docview.h 53546 2008-05-10 21:02:36Z VZ $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -32,7 +32,7 @@ class WXDLLIMPEXP_FWD_CORE wxDocManager;
class WXDLLIMPEXP_FWD_CORE wxPrintInfo;
class WXDLLIMPEXP_FWD_CORE wxCommandProcessor;
class WXDLLIMPEXP_FWD_CORE wxFileHistory;
class WXDLLIMPEXP_FWD_CORE wxConfigBase;
class WXDLLIMPEXP_FWD_BASE wxConfigBase;
#if wxUSE_STD_IOSTREAM
#include "wx/iosfwrap.h"
@ -246,7 +246,7 @@ private:
class WXDLLEXPORT wxDocTemplate: public wxObject
{
friend class WXDLLEXPORT wxDocManager;
friend class WXDLLIMPEXP_FWD_CORE wxDocManager;
public:
// Associate document and view types. They're for identifying what view is
@ -408,8 +408,22 @@ public:
wxList& GetTemplates() { return m_templates; }
// Make a default document name
//
// NB: this method is renamed to MakeNewDocumentName() in wx 3.0, you still
// need to override it if your code needs to customize the default name
// generation but if you just use it from your code, prefer the version
// below which is forward-compatible with wx 3.0
virtual bool MakeDefaultName(wxString& buf);
#if wxABI_VERSION >= 20808
wxString MakeNewDocumentName() const
{
wxString s;
wx_const_cast(wxDocManager *, this)->MakeDefaultName(s);
return s;
}
#endif // wx ABI >= 2.8.8
// Make a frame title (override this to do something different)
virtual wxString MakeFrameTitle(wxDocument* doc);

View File

@ -4,7 +4,7 @@
// Author: Guilhem Lavaux, Vadim Zeitlin, Vaclav Slavik
// Modified by:
// Created: 20/07/98
// RCS-ID: $Id: dynlib.h 36214 2005-11-20 21:23:53Z VZ $
// RCS-ID: $Id: dynlib.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) 1998 Guilhem Lavaux
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -32,7 +32,7 @@
#define wxHAVE_DYNLIB_ERROR
#endif
class WXDLLIMPEXP_BASE wxDynamicLibraryDetailsCreator;
class WXDLLIMPEXP_FWD_BASE wxDynamicLibraryDetailsCreator;
// ----------------------------------------------------------------------------
// conditional compilation
@ -42,14 +42,15 @@ class WXDLLIMPEXP_BASE wxDynamicLibraryDetailsCreator;
// native version, even if configure detected presence of DLOPEN.
#if defined(__OS2__) || defined(__EMX__) || defined(__WINDOWS__)
typedef HMODULE wxDllType;
#elif defined(__DARWIN__)
// Don't include dlfcn.h on Darwin, we may be using our own replacements.
typedef void *wxDllType;
#elif defined(HAVE_DLOPEN)
#include <dlfcn.h>
typedef void *wxDllType;
#elif defined(HAVE_SHL_LOAD)
#include <dl.h>
typedef shl_t wxDllType;
#elif defined(__DARWIN__)
typedef void *wxDllType;
#elif defined(__WXMAC__)
#include <CodeFragments.h>
typedef CFragConnectionID wxDllType;

View File

@ -5,7 +5,7 @@
// (derived in part from dynlib.cpp (c) 1998 Guilhem Lavaux)
// Modified by:
// Created: 03/12/01
// RCS-ID: $Id: dynload.h 36973 2006-01-18 16:45:41Z JS $
// RCS-ID: $Id: dynload.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) 2001 Ron Lee <ron@debian.org>
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -25,7 +25,7 @@
#include "wx/hashmap.h"
#include "wx/module.h"
class WXDLLIMPEXP_BASE wxPluginLibrary;
class WXDLLIMPEXP_FWD_BASE wxPluginLibrary;
WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxPluginLibrary *, wxDLManifest,

View File

@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id: event.h 49563 2007-10-31 20:46:21Z VZ $
// RCS-ID: $Id: event.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -39,7 +39,7 @@ class WXDLLIMPEXP_FWD_BASE wxList;
class WXDLLIMPEXP_FWD_CORE wxWindowBase;
#endif // wxUSE_GUI
class WXDLLIMPEXP_BASE wxEvtHandler;
class WXDLLIMPEXP_FWD_BASE wxEvtHandler;
// ----------------------------------------------------------------------------
// Event types
@ -414,7 +414,7 @@ protected:
private:
// it needs to access our m_propagationLevel
friend class WXDLLIMPEXP_BASE wxPropagateOnce;
friend class WXDLLIMPEXP_FWD_BASE wxPropagateOnce;
DECLARE_ABSTRACT_CLASS(wxEvent)
};

View File

@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 01.06.01
// RCS-ID: $Id: evtloop.h 40865 2006-08-27 09:42:42Z VS $
// RCS-ID: $Id: evtloop.h 53607 2008-05-16 15:21:40Z SN $
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@ -14,7 +14,7 @@
#include "wx/utils.h"
class WXDLLEXPORT wxEventLoop;
class WXDLLIMPEXP_FWD_CORE wxEventLoop;
// ----------------------------------------------------------------------------
// wxEventLoop: a GUI event loop
@ -198,4 +198,32 @@ private:
wxEventLoop *m_evtLoopOld;
};
#if wxABI_VERSION >= 20808
class wxEventLoopGuarantor
{
public:
wxEventLoopGuarantor()
{
m_evtLoopNew = NULL;
if (!wxEventLoop::GetActive())
{
m_evtLoopNew = new wxEventLoop;
wxEventLoop::SetActive(m_evtLoopNew);
}
}
~wxEventLoopGuarantor()
{
if (m_evtLoopNew)
{
wxEventLoop::SetActive(NULL);
delete m_evtLoopNew;
}
}
private:
wxEventLoop *m_evtLoopNew;
};
#endif // wxABI_VERSION >= 20805
#endif // _WX_EVTLOOP_H_

View File

@ -18,10 +18,10 @@
#include "wx/dialog.h"
class WXDLLEXPORT wxFindDialogEvent;
class WXDLLEXPORT wxFindReplaceDialog;
class WXDLLEXPORT wxFindReplaceData;
class WXDLLEXPORT wxFindReplaceDialogImpl;
class WXDLLIMPEXP_FWD_CORE wxFindDialogEvent;
class WXDLLIMPEXP_FWD_CORE wxFindReplaceDialog;
class WXDLLIMPEXP_FWD_CORE wxFindReplaceData;
class WXDLLIMPEXP_FWD_CORE wxFindReplaceDialogImpl;
// ----------------------------------------------------------------------------
// Flags for wxFindReplaceData.Flags

View File

@ -4,8 +4,8 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 07.04.98 (adapted from appconf.cpp)
// RCS-ID: $Id: fileconf.h 49563 2007-10-31 20:46:21Z VZ $
// Copyright: (c) 1997 Karsten Ballüder & Vadim Zeitlin
// RCS-ID: $Id: fileconf.h 50711 2007-12-15 02:57:58Z VZ $
// Copyright: (c) 1997 Karsten Ballueder & Vadim Zeitlin
// Ballueder@usa.net <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////

View File

@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by:
// Created: 29/01/98
// RCS-ID: $Id: filefn.h 49998 2007-11-16 17:19:37Z CE $
// RCS-ID: $Id: filefn.h 53877 2008-05-31 12:43:44Z SN $
// Copyright: (c) 1998 Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -197,7 +197,7 @@ enum wxFileKind
// to avoid using them as they're not present in earlier versions and
// always using the native functions spelling is easier than testing for
// the versions
#if defined(__BORLANDC__) || defined(__DMC__) || defined(__WATCOMC__)
#if defined(__BORLANDC__) || defined(__DMC__) || defined(__WATCOMC__) || defined(__MINGW64__)
#define wxPOSIX_IDENT(func) ::func
#else // by default assume MSVC-compatible names
#define wxPOSIX_IDENT(func) _ ## func
@ -232,9 +232,16 @@ enum wxFileKind
#endif
#ifdef wxHAS_HUGE_FILES
#ifndef __MINGW64__
#define wxSeek wxPOSIX_IDENT(lseeki64)
#define wxLseek wxPOSIX_IDENT(lseeki64)
#define wxTell wxPOSIX_IDENT(telli64)
#else
// unfortunately, mingw-W64 is somewhat inconsistent...
#define wxSeek _lseeki64
#define wxLseek _lseeki64
#define wxTell _telli64
#endif
#else // !wxHAS_HUGE_FILES
#define wxSeek wxPOSIX_IDENT(lseek)
#define wxLseek wxPOSIX_IDENT(lseek)
@ -246,7 +253,10 @@ enum wxFileKind
// NB: this one is not POSIX and always has the underscore
#define wxFsync _commit
// could be already defined by configure (Cygwin)
#ifndef HAVE_FSYNC
#define HAVE_FSYNC
#endif
#endif // BORLANDC
#endif

View File

@ -3,7 +3,7 @@
// Purpose: class for opening files - virtual file system
// Author: Vaclav Slavik
// Copyright: (c) 1999 Vaclav Slavik
// RCS-ID: $Id: filesys.h 43263 2006-11-10 09:00:06Z MW $
// RCS-ID: $Id: filesys.h 53135 2008-04-12 02:31:04Z VZ $
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -27,9 +27,9 @@
#include "wx/filename.h"
#include "wx/hashmap.h"
class WXDLLIMPEXP_BASE wxFSFile;
class WXDLLIMPEXP_BASE wxFileSystemHandler;
class WXDLLIMPEXP_BASE wxFileSystem;
class WXDLLIMPEXP_FWD_BASE wxFSFile;
class WXDLLIMPEXP_FWD_BASE wxFileSystemHandler;
class WXDLLIMPEXP_FWD_BASE wxFileSystem;
//--------------------------------------------------------------------------------
// wxFSFile

View File

@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 20.09.99
// RCS-ID: $Id: font.h 49563 2007-10-31 20:46:21Z VZ $
// RCS-ID: $Id: font.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) wxWidgets team
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -105,7 +105,7 @@ enum
// wxFontBase represents a font object
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxNativeFontInfo;
class WXDLLIMPEXP_FWD_CORE wxNativeFontInfo;
class WXDLLEXPORT wxFontBase : public wxGDIObject
{

View File

@ -5,7 +5,7 @@
// Modified by:
// Created: 14/4/2006
// Copyright: (c) Francesco Montorsi
// RCS-ID: $Id: fontpicker.h 42999 2006-11-03 21:54:13Z VZ $
// RCS-ID: $Id: fontpicker.h 53135 2008-04-12 02:31:04Z VZ $
// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
@ -20,7 +20,7 @@
#include "wx/pickerbase.h"
class WXDLLIMPEXP_CORE wxFontPickerEvent;
class WXDLLIMPEXP_FWD_CORE wxFontPickerEvent;
extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerWidgetNameStr[];
extern WXDLLEXPORT_DATA(const wxChar) wxFontPickerCtrlNameStr[];

View File

@ -6,7 +6,7 @@
//
// Author: Robin Dunn
// Created: 03-Nov-2003
// RCS-ID: $Id: gbsizer.h 35650 2005-09-23 12:56:45Z MR $
// RCS-ID: $Id: gbsizer.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) Robin Dunn
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -79,7 +79,7 @@ extern WXDLLEXPORT_DATA(const wxGBSpan) wxDefaultSpan;
// wxGBSizerItem
//---------------------------------------------------------------------------
class WXDLLEXPORT wxGridBagSizer;
class WXDLLIMPEXP_FWD_CORE wxGridBagSizer;
class WXDLLEXPORT wxGBSizerItem : public wxSizerItem
@ -286,6 +286,9 @@ public:
protected:
wxGBPosition FindEmptyCell();
#if wxABI_VERSION >= 20808
void AdjustForOverflow();
#endif
wxSize m_emptyCellSize;

View File

@ -2,7 +2,7 @@
// Name: wx/generic/dataview.h
// Purpose: wxDataViewCtrl generic implementation header
// Author: Robert Roebling
// Id: $Id: dataview.h 41659 2006-10-06 09:50:45Z RR $
// Id: $Id: dataview.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -21,9 +21,9 @@
// classes
// ---------------------------------------------------------
class WXDLLIMPEXP_ADV wxDataViewCtrl;
class WXDLLIMPEXP_ADV wxDataViewMainWindow;
class WXDLLIMPEXP_ADV wxDataViewHeaderWindow;
class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
class WXDLLIMPEXP_FWD_ADV wxDataViewMainWindow;
class WXDLLIMPEXP_FWD_ADV wxDataViewHeaderWindow;
// ---------------------------------------------------------
// wxDataViewRenderer

View File

@ -7,7 +7,7 @@
// Author: Robert Roebling, Harm van der Heijden, Julian Smart et al
// Modified by:
// Created: 21/3/2000
// RCS-ID: $Id: dirctrlg.h 49804 2007-11-10 01:09:42Z VZ $
// RCS-ID: $Id: dirctrlg.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) Robert Roebling, Harm van der Heijden, Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -76,7 +76,7 @@ public:
// wxDirCtrl
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxDirFilterListCtrl;
class WXDLLIMPEXP_FWD_CORE wxDirFilterListCtrl;
class WXDLLEXPORT wxGenericDirCtrl: public wxControl
{

View File

@ -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 49804 2007-11-10 01:09:42Z VZ $
// RCS-ID: $Id: grid.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) Michael Bedward
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -51,6 +51,12 @@ extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxGridNameStr[];
#define wxGRID_VALUE_TEXT wxGRID_VALUE_STRING
#define wxGRID_VALUE_LONG wxGRID_VALUE_NUMBER
#if wxABI_VERSION >= 20808
// magic constant which tells (to some functions) to automatically
// calculate the appropriate size
#define wxGRID_AUTOSIZE (-1)
#endif // wxABI_VERSION >= 20808
// ----------------------------------------------------------------------------
// forward declarations
// ----------------------------------------------------------------------------
@ -1996,7 +2002,11 @@ protected:
bool GetModelValues();
bool SetModelValues();
friend class WXDLLIMPEXP_ADV wxGridSelection;
private:
// Calculate the minimum acceptable size for labels area
wxCoord CalcColOrRowLabelAreaMinSize(bool column /* or row? */);
friend class WXDLLIMPEXP_FWD_ADV wxGridSelection;
DECLARE_DYNAMIC_CLASS( wxGrid )
DECLARE_EVENT_TABLE()

View File

@ -1,10 +1,10 @@
/*-*- c++ -*-********************************************************
* helpext.h - an external help controller for wxWidgets *
* *
* (C) 1998 by Karsten Ballüder (Ballueder@usa.net) *
* (C) 1998 by Karsten Ballueder (Ballueder@usa.net) *
* License: wxWindows licence *
* *
* $Id: helpext.h 41020 2006-09-05 20:47:48Z VZ $
* $Id: helpext.h 50711 2007-12-15 02:57:58Z VZ $
*******************************************************************/
#ifndef __WX_HELPEXT_H_

View File

@ -1,11 +1,11 @@
////////////////////////////////////////////////////
// Name: progdlgg.h
// Purpose: wxProgressDialog class
// Author: Karsten Ballüder
// Author: Karsten Ballueder
// Modified by:
// Created: 09.05.1999
// RCS-ID: $Id: progdlgg.h 49563 2007-10-31 20:46:21Z VZ $
// Copyright: (c) Karsten Ballüder
// RCS-ID: $Id: progdlgg.h 50711 2007-12-15 02:57:58Z VZ $
// Copyright: (c) Karsten Ballueder
// Licence: wxWindows licence
////////////////////////////////////////////////////

View File

@ -4,7 +4,7 @@
// Author: Vadim Zeitlin
// Modified by:
// Created: 28.10.99
// RCS-ID: $Id: spinctlg.h 35650 2005-09-23 12:56:45Z MR $
// RCS-ID: $Id: spinctlg.h 52582 2008-03-17 13:46:31Z VZ $
// Copyright: (c) Vadim Zeitlin
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -74,6 +74,7 @@ public:
// forward these functions to all subcontrols
virtual bool Enable(bool enable = true);
virtual bool Show(bool show = true);
virtual bool Reparent(wxWindow *newParent);
// get the subcontrols
wxTextCtrl *GetText() const { return m_text; }

View File

@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by:
// Created: 28/6/2000
// RCS-ID: $Id: splash.h 41020 2006-09-05 20:47:48Z VZ $
// RCS-ID: $Id: splash.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) Julian Smart
// Licence: wxWindows Licence
/////////////////////////////////////////////////////////////////////////////
@ -27,7 +27,7 @@
#define wxSPLASH_TIMEOUT 0x04
#define wxSPLASH_NO_TIMEOUT 0x00
class WXDLLIMPEXP_ADV wxSplashScreenWindow;
class WXDLLIMPEXP_FWD_ADV wxSplashScreenWindow;
/*
* wxSplashScreen

View File

@ -4,7 +4,7 @@
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id: splitter.h 49563 2007-10-31 20:46:21Z VZ $
// RCS-ID: $Id: splitter.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -15,7 +15,7 @@
#include "wx/window.h" // base class declaration
#include "wx/containr.h" // wxControlContainer
class WXDLLEXPORT wxSplitterEvent;
class WXDLLIMPEXP_FWD_CORE wxSplitterEvent;
// ---------------------------------------------------------------------------
// splitter constants

View File

@ -3,7 +3,7 @@
// Purpose: generic wxSearchCtrl class
// Author: Vince Harron
// Created: 2006-02-19
// RCS-ID: $Id: srchctlg.h 45828 2007-05-05 14:51:51Z VZ $
// RCS-ID: $Id: srchctlg.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: Vince Harron
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -15,8 +15,8 @@
#include "wx/bitmap.h"
class WXDLLEXPORT wxSearchButton;
class WXDLLEXPORT wxSearchTextCtrl;
class WXDLLIMPEXP_FWD_CORE wxSearchButton;
class WXDLLIMPEXP_FWD_CORE wxSearchTextCtrl;
// ----------------------------------------------------------------------------
// wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton

View File

@ -4,7 +4,7 @@
// Author: Stefan Csomor
// Modified by:
// Created: 08/05/99
// RCS-ID: $Id: geometry.h 49294 2007-10-21 17:59:09Z SC $
// RCS-ID: $Id: geometry.h 53135 2008-04-12 02:31:04Z VZ $
// Copyright: (c) 1999 Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@ -20,8 +20,8 @@
#include "wx/gdicmn.h"
#include "wx/math.h"
class WXDLLIMPEXP_BASE wxDataInputStream;
class WXDLLIMPEXP_BASE wxDataOutputStream;
class WXDLLIMPEXP_FWD_BASE wxDataInputStream;
class WXDLLIMPEXP_FWD_BASE wxDataOutputStream;
// clipping from Cohen-Sutherland

View File

@ -5,13 +5,15 @@
// Modified by:
// Created:
// Copyright: (c) Stefan Csomor
// RCS-ID: $Id: graphics.h 49402 2007-10-24 14:48:10Z VZ $
// RCS-ID: $Id: graphics.h 50671 2007-12-12 20:19:36Z MR $
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_GRAPHICS_H_
#define _WX_GRAPHICS_H_
#include "wx/defs.h"
#if wxUSE_GRAPHICS_CONTEXT
#include "wx/geometry.h"

Some files were not shown because too many files have changed in this diff Show More