Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed WX_2_8_7 tag from revision 50130.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_8_7@52270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2008-03-02 23:50:09 +00:00
parent 51d8849f6e 54be106d59
commit b39e04b3b5
8372 changed files with 250 additions and 3102264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.in
View File

@@ -58,6 +58,7 @@ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
EXTRALIBS = @EXTRALIBS@
EXTRALIBS_XML = @EXTRALIBS_XML@
EXTRALIBS_HTML = @EXTRALIBS_HTML@
EXTRALIBS_MEDIA = @EXTRALIBS_MEDIA@
EXTRALIBS_ODBC = @EXTRALIBS_ODBC@
EXTRALIBS_GUI = @EXTRALIBS_GUI@
EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
@@ -11559,7 +11560,7 @@ distclean: clean
@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
@COND_MONOLITHIC_1_SHARED_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__monodll___win32rc)
@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_ODBC) $(PLUGIN_ADV_EXTRALIBS)
@COND_MONOLITHIC_1_SHARED_1@ $(SHARED_LD_CXX) $@ $(MONODLL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_XML) $(EXTRALIBS_HTML) $(EXTRALIBS_MEDIA) $(EXTRALIBS_ODBC) $(PLUGIN_ADV_EXTRALIBS)
@COND_MONOLITHIC_1_SHARED_1@
@COND_MONOLITHIC_1_SHARED_1@ $(__monodll___so_symlinks_cmd)
@@ -11729,7 +11730,7 @@ distclean: clean
@COND_USE_PCH_1@ $(BK_MAKE_PCH) .pch/wxprec_advlib/wx/wxprec.h.gch wx/wxprec.h $(CXX) $(ADVLIB_CXXFLAGS)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@$(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__mediadll___win32rc) $(__coredll___depname) $(__basedll___depname)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(SHARED_LD_CXX) $@ $(MEDIADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__mediadll___macinstnamecmd) $(__mediadll___importlib) $(__mediadll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(SHARED_LD_CXX) $@ $(MEDIADLL_OBJECTS) -L$(LIBDIRNAME) -L$(LIBDIRNAME) $(LDFLAGS) -L$(LIBDIRNAME) $(__mediadll___macinstnamecmd) $(__mediadll___importlib) $(__mediadll___soname_flags) $(WXMACVERSION_CMD) $(LIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) $(EXTRALIBS_MEDIA)
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@
@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1@ $(__mediadll___so_symlinks_cmd)

2
build/bakefiles/config.bkl
View File

@@ -339,6 +339,7 @@ to run the tests, include CppUnit library here.
<option name="EXTRALIBS"/>
<option name="EXTRALIBS_XML"/>
<option name="EXTRALIBS_HTML"/>
<option name="EXTRALIBS_MEDIA"/>
<option name="EXTRALIBS_ODBC"/>
<option name="EXTRALIBS_GUI"/>
<option name="EXTRALIBS_OPENGL"/>
@@ -390,6 +391,7 @@ it if SHARED=1 unless you know what you are doing.
<set var="EXTRALIBS"/>
<set var="EXTRALIBS_XML"/>
<set var="EXTRALIBS_HTML"/>
<set var="EXTRALIBS_MEDIA"/>
<set var="EXTRALIBS_ODBC"/>
<set var="EXTRALIBS_GUI"/>
<set var="EXTRALIBS_OPENGL">

1
build/bakefiles/monolithic.bkl
View File

@@ -19,6 +19,7 @@
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
<ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
<ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>

1
build/bakefiles/multilib.bkl
View File

@@ -107,6 +107,7 @@
<msvc-headers>$(MEDIA_HDR)</msvc-headers>
<library>coredll</library>
<library>basedll</library>
<ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
</dll>
<lib id="medialib" template="wx_lib"

1
build/bakefiles/wxwin.py
View File

@@ -51,6 +51,7 @@ EXTRALIBS = {
'html' : '$(EXTRALIBS_HTML)',
'odbc' : '$(EXTRALIBS_ODBC)',
'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
'media' : '$(EXTRALIBS_MEDIA)',
}
def mkLibName(wxid):

2
build/script/win_docs.bat
View File

@@ -1,5 +1,5 @@
rem Uncomment the next line to set the version; used also in wxWidgets.iss
SET WXW_VER=2.8.7-rc1
SET WXW_VER=2.8.7
if (%WXW_VER%)==() SET WXW_VER=CVS

9
configure vendored
View File

File diff suppressed because one or more lines are too long

4
configure.in
View File

@@ -7682,7 +7682,7 @@ if test "$wxUSE_MEDIACTRL" = "yes"; then
esac
CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
LIBS="$GST_LIBS $LIBS"
EXTRALIBS_MEDIA="$GST_LIBS"
AC_DEFINE(wxUSE_GSTREAMER)
else
@@ -7904,6 +7904,7 @@ LIBS=`echo $LIBS`
EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
EXTRALIBS_XML="$EXPAT_LINK"
EXTRALIBS_HTML="$MSPACK_LINK"
EXTRALIBS_MEDIA="$GST_LIBS"
EXTRALIBS_ODBC="$ODBC_LINK"
if test "$wxUSE_GUI" = "yes"; then
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
@@ -8011,6 +8012,7 @@ AC_SUBST(LIBS)
AC_SUBST(EXTRALIBS)
AC_SUBST(EXTRALIBS_XML)
AC_SUBST(EXTRALIBS_HTML)
AC_SUBST(EXTRALIBS_MEDIA)
AC_SUBST(EXTRALIBS_ODBC)
AC_SUBST(EXTRALIBS_GUI)
AC_SUBST(EXTRALIBS_OPENGL)

29
docs/changes.txt
View File

@@ -129,17 +129,22 @@ wxMac:
- Fixed 'Reopen' application behaviour (a window was not always shown when reopening the app).
2.8.6
2.8.8
-----
All:
- Fixed another bug in wxFileConfig when deleting entries (Axel Gembe)
- Added Portuguese translation (Antonio Cardoso Martins)
All (GUI):
- Added wxWindow::GetNextSibling() and GetPrevSibling()
All (Unix):
- Fixed shared libraries to not depend on GStreamer when built with
--enable-media; only wxMedia library depends on it now.
2.8.7
-----
- Added an optimization to UI updates on idle, by only updating when the window
is shown.
- Multiple centre panes in wxAUI can now be resized.
@@ -164,6 +169,16 @@ wxMac:
- Fixed a crash in wxToolBar when adding tools with non-standard sizes.
2.8.6
-----
All:
- Fixed another bug in wxFileConfig when deleting entries (Axel Gembe)
- Added Portuguese translation (Antonio Cardoso Martins)
2.8.5
-----

28
docs/latex/wx/window.tex
View File

@@ -1120,6 +1120,20 @@ name in the window constructor or via \helpref{wxWindow::SetName}{wxwindowsetnam
\helpref{wxWindow::SetName}{wxwindowsetname}
\membersection{wxWindow::GetNextSibling}\label{wxwindowgetnextsibling}
\constfunc{wxWindow *}{GetNextSibling}{\void}
Returns the next window after this one among the parent children or \NULL if
this window is the last child.
\newsince{2.8.8}
\wxheading{See also}
\helpref{GetPrevSibling}{wxwindowgetprevsibling}
\membersection{wxWindow::GetParent}\label{wxwindowgetparent}
\constfunc{virtual wxWindow*}{GetParent}{\void}
@@ -1166,6 +1180,20 @@ method:\par
\helpref{GetScreenPosition}{wxwindowgetscreenposition}
\membersection{wxWindow::GetPrevSibling}\label{wxwindowgetprevsibling}
\constfunc{wxWindow *}{GetPrevSibling}{\void}
Returns the previous window before this one among the parent children or \NULL if
this window is the first child.
\newsince{2.8.8}
\wxheading{See also}
\helpref{GetNextSibling}{wxwindowgetnextsibling}
\membersection{wxWindow::GetRect}\label{wxwindowgetrect}
\constfunc{virtual wxRect}{GetRect}{\void}

15
include/wx/window.h
View File

@@ -573,6 +573,13 @@ public:
// needed just for extended runtime
const wxWindowList& GetWindowChildren() const { return GetChildren() ; }
#if wxABI_VERSION >= 20808
// get the window before/after this one in the parents children list,
// returns NULL if this is the first/last window
wxWindow *GetPrevSibling() const { return DoGetSibling(MoveBefore); }
wxWindow *GetNextSibling() const { return DoGetSibling(MoveAfter); }
#endif // wx 2.8.8+
// get the parent or the parent of the parent
wxWindow *GetParent() const { return m_parent; }
inline wxWindow *GetGrandParent() const;
@@ -1141,12 +1148,18 @@ protected:
virtual bool TryValidator(wxEvent& event);
virtual bool TryParent(wxEvent& event);
// common part of MoveBefore/AfterInTabOrder()
enum MoveKind
{
MoveBefore, // insert before the given window
MoveAfter // insert after the given window
};
#if wxABI_VERSION >= 20808
// common part of GetPrev/NextSibling()
wxWindow *DoGetSibling(MoveKind order) const;
#endif // wx 2.8.8+
// common part of MoveBefore/AfterInTabOrder()
virtual void DoMoveInTabOrder(wxWindow *win, MoveKind move);
#if wxUSE_CONSTRAINTS

49
samples/combo/makefile.dmc
View File

@@ -1,49 +0,0 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.1 (http://bakefile.sourceforge.net)
# Do not modify, all changes will be overwritten!
# =========================================================================
include ../../build/msw/config.dmc
# -------------------------------------------------------------------------
# Do not modify the rest of this file!
# -------------------------------------------------------------------------
### Variables: ###
WX_RELEASE_NODOT = 28
OBJS = dmc_mswd$(CFG)
LIBTYPE_SUFFIX = lib
LIBDIRNAME = .\..\..\lib\dmc_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = $(LIBDIRNAME)\mswd
COMBO_CXXFLAGS = -g -o+none -D_WIN32_WINNT=0x0400 -D__WXMSW__ -D__WXDEBUG__ \
-I$(SETUPHDIR) -I.\..\..\include -w- -I. -WA -I.\..\..\samples -DNOPCH -Ar -Ae \
$(CPPFLAGS) $(CXXFLAGS)
COMBO_OBJECTS = \
$(OBJS)\combo_combo.obj
### Targets: ###
all : $(OBJS)\combo.exe data
clean :
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(OBJS)\*.sym del $(OBJS)\*.sym
-if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe
-if exist $(OBJS)\combo.map del $(OBJS)\combo.map
$(OBJS)\combo.exe : $(COMBO_OBJECTS) $(OBJS)\combo_sample.res
link /NOLOGO /SILENT /NOI /DELEXECUTABLE /EXETYPE:NT $(LDFLAGS) /DEBUG /CODEVIEW /su:windows:4.0 $(COMBO_OBJECTS),$@,$(OBJS)\combo.map, $(LIBDIRNAME)\ wxmsw$(WX_RELEASE_NODOT)d$(WX_LIB_FLAVOUR)_adv.lib wxmsw$(WX_RELEASE_NODOT)d$(WX_LIB_FLAVOUR)_core.lib wxbase$(WX_RELEASE_NODOT)d$(WX_LIB_FLAVOUR).lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib,, $(OBJS)\combo_sample.res
data :
if not exist $(OBJS) mkdir $(OBJS)
for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
$(OBJS)\combo_sample.res : .\..\..\samples\sample.rc
rcc .\..\..\samples\sample.rc -o$@ -D_WIN32_WINNT=0x0400 -D__WXMSW__ -D__WXDEBUG__ -I$(SETUPHDIR) -I.\..\..\include -I. -I.\..\..\samples -32 -v-
$(OBJS)\combo_combo.obj : .\combo.cpp
$(CXX) -mn -c -cpp -o$@ $(COMBO_CXXFLAGS) .\combo.cpp

21
src/common/wincmn.cpp
View File

@@ -2617,6 +2617,27 @@ bool wxWindowBase::TryParent(wxEvent& event)
return wxEvtHandler::TryParent(event);
}
// ----------------------------------------------------------------------------
// window relationships
// ----------------------------------------------------------------------------
wxWindow *wxWindowBase::DoGetSibling(MoveKind order) const
{
wxCHECK_MSG( GetParent(), NULL,
_T("GetPrev/NextSibling() don't work for TLWs!") );
wxWindowList& siblings = GetParent()->GetChildren();
wxWindowList::compatibility_iterator i = siblings.Find(this);
wxCHECK_MSG( i, NULL, _T("window not a child of its parent?") );
if ( order == MoveBefore )
i = i->GetPrevious();
else // MoveAfter
i = i->GetNext();
return i ? i->GetData() : NULL;
}
// ----------------------------------------------------------------------------
// keyboard navigation
// ----------------------------------------------------------------------------

4
src/generic/grid.cpp
View File

@@ -6246,7 +6246,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
if ( CanDragRowSize() && CanDragGridSize() )
ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW);
ChangeCursorMode(WXGRID_CURSOR_RESIZE_ROW, NULL, false);
}
}
else if ( dragCol >= 0 )
@@ -6256,7 +6256,7 @@ void wxGrid::ProcessGridCellMouseEvent( wxMouseEvent& event )
if ( m_cursorMode == WXGRID_CURSOR_SELECT_CELL )
{
if ( CanDragColSize() && CanDragGridSize() )
ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL);
ChangeCursorMode(WXGRID_CURSOR_RESIZE_COL, NULL, false);
}
}
else // Neither on a row or col edge

2
src/html/helpdlg.cpp
View File

@@ -88,7 +88,7 @@ bool wxHtmlHelpDialog::Create(wxWindow* parent, wxWindowID id,
item4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxButton* item6 = new wxButton(item1, wxID_OK, _("&Close"), wxDefaultPosition, wxDefaultSize, 0);
wxButton* item6 = new wxButton(item1, wxID_OK, _("Close"), wxDefaultPosition, wxDefaultSize, 0);
item4->Add(item6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 10);
#ifdef __WXMAC__
// Add some space for the resize handle

2
src/html/m_tables.cpp
View File

@@ -680,7 +680,7 @@ TAG_HANDLER_BEGIN(TABLE, "TABLE,TR,TD,TH")
oldcont = c = m_WParser->OpenContainer();
m_Table = new wxHtmlTableCell(c, tag);
m_Table = new wxHtmlTableCell(c, tag, m_WParser->GetPixelScale());
// width:
{

11
src/mac/carbon/utils.cpp
View File

@@ -2269,9 +2269,18 @@ void wxMacDataItemBrowserControl::MacScrollTo( unsigned int n )
GetScrollPosition( &top , &left ) ;
wxMacDataItem * item = (wxMacDataItem*) GetItemFromLine( n );
// there is a bug in RevealItem that leads to situations
// in large lists, where the item does not get scrolled
// into sight, so we do a pre-scroll if necessary
UInt16 height ;
GetRowHeight( (DataBrowserItemID) item , &height ) ;
SetScrollPosition( n * ((UInt32)height) , left ) ;
UInt32 linetop = n * ((UInt32) height );
UInt32 linebottom = linetop + height;
Rect rect ;
GetRect( &rect );
if ( linetop < top || linebottom > (top + rect.bottom - rect.top ) )
SetScrollPosition( wxMax( n-2, 0 ) * ((UInt32)height) , left ) ;
RevealItem( item , kDataBrowserRevealWithoutSelecting );
}

139
src/mac/carbon/window.cpp
View File

@@ -162,6 +162,12 @@ enum
};
#endif
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
enum {
kEventControlFocusPartChanged = 164
};
#endif
#endif
static const EventTypeSpec eventList[] =
@@ -185,6 +191,7 @@ static const EventTypeSpec eventList[] =
{ kEventClassControl , kEventControlDeactivate } ,
#endif
{ kEventClassControl , kEventControlSetFocusPart } ,
{ kEventClassControl , kEventControlFocusPartChanged } ,
{ kEventClassService , kEventServiceGetTypes },
{ kEventClassService , kEventServiceCopy },
@@ -325,28 +332,27 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
break ;
#endif // TARGET_API_MAC_OSX
// we emulate this event under Carbon CFM
case kEventControlSetFocusPart :
//
// focus handling
// different handling on OS X
//
case kEventControlFocusPartChanged :
// the event is emulated by wxmac for systems lower than 10.5
{
Boolean focusEverything = false ;
ControlPartCode controlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
#ifdef __WXMAC_OSX__
if ( cEvent.GetParameter<Boolean>(kEventParamControlFocusEverything , &focusEverything ) == noErr )
{
}
#endif
if ( thisWindow->MacIsUserPane() )
result = noErr ;
if ( controlPart == kControlFocusNoPart )
ControlPartCode previousControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPreviousPart , typeControlPartCode );
ControlPartCode currentControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlCurrentPart , typeControlPartCode );
if ( currentControlPart == 0 )
{
// kill focus
#if wxUSE_CARET
if ( thisWindow->GetCaret() )
thisWindow->GetCaret()->OnKillFocus();
#endif
wxLogTrace(_T("Focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow));
// remove this as soon as posting the synthesized event works properly
static bool inKillFocusEvent = false ;
if ( !inKillFocusEvent )
@@ -358,9 +364,11 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
inKillFocusEvent = false ;
}
}
else
else if ( previousControlPart == 0 )
{
// set focus
// panel wants to track the window which was the last to have focus in it
wxLogTrace(_T("Focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow));
wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
thisWindow->GetEventHandler()->ProcessEvent(eventFocus);
@@ -374,6 +382,96 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
thisWindow->GetEventHandler()->ProcessEvent(event) ;
}
}
break;
case kEventControlSetFocusPart :
{
#ifdef __WXMAC_OSX__
Boolean focusEverything = false ;
if ( cEvent.GetParameter<Boolean>(kEventParamControlFocusEverything , &focusEverything ) == noErr )
{
// put a breakpoint here to catch focus everything events
}
#endif
ControlPartCode controlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
ControlPartCode previousControlPart = 0;
verify_noerr( HIViewGetFocusPart(controlRef, &previousControlPart));
if ( thisWindow->MacIsUserPane() )
{
if ( controlPart != kControlFocusNoPart )
cEvent.SetParameter<ControlPartCode>( kEventParamControlPart, typeControlPartCode, 1 ) ;
result = noErr ;
}
else
result = CallNextEventHandler(handler, event);
if ( UMAGetSystemVersion() < 0x1050 )
{
// set back to 0 if problems arise
#if 1
ControlPartCode currentControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
// synthesize the event focus changed event
EventRef evRef = NULL ;
OSStatus err = MacCreateEvent(
NULL , kEventClassControl , kEventControlFocusPartChanged , TicksToEventTime( TickCount() ) ,
kEventAttributeUserEvent , &evRef );
verify_noerr( err );
wxMacCarbonEvent iEvent( evRef ) ;
iEvent.SetParameter<ControlRef>( kEventParamDirectObject , controlRef ) ;
iEvent.SetParameter<ControlPartCode>( kEventParamControlPreviousPart, typeControlPartCode, previousControlPart ) ;
iEvent.SetParameter<ControlPartCode>( kEventParamControlCurrentPart, typeControlPartCode, currentControlPart ) ;
#if 0
// TODO test this first, avoid double posts etc...
PostEventToQueue( GetMainEventQueue(), evRef , kEventPriorityHigh );
#else
wxMacWindowControlEventHandler( NULL , evRef , data ) ;
#endif
ReleaseEvent( evRef ) ;
#else
// old implementation, to be removed if the new one works
if ( controlPart == kControlFocusNoPart )
{
#if wxUSE_CARET
if ( thisWindow->GetCaret() )
thisWindow->GetCaret()->OnKillFocus();
#endif
wxLogTrace(_T("Focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow));
static bool inKillFocusEvent = false ;
if ( !inKillFocusEvent )
{
inKillFocusEvent = true ;
wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
event.SetEventObject(thisWindow);
thisWindow->GetEventHandler()->ProcessEvent(event) ;
inKillFocusEvent = false ;
}
}
else
{
// panel wants to track the window which was the last to have focus in it
wxLogTrace(_T("Focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow));
wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
thisWindow->GetEventHandler()->ProcessEvent(eventFocus);
#if wxUSE_CARET
if ( thisWindow->GetCaret() )
thisWindow->GetCaret()->OnSetFocus();
#endif
wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
event.SetEventObject(thisWindow);
thisWindow->GetEventHandler()->ProcessEvent(event) ;
}
#endif
}
}
break ;
case kEventControlHit :
@@ -1269,11 +1367,15 @@ void wxWindowMac::SetFocus()
// as we cannot rely on the control features to find out whether we are in full keyboard mode,
// we can only leave in case of an error
wxLogTrace(_T("Focus"), _T("SetFocus(%p)"), wx_static_cast(void*, this));
OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ;
if ( err == errCouldntSetFocus )
return ;
SetUserFocusWindow( (WindowRef)MacGetTopLevelWindowRef() );
if ( GetUserFocusWindow() != (WindowRef)MacGetTopLevelWindowRef() )
SetUserFocusWindow( (WindowRef)MacGetTopLevelWindowRef() );
#if !TARGET_API_MAC_OSX
// emulate carbon events when running under CarbonLib where they are not natively available
@@ -2731,6 +2833,9 @@ wxWindow *wxWindowBase::DoFindFocus()
{
ControlRef control ;
GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
wxLogTrace(_T("Focus"), _T("FindFocus(windowref=%p, peer =%p, wxwindow = %p)"),
wx_static_cast(void*, GetUserFocusWindow()), wx_static_cast(void*, control)
, wx_static_cast(void*, wxFindControlFromMacControl( control )));
return (wxWindow*)wxFindControlFromMacControl( control ) ;
}

10
version-script.in
View File

@@ -24,11 +24,17 @@
# and once released its version cannot be changed.
# public symbols added in 2.8.8 (please keep in alphabetical order):
@WX_VERSION_TAG@.8 {
global:
*wxWindowBase*Get*Sibling*;
};
# public symbols added in 2.8.7 (please keep in alphabetical order):
@WX_VERSION_TAG@.7 {
global:
*wxStaticBox*AcceptsFocus*;
*wxAuiPaneInfo*DockFixed*;
*wxStaticBox*AcceptsFocus*;
*wxAuiPaneInfo*DockFixed*;
};
# public symbols added in 2.8.5 (please keep in alphabetical order):

12
wxWidgets/.cvsignore
View File

@@ -1,12 +0,0 @@
.gdb_history
config.cache
configarg.cache
config.status
wx-config
config.log
stamp-h.in
Makefile
setup.h
*tags
.DS_Store
autom4te.cache

262
wxWidgets/BuildCVS.txt
View File

@@ -1,262 +0,0 @@
------------------------------------------------------------------------
How to build the sources from CVS
------------------------------------------------------------------------
Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac
etc. alongside these instructions.
I) Windows using plain makefiles
----------------------------------------
a) If using Microsoft Visual C++ 5.0 or 6.0
Ensure that the command-line compiler and tools (including
nmake) are installed and ready to run. Depending on your
installation there may be a batch file (commonly named VCVARS32.BAT)
that needs to be run to set correct environment variables and PATH entries.
Continue with item c) below.
b) If using the MinGW or Cygwin compilers
You can get MinGW from http://www.mingw.org/
Cygwin is available at http://www.cygwin.com/
If you are using Cygwin or MinGW together with the MSYS environment, you
can build the library using configure (see "Unix ports" and
"Windows using configure" below). You can also
build wxWidgets without configure using native makefile, but only with
MinGW. Using Cygwin together with Windows makefile is no longer supported.
If building with MinGW without configure:
-> Set your path so that it includes the directory
where your compiler and tools reside
-> Make sure you have GNU Make installed. It must be Windows native version.
Download it from http://www.mingw.org, the executable will be called
mingw32-make.exe.
-> Modern version of MinGW is required; preferably MinGW 2.0 (with gcc3),
but MinGW with gcc-2.95.3 will suffice. If you are using 2.95, you will
have to change variable GCC_VERSION in config.gcc (see msw/install.txt
for details).
If using configure, Unix instructions apply.
c) Build instructions
Assumming that you installed the wxWidgets sources
into c:\wxWidgets:
-> Copy c:\wxWidgets\include\wx\msw\setup0.h
to c:\wxWidgets\include\wx\msw\setup.h
-> Edit c:\wxWidgets\include\wx\msw\setup.h to choose
the features you would like to compile wxWidgets with[out].
and std iostreams are disabled with
#define wxUSE_STD_IOSTREAM 0
-> type: cd c:\wxWidgets\build\msw
-> type: make -f makefile.gcc (if using GNU tools)
or type: nmake -f makefile.vc (if using MS VC++)
etc.
See also docs/msw/install.txt for additional compilation options.
d) Borland (including free command line tools)
Download tools from http://www.borland.com/downloads/
See docs/msw/install.txt for details; in brief:
-> type cd c:\wxWidgets\build\msw
-> type make -f makefile.bcc
You can customize many things in the build process, detailed description is
in docs/msw/install.txt.
II) Unix ports
--------------
Building wxGTK or wxMotif completely without configure
won't ever work, but there is now a new makefile system
that works without libtool and automake, using only
configure to create what is needed.
In order to create configure, you need to have the
GNU autoconf package (version > 2.54) installed
on your system and type run "autoconf" in the base
directory (or run the autogen.sh script in the same
directory, which just calls autoconf). Note that you usually don't
need to do this because configure is included in CVS.
Set WXWIN environment variable to the base directory such
as ~/wxWidgets (this is actually not really needed).
-> type: export WXWIN=~/wxWidgets
-> type: md mybuild
-> type: cd mybuild
-> type: ../configure --with-motif
or type: ../configure --with-gtk
-> type: make
-> type: su <type root password>
-> type: make install
-> type: ldconfig
-> type: exit
Call configure with --disable-shared to create a static
library. Calling "make uninstall" will remove the installed
library and "make dist" will create a distribution (not
yet complete).
III) Windows using configure
----------------------------------------
wxWidgets can be built on Windows using MSYS (see
http://www.mingw.org/), which is a POSIX build environment
for Windows. With MSYS you can just ./configure && make (see also VII,
Unix->Windows cross-compiling using configure).
Of course, you can also build the library using plain makefiles (see
section I).
IV) Classic MacOS using CodeWarrior (eg MacOS 8.x/9.x)
----------------------------------------
Refer to the readme.txt and install.txt files in docs/mac to build
wxWidgets under Classic Mac OS using CodeWarrior.
If you are checking out the CVS sources using cvs under Mac OS X and
compiling under Classic Mac OS:
- make sure that all text files have a Mac OS type of 'TEXT' otherwise
CodeWarrior may ignore them. Checking out the CVS sources using cvs
under Mac OS X creates untyped files which can lead to compilation
errors under CodeWarrior which are hard to track down.
- convert the xml files to CodeWarrior binary projects using the supplied
AppleScript in docs/mac (M5xml2mcp.applescript for CodeWarrior 5.3)
V) MacOS X using configure and the Developer Tools
----------------------------------------
You need to have the Developer Tools installed. If this is not the case,
you will need to register at the Apple Developer web site (this is a free
registration) in order to download the Developer Tools installer.
In order to create configure, you need to have the
GNU autoconf package (version >= 2.54) installed
on your system and type run "autoconf" in the base
directory (or run the autogen.sh script in the same
directory, which just calls autoconf).
-> type: mkdir macbuild
-> type: cd macbuild
-> type: ../configure --with-mac
or type: ../configure
-> type: make
VI) OS/2
----------------------------------------
No notes.
VII) Unix->Windows cross-compiling using configure
--------------------------------------------------
First you'll need a cross-compiler; linux glibc binaries of MinGW and
Cygwin (both based on egcs) can be found at
ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries,
based on the latest MinGW release can be found at
http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html
Otherwise you can compile one yourself.
[ A Note about Cygwin and MinGW: the main difference is that Cygwin
binaries are always linked against cygwin.dll. This dll encapsulates most
standard Unix C extensions, which is very handy if you're porting unix
software to windows. However, wxMSW doesn't need this, so MinGW is
preferable if you write portable C(++). ]
You might want to build both Unix and Windows binaries in the same source
tree; to do this make subdirs for each e.g. unix and win32. If you've
already build wxWidgets in the main dir, do a 'make distclean' there,
otherwise configure will get confused. (In any case, read the section 'Unix
using configure' and make sure you're able to build a native wxWidgets
library; cross-compiling errors can be pretty obscure and you'll want to be
sure that your configure setup is basically sound.)
To cross compile the windows library, do
-> cd win32
(or whatever you called it)
Now run configure. There are two ways to do this
-> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw
where --build= should read whatever platform you're building on. Configure
will notice that build and host platforms differ, and automatically prepend
i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
The other way to run configure is by specifying the names of the binaries
yourself:
-> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \
DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
../configure --host=i586-mingw32 --with-mingw
(all assuming you're using MinGW)
By default this will compile a DLL, if you want a static library,
specify --disable-shared.
Type
-> make
and wait, wait, wait. Don't leave the room, because the minute you do there
will be a compile error :-)
NB: if you are using a very old compiler you risk to get quite a few warnings
about "ANSI C++ forbids implicit conversion from 'void *'" in all places
where va_arg macro is used. This is due to a bug in (some versions of)
MinGW headers which may be corrected by upgrading your compier,
otherwise you might edit the file
${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
(instead of egcs-2.91.57 you may have something different), searching for
the lines
/* Define __gnuc_va_list. */
#ifndef __GNUC_VA_LIST
#define __GNUC_VA_LIST
#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
typedef char *__gnuc_va_list;
#else
typedef void *__gnuc_va_list;
#endif
#endif
and adding "|| defined(_WIN32)" to the list of platforms on which
__gnuc_va_list is char *.
If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib
(or just libwx_msw.a if you opted for a static build).
Now try building the minimal sample:
-> cd samples/minimal
-> make
and run it with wine, for example (or copy to a Windows box)
-> wine minimal.exe
If all is well, do an install; from win32
-> make install
Native and cross-compiled installations can co-exist peacefully
(as long as their widget sets differ), except for wx-config. You might
want to rename the cross-compiled one to i586-mingw32-wx-config, or something.
Cross-compiling TODO:
---------------------
- resource compiling must be done manually for now (should/can we link the
default wx resources into libwx_msw.a?) [ No we can't; the linker won't
link it in... you have to supply an object file ]
- static executables are HUGE -- there must be room for improvement.

30084
wxWidgets/Makefile.in
View File

File diff suppressed because it is too large Load Diff

839
wxWidgets/acinclude.m4
View File

@@ -1,839 +0,0 @@
dnl ---------------------------------------------------------------------------
dnl
dnl Macros for configure.in for wxWindows by Robert Roebling, Phil Blecker,
dnl Vadim Zeitlin and Ron Lee
dnl
dnl This script is under the wxWindows licence.
dnl
dnl Version: $Id$
dnl ---------------------------------------------------------------------------
dnl ===========================================================================
dnl Objective-C(++) related macros
dnl ===========================================================================
m4_define([AC_WX_LANG_OBJECTIVEC],
[AC_LANG(C)
ac_ext=m
])
m4_define([AC_WX_LANG_OBJECTIVECPLUSPLUS],
[AC_LANG(C++)
ac_ext=mm
])
dnl ===========================================================================
dnl macros to find the a file in the list of include/lib paths
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl call WX_PATH_FIND_INCLUDES(search path, header name), sets ac_find_includes
dnl to the full name of the file that was found or leaves it empty if not found
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_INCLUDES],
[
ac_find_includes=
for ac_dir in $1 /usr/include;
do
if test -f "$ac_dir/$2"; then
ac_find_includes=$ac_dir
break
fi
done
])
dnl ---------------------------------------------------------------------------
dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets ac_find_libraries
dnl to the full name of the file that was found or leaves it empty if not found
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_LIBRARIES],
[
ac_find_libraries=
for ac_dir in $1;
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/lib$2.$ac_extension"; then
ac_find_libraries=$ac_dir
break 2
fi
done
done
])
dnl ---------------------------------------------------------------------------
dnl return list of standard library paths
dnl ---------------------------------------------------------------------------
dnl return all default locations:
dnl - /usr/lib: standard
dnl - /usr/lib32: n32 ABI on IRIX
dnl - /usr/lib64: n64 ABI on IRIX
dnl - /usr/lib/64: 64 bit ABI on Solaris and Linux x86-64
dnl
dnl NB: if any of directories in the list is not a subdir of /usr, code setting
dnl wx_cv_std_libpath needs to be updated
AC_DEFUN([WX_STD_LIBPATH], [/usr/lib /usr/lib32 /usr/lib/64 /usr/lib64])
dnl ---------------------------------------------------------------------------
dnl Path to include, already defined
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_INCLUDE_PATH_EXIST],
[
dnl never add -I/usr/include to the CPPFLAGS
if test "x$1" = "x/usr/include"; then
ac_path_to_include=""
else
echo "$2" | grep "\-I$1" > /dev/null
result=$?
if test $result = 0; then
ac_path_to_include=""
else
ac_path_to_include=" -I$1"
fi
fi
])
dnl ---------------------------------------------------------------------------
dnl Usage: WX_LINK_PATH_EXIST(path, libpath)
dnl
dnl Set ac_path_to_link to nothing if path is already in libpath of to -Lpath
dnl if it is not, so that libpath can be set to "$libpath$ac_path_to_link"
dnl after calling this function
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_LINK_PATH_EXIST],
[
dnl never add -L/usr/libXXX explicitely to libpath
if test "$1" = "default location"; then
ac_path_to_link=""
else
echo "$2" | grep "\-L$1" > /dev/null
result=$?
if test $result = 0; then
ac_path_to_link=""
else
ac_path_to_link=" -L$1"
fi
fi
])
dnl ===========================================================================
dnl C++ features test
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl WX_CPP_NEW_HEADERS checks whether the compiler has "new" <iostream> header
dnl or only the old <iostream.h> one - it may be generally assumed that if
dnl <iostream> exists, the other "new" headers (without .h) exist too.
dnl
dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false)
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CPP_NEW_HEADERS],
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_CHECK_HEADERS(iostream,,, [ ])
if test "$ac_cv_header_iostream" = "yes" ; then
ifelse([$1], , :, [$1])
else
ifelse([$2], , :, [$2])
fi
AC_LANG_RESTORE
])
dnl ---------------------------------------------------------------------------
dnl WX_CPP_BOOL checks whether the C++ compiler has a built in bool type
dnl
dnl call WX_CPP_BOOL - will define HAVE_BOOL if the compiler supports bool
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CPP_BOOL],
[
AC_CACHE_CHECK([if C++ compiler supports bool], wx_cv_cpp_bool,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE(
[
],
[
bool b = true;
return 0;
],
[
wx_cv_cpp_bool=yes
],
[
wx_cv_cpp_bool=no
]
)
AC_LANG_RESTORE
])
if test "$wx_cv_cpp_bool" = "yes"; then
AC_DEFINE(HAVE_BOOL)
fi
])
dnl ---------------------------------------------------------------------------
dnl WX_CPP_EXPLICIT checks whether the C++ compiler support the explicit
dnl keyword and defines HAVE_EXPLICIT if this is the case
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CPP_EXPLICIT],
[
AC_CACHE_CHECK([if C++ compiler supports the explicit keyword],
wx_cv_explicit,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
dnl do the test in 2 steps: first check that the compiler knows about the
dnl explicit keyword at all and then verify that it really honours it
AC_TRY_COMPILE(
[
class Foo { public: explicit Foo(int) {} };
],
[
return 0;
],
[
AC_TRY_COMPILE(
[
class Foo { public: explicit Foo(int) {} };
static void TakeFoo(const Foo& foo) { }
],
[
TakeFoo(17);
return 0;
],
wx_cv_explicit=no,
wx_cv_explicit=yes
)
],
wx_cv_explicit=no
)
AC_LANG_RESTORE
])
if test "$wx_cv_explicit" = "yes"; then
AC_DEFINE(HAVE_EXPLICIT)
fi
])
dnl ---------------------------------------------------------------------------
dnl WX_CHECK_FUNCS(FUNCTIONS...,
dnl [ACTION-IF-FOUND],
dnl [ACTION-IF-NOT-FOUND],
dnl [EXTRA-DEFINES-AND-INCLUDES],
dnl [EXTRA-TEST-CODE])
dnl
dnl Checks that the functions listed in FUNCTIONS exist in the headers and the
dnl libs. For each function, if it is found then defines 'HAVE_FUNCTION' and
dnl executes ACTION-IF-FOUND, otherwise executes ACTION-IF-NOT-FOUND.
dnl
dnl The code from EXTRA-DEFINES-AND-INCLUDES is inserted into the test before
dnl the default headers are included, and EXTRA-TEST-CODE is inserted into
dnl the main() function after the default test for existence.
dnl
dnl Examples:
dnl # the simple case
dnl WX_CHECK_FUNCS(stat)
dnl # use break to finish the loop early
dnl WX_CHECK_FUNCS(mkstemp mktemp, break)
dnl # extra defines
dnl WX_CHECK_FUNCS(strtok_r, [], [], [#define _RREENTRANT])
dnl # extra includes
dnl WX_CHECK_FUNCS(swprintf, [], [], [#include <wchar.h>])
dnl # checking the signature with extra test code
dnl WX_CHECK_FUNCS(gettimeofday, [], [], [#include <sys/time.h>]
dnl [struct timeval tv; struct timezone tz; gettimeofday(&tv, &tz)])
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CHECK_FUNCS],
[
for wx_func in $1
do
AC_CACHE_CHECK(
[for $wx_func],
[wx_cv_func_$wx_func],
[
AC_LINK_IFELSE(
[
AC_LANG_PROGRAM(
[
$4
AC_INCLUDES_DEFAULT
],
[
#ifndef $wx_func
&$wx_func;
#endif
$5
])
],
[eval wx_cv_func_$wx_func=yes],
[eval wx_cv_func_$wx_func=no])
])
if eval test \$wx_cv_func_$wx_func = yes
then
AC_DEFINE_UNQUOTED([AS_TR_CPP([HAVE_$wx_func])])
$2
else
:
$3
fi
done
])
dnl ---------------------------------------------------------------------------
dnl a slightly better AC_C_BIGENDIAN macro which allows cross-compiling
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_C_BIGENDIAN],
[AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian,
[ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/param.h>], [
#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
bogus endian macros
#endif], [# It does; now see whether it defined to BIG_ENDIAN or not.
AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/param.h>], [
#if BYTE_ORDER != BIG_ENDIAN
not big endian
#endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)])
if test $ac_cv_c_bigendian = unknown; then
AC_TRY_RUN([main () {
/* Are we little or big endian? From Harbison&Steele. */
union
{
long l;
char c[sizeof (long)];
} u;
u.l = 1;
exit (u.c[sizeof (long) - 1] == 1);
}], [ac_cv_c_bigendian=no], [ac_cv_c_bigendian=yes], [ac_cv_c_bigendian=unknown])
fi])
if test $ac_cv_c_bigendian = unknown; then
AC_MSG_WARN([Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file])
fi
if test $ac_cv_c_bigendian = yes; then
AC_DEFINE(WORDS_BIGENDIAN)
fi
])
dnl ---------------------------------------------------------------------------
dnl override AC_ARG_ENABLE/WITH to cache the results in .cache file
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_ARG_CACHE_INIT],
[
wx_arg_cache_file="configarg.cache"
echo "loading argument cache $wx_arg_cache_file"
rm -f ${wx_arg_cache_file}.tmp
touch ${wx_arg_cache_file}.tmp
touch ${wx_arg_cache_file}
])
AC_DEFUN([WX_ARG_CACHE_FLUSH],
[
echo "saving argument cache $wx_arg_cache_file"
mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
])
dnl return the name of the variable to store the value of the given
dnl WX_ARG_WITH/ENABLE option
AC_DEFUN([WX_ARG_CACHE_NAME],)
dnl this macro checks for a three-valued command line --with argument:
dnl possible arguments are 'yes', 'no', 'sys', or 'builtin'
dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
AC_DEFUN([WX_ARG_SYS_WITH],
[
AC_MSG_CHECKING([for --with-$1])
no_cache=0
AC_ARG_WITH($1, [$2],
[
if test "$withval" = yes; then
AS_TR_SH(wx_cv_use_$1)='$3=yes'
elif test "$withval" = no; then
AS_TR_SH(wx_cv_use_$1)='$3=no'
elif test "$withval" = sys; then
AS_TR_SH(wx_cv_use_$1)='$3=sys'
elif test "$withval" = builtin; then
AS_TR_SH(wx_cv_use_$1)='$3=builtin'
else
AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
fi
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
])
eval "$AS_TR_SH(wx_cv_use_$1)"
if test "$no_cache" != 1; then
echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
elif test "$$3" = no; then
AC_MSG_RESULT(no)
elif test "$$3" = sys; then
AC_MSG_RESULT([system version])
elif test "$$3" = builtin; then
AC_MSG_RESULT([builtin version])
else
AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
fi
])
dnl this macro checks for a command line argument and caches the result
dnl usage: WX_ARG_WITH(option, helpmessage, variable-name, [withstring])
AC_DEFUN([WX_ARG_WITH],
[
withstring=$4
AC_MSG_CHECKING([for --${withstring:-with}-$1])
no_cache=0
AC_ARG_WITH($1, [$2],
[
if test "$withval" = yes; then
AS_TR_SH(wx_cv_use_$1)='$3=yes'
else
AS_TR_SH(wx_cv_use_$1)='$3=no'
fi
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
])
eval "$AS_TR_SH(wx_cv_use_$1)"
if test "$no_cache" != 1; then
echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
])
dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name, enablestring)
dnl
dnl enablestring is a hack and allows to show "checking for --disable-foo"
dnl message when running configure instead of the default "checking for
dnl --enable-foo" one whih is useful for the options enabled by default
AC_DEFUN([WX_ARG_ENABLE],
[
enablestring=$4
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
no_cache=0
AC_ARG_ENABLE($1, [$2],
[
if test "$enableval" = yes; then
AS_TR_SH(wx_cv_use_$1)='$3=yes'
else
AS_TR_SH(wx_cv_use_$1)='$3=no'
fi
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
AS_TR_SH(wx_cv_use_$1)='$3='$DEFAULT_$3
])
eval "$AS_TR_SH(wx_cv_use_$1)"
if test "$no_cache" != 1; then
echo $AS_TR_SH(wx_cv_use_$1) >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
])
dnl Like WX_ARG_ENABLE but accepts a parameter.
dnl
dnl Usage:
dnl WX_ARG_ENABLE_PARAM(option, helpmessage, variable-name, enablestring)
dnl
dnl Example:
dnl WX_ARG_ENABLE_PARAM(foo, [[ --enable-foo[=bar] use foo]], wxUSE_FOO)
dnl
dnl --enable-foo wxUSE_FOO=yes
dnl --disable-foo wxUSE_FOO=no
dnl --enable-foo=bar wxUSE_FOO=bar
dnl <not given> value from configarg.cache or wxUSE_FOO=no
dnl
AC_DEFUN([WX_ARG_ENABLE_PARAM],
[
enablestring=$4
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
no_cache=0
AC_ARG_ENABLE($1, [$2],
[
wx_cv_use_$1="$3='$enableval'"
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
wx_cv_use_$1='$3='$DEFAULT_$3
else
no_cache=1
wx_cv_use_$1="$3=no"
fi
])
eval "$wx_cv_use_$1"
if test "$no_cache" != 1; then
echo $wx_cv_use_$1 >> ${wx_arg_cache_file}.tmp
fi
AC_MSG_RESULT([$$3])
])
dnl ===========================================================================
dnl Linker features test
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl WX_VERSIONED_SYMBOLS checks whether the linker can create versioned
dnl symbols. If it can, sets LDFLAGS_VERSIONING to $CXX flags needed to use
dnl version script file named versionfile
dnl
dnl call WX_VERSIONED_SYMBOLS(versionfile)
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_VERSIONED_SYMBOLS],
[
case "${host}" in
*-*-cygwin* | *-*-mingw* )
dnl although ld does support version script option on these
dnl platforms, it doesn't make much sense to use it under Win32
dnl and, moreover, this breaks linking because of a bug in handling
dnl paths in -Wl,--version-script,path option (if we ever do need
dnl to use it for cygwin/mingw32, keep in mind that replacing last
dnl comma with the equal sign works) so
dnl simply disable it
wx_cv_version_script=no
;;
*)
AC_CACHE_CHECK([if the linker accepts --version-script], wx_cv_version_script,
[
echo "VER_1 { *; };" >conftest.sym
echo "int main() { return 0; }" >conftest.cpp
if AC_TRY_COMMAND([
$CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr]) ; then
if test -s conftest.stderr ; then
wx_cv_version_script=no
else
wx_cv_version_script=yes
fi
else
wx_cv_version_script=no
fi
dnl There's a problem in some old linkers with --version-script that
dnl can cause linking to fail when you have objects with vtables in
dnl libs 3 deep. This is known to happen in netbsd and openbsd with
dnl ld 2.11.2.
dnl
dnl To test for this we need to make some shared libs and
dnl unfortunately we can't be sure of the right way to do that. If the
dnl first two compiles don't succeed then it looks like the test isn't
dnl working and the result is ignored, but if OTOH the first two
dnl succeed but the third does not then the bug has been detected and
dnl the --version-script flag is dropped.
if test $wx_cv_version_script = yes
then
echo "struct B { virtual ~B() { } }; \
struct D : public B { }; \
void F() { D d; }" > conftest.cpp
if AC_TRY_COMMAND([
$CXX -shared -fPIC -o conftest1.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-Wl,--version-script,conftest.sym >/dev/null 2>/dev/null]) &&
AC_TRY_COMMAND([
$CXX -shared -fPIC -o conftest2.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-Wl,--version-script,conftest.sym conftest1.output >/dev/null 2>/dev/null])
then
if AC_TRY_COMMAND([
$CXX -shared -fPIC -o conftest3.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-Wl,--version-script,conftest.sym conftest2.output conftest1.output >/dev/null 2>/dev/null])
then
wx_cv_version_script=yes
else
wx_cv_version_script=no
fi
fi
fi
rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
rm -f conftest1.output conftest2.output conftest3.output
])
if test $wx_cv_version_script = yes ; then
LDFLAGS_VERSIONING="-Wl,--version-script,$1"
fi
;;
esac
])
dnl ===========================================================================
dnl "3rd party" macros included here because they are not widely available
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl test for availability of iconv()
dnl ---------------------------------------------------------------------------
dnl From Bruno Haible.
AC_DEFUN([AM_ICONV],
[
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
dnl those with the standalone portable GNU libiconv installed).
AC_ARG_WITH([libiconv-prefix],
[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
for dir in `echo "$withval" | tr : ' '`; do
if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
done
])
AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
AC_TRY_LINK([#include <stdlib.h>
#include <iconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
am_cv_func_iconv=yes)
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
LIBS="$LIBS -liconv"
AC_TRY_LINK([#include <stdlib.h>
#include <iconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
am_cv_lib_iconv=yes
am_cv_func_iconv=yes)
LIBS="$am_save_LIBS"
fi
])
if test "$am_cv_func_iconv" = yes; then
AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
AC_CACHE_CHECK([if iconv needs const], wx_cv_func_iconv_const,
AC_TRY_COMPILE([
#include <stdlib.h>
#include <iconv.h>
extern
#ifdef __cplusplus
"C"
#endif
#if defined(__STDC__) || defined(__cplusplus)
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
#else
size_t iconv();
#endif
],
[],
wx_cv_func_iconv_const="no",
wx_cv_func_iconv_const="yes"
)
)
iconv_const=
if test "x$wx_cv_func_iconv_const" = "xyes"; then
iconv_const="const"
fi
AC_DEFINE_UNQUOTED(ICONV_CONST, $iconv_const,
[Define as const if the declaration of iconv() needs const.])
fi
LIBICONV=
if test "$am_cv_lib_iconv" = yes; then
LIBICONV="-liconv"
fi
AC_SUBST(LIBICONV)
])
dnl ---------------------------------------------------------------------------
dnl AC_SYS_LARGEFILE (partly based on the code from autoconf 2.5x)
dnl ---------------------------------------------------------------------------
dnl WX_SYS_LARGEFILE_TEST
dnl
dnl NB: original autoconf test was checking if compiler supported 6 bit off_t
dnl arithmetic properly but this failed miserably with gcc under Linux
dnl whereas the system still supports 64 bit files, so now simply check
dnl that off_t is big enough
define(WX_SYS_LARGEFILE_TEST,
[typedef struct {
unsigned int field: sizeof(off_t) == 8;
} wxlf;
])
dnl WX_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR)
define(WX_SYS_LARGEFILE_MACRO_VALUE,
[
AC_CACHE_CHECK([for $1 value needed for large files], [$3],
[
AC_TRY_COMPILE([#define $1 $2
#include <sys/types.h>],
WX_SYS_LARGEFILE_TEST,
[$3=$2],
[$3=no])
]
)
if test "$$3" != no; then
wx_largefile=yes
AC_DEFINE_UNQUOTED([$1], [$$3])
fi
])
dnl AC_SYS_LARGEFILE
dnl ----------------
dnl By default, many hosts won't let programs access large files;
dnl one must use special compiler options to get large-file access to work.
dnl For more details about this brain damage please see:
dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
AC_DEFUN([AC_SYS_LARGEFILE],
[AC_ARG_ENABLE(largefile,
[ --disable-largefile omit support for large files])
if test "$enable_largefile" != no; then
dnl _FILE_OFFSET_BITS==64 is needed for Linux, Solaris, ...
dnl _LARGE_FILES -- for AIX
wx_largefile=no
WX_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, ac_cv_sys_file_offset_bits)
if test "x$wx_largefile" != "xyes"; then
WX_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, ac_cv_sys_large_files)
fi
AC_MSG_CHECKING(if large file support is available)
if test "x$wx_largefile" = "xyes"; then
AC_DEFINE(HAVE_LARGEFILE_SUPPORT)
fi
AC_MSG_RESULT($wx_largefile)
fi
])
dnl Available from the GNU Autoconf Macro Archive at:
dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_const_cast.html
dnl
AC_DEFUN([AC_CXX_CONST_CAST],
[AC_CACHE_CHECK(whether the compiler supports const_cast<>,
ac_cv_cxx_const_cast,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE(,[int x = 0;const int& y = x;int& z = const_cast<int&>(y);return z;],
ac_cv_cxx_const_cast=yes, ac_cv_cxx_const_cast=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_const_cast" = yes; then
AC_DEFINE(HAVE_CONST_CAST,,[define if the compiler supports const_cast<>])
fi
])
dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_reinterpret_cast.html
AC_DEFUN([AC_CXX_REINTERPRET_CAST],
[AC_CACHE_CHECK(whether the compiler supports reinterpret_cast<>,
ac_cv_cxx_reinterpret_cast,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <typeinfo>
class Base { public : Base () {} virtual void f () = 0;};
class Derived : public Base { public : Derived () {} virtual void f () {} };
class Unrelated { public : Unrelated () {} };
int g (Unrelated&) { return 0; }],[
Derived d;Base& b=d;Unrelated& e=reinterpret_cast<Unrelated&>(b);return g(e);],
ac_cv_cxx_reinterpret_cast=yes, ac_cv_cxx_reinterpret_cast=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_reinterpret_cast" = yes; then
AC_DEFINE(HAVE_REINTERPRET_CAST,,
[define if the compiler supports reinterpret_cast<>])
fi
])
dnl and http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_static_cast.html
AC_DEFUN([AC_CXX_STATIC_CAST],
[AC_CACHE_CHECK(whether the compiler supports static_cast<>,
ac_cv_cxx_static_cast,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <typeinfo>
class Base { public : Base () {} virtual void f () = 0; };
class Derived : public Base { public : Derived () {} virtual void f () {} };
int g (Derived&) { return 0; }],[
Derived d; Base& b = d; Derived& s = static_cast<Derived&> (b); return g (s);],
ac_cv_cxx_static_cast=yes, ac_cv_cxx_static_cast=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_static_cast" = yes; then
AC_DEFINE(HAVE_STATIC_CAST,, [define if the compiler supports static_cast<>])
fi
])
dnl http://autoconf-archive.cryp.to/ac_cxx_dynamic_cast.html
AC_DEFUN([AC_CXX_DYNAMIC_CAST],
[AC_CACHE_CHECK(whether the compiler supports dynamic_cast<>,
ac_cv_cxx_dynamic_cast,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <typeinfo>
class Base { public : Base () {} virtual void f () = 0;};
class Derived : public Base { public : Derived () {} virtual void f () {} };],[
Derived d; Base& b=d; return dynamic_cast<Derived*>(&b) ? 0 : 1;],
ac_cv_cxx_dynamic_cast=yes, ac_cv_cxx_dynamic_cast=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_dynamic_cast" = yes; then
AC_DEFINE(HAVE_DYNAMIC_CAST,,[define if the compiler supports dynamic_cast<>])
fi
])

24
wxWidgets/aclocal.m4 vendored
View File

@@ -1,24 +0,0 @@
# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
m4_include([build/aclocal/ac_raf_func_which_getservbyname_r.m4])
m4_include([build/aclocal/ax_func_which_gethostbyname_r.m4])
m4_include([build/aclocal/bakefile-dllar.m4])
m4_include([build/aclocal/bakefile-lang.m4])
m4_include([build/aclocal/bakefile.m4])
m4_include([build/aclocal/cppunit.m4])
m4_include([build/aclocal/gtk-2.0.m4])
m4_include([build/aclocal/gtk.m4])
m4_include([build/aclocal/pkg.m4])
m4_include([build/aclocal/sdl.m4])
m4_include([acinclude.m4])

24
wxWidgets/art/addbookm.xpm
View File

@@ -1,24 +0,0 @@
/* XPM */
static char *addbookm_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
". c Black",
"X c #00C000",
" c None",
/* pixels */
" ....... ",
" .XXXXX. ",
" .. .XXXXX. ",
" .. .XXXXX. ",
" ...... .XXXXX. ",
" ...... .XXXXX. ",
" .. .XXXXX. ",
" .. .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XX.XX. ",
" .X. .X. ",
" .. .. "
};

21
wxWidgets/art/back.xpm
View File

@@ -1,21 +0,0 @@
/* XPM */
static char * back_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ",
" . ",
" .. ",
" .X. ",
" .XX........ ",
" .XXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXX. ",
" .XX........ ",
" .X. ",
" .. ",
" . ",
" "};

57
wxWidgets/art/cdrom.xpm
View File

@@ -1,57 +0,0 @@
/* XPM */
static char *cdrom_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 36 1",
"= c #9BACC2",
"y c #547B99",
"$ c #FFFFFF",
"@ c #839CB5",
"o c #547897",
"4 c #4D7492",
"% c #F1F4F7",
"X c #5A809C",
"< c #8497A5",
"0 c #7898AD",
"+ c #CAD2DC",
"r c #ACAEB2",
"2 c #BECAD9",
"* c #65839D",
"e c #DCE2EA",
"- c #ADBED2",
"t c #597B9A",
" c None",
"1 c #467291",
"9 c #D6DFE7",
"O c #7393AB",
"u c #49708B",
"5 c #A0BACB",
"& c #AABFCD",
"8 c #B9CBD5",
"; c #B4C4D3",
": c #6F90A6",
"3 c #A8B6CA",
"# c #ADBACE",
"w c #E4E9ED",
". c #8EA9BC",
"> c #B3BFD1",
", c #C2CBDB",
"6 c #C0D1DC",
"7 c #A2B3C5",
"q c #5D7C93",
/* pixels */
" .XooOo+ ",
" X@#$$$%o& ",
" *=-;$$$$$o+ ",
" +O#;-$$$$$$: ",
" o=>,-<1<$2-o ",
" o3>--1$122-* ",
" o=--$<4<22-X ",
" o5$$$$$26;7* ",
" X%$$$$2;-X8 ",
" 90*9$$$-7Xqo ",
" wXwe@O44X4<r<o ",
" X8628>22222<<*4",
" ttyyyoo4441uuuo",
" t>$$$$$$$$$$$>o",
" XXXtyyyoo44411u"
};

44
wxWidgets/art/copy.xpm
View File

@@ -1,44 +0,0 @@
/* XPM */
static char *copy_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 23 1",
"o c #97C4E7",
"* c #FFFFFF",
"@ c #60A9DA",
"= c #D1E5F5",
"& c #C3DDF1",
". c #7EA6C0",
" c None",
"X c #2F93CD",
"O c #85BBE2",
", c #EFF6FC",
"; c #DEEDF8",
"+ c #72B2DD",
"3 c #F7FBFD",
"4 c #FAFCFE",
": c #DAEAF7",
"< c #E9F3FA",
"1 c #E2EFF8",
"- c #FDFDFE",
"% c #B6D5EE",
"$ c #A5CCEA",
"> c #E5F0F9",
"# c #AFD1EC",
"2 c #F4F9FD",
/* pixels */
" .....XX ",
" .oO+@X#X ",
" .$oO+X##X ",
" .%$o........ ",
" .&%$.*=&#o.-. ",
" .=&%.*;=&#.--. ",
" .:=&.*>;=&.... ",
" .>:=.*,>;=&#o. ",
" .<1:.*2,>:=&#. ",
" .2<1.*32,>:=&. ",
" .32<.*432,>:=. ",
" .32<.*-432,>:. ",
" .....**-432,>. ",
" .***-432,. ",
" .......... "
};

17
wxWidgets/art/cross.xpm
View File

@@ -1,17 +0,0 @@
/* XPM */
static char *cross_xpm[] = {
/* columns rows colors chars-per-pixel */
"10 10 2 1",
" c Gray0",
"# c None",
/* pixels */
" ######## ",
" #### ",
"# ## #",
"## ##",
"### ###",
"### ###",
"## ##",
"# ## #",
" #### ",
" ###### "};

46
wxWidgets/art/cut.xpm
View File

@@ -1,46 +0,0 @@
/* XPM */
static char *cut_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 25 1",
"6 c #D8BDC0",
": c #C3C3C4",
"- c #FFFFFF",
". c #6C6D70",
"2 c #AD3A45",
"o c #DBDBDB",
"# c #939495",
"< c #E42234",
"& c #C3C5C8",
"; c #C6CCD3",
"% c #B7B7B8",
" c None",
"* c #DFE0E2",
"5 c #B69596",
"3 c #9C2A35",
"1 c #CFCFD0",
", c #AB5C64",
"+ c #D2D3D4",
"$ c #BCBDBE",
"@ c #C6C8CA",
"> c #CDC0C1",
"O c #826F72",
"X c #979BA0",
"4 c #9B8687",
"= c #9FA0A0",
/* pixels */
" .X .o ",
" O.+ @. ",
" O. .. ",
" O#$ %.& ",
" O.*.. ",
" #%#.. ",
" O=-.. ",
" #%#;. ",
" OO:=O ",
" >,,<, ,<,,1 ",
" ><23<1 1<32<1 ",
" ,2 4< <5 2, ",
" <, ,2 2, ,< ",
" 23,<5 5<,32 ",
" 6225 522> "
};

54
wxWidgets/art/deffile.xpm
View File

@@ -1,54 +0,0 @@
/* XPM */
static char *deffile_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 32 1",
"= c #97C4E7",
": c #72A8D2",
"1 c #FFFFFF",
"w c #839CB5",
"X c #6B98B8",
". c #5A89A6",
"@ c #3A749C",
", c #D1E5F5",
"< c #67A1CF",
"> c #F1F4F7",
"e c #85A7BC",
"% c #C3DDF1",
"0 c #749BB4",
"2 c #7EA6C0",
"; c #5F9BC8",
" c None",
"O c #538DB3",
"- c #85BBE2",
"$ c #D6DFE7",
"9 c #EFF6FC",
"o c #6591AE",
"4 c #F7FBFD",
"8 c #FAFCFE",
"6 c #DAEAF7",
"7 c #E9F3FA",
"q c #FDFDFE",
"3 c #E2EFF8",
"# c #8EA9BC",
"& c #B6D5EE",
"* c #A5CCEA",
"5 c #F4F9FD",
"+ c #4581AA",
/* pixels */
" ..XooO+@#$ ",
" .%%&*=-;:;> ",
" .,,%&*=<1=X> ",
" #%%%%&*211=X ",
" #3-----<oXoO ",
" #3456,%&*=-O ",
" #3--------=O ",
" #355736,%&*o ",
" #3--------&o ",
" #38459736,%X ",
" #3--------,0 ",
" #31q84597360 ",
" #3--------3w ",
" #3111q84597e ",
" ##########e# ",
" "
};

24
wxWidgets/art/delbookm.xpm
View File

@@ -1,24 +0,0 @@
/* XPM */
static char *delbookm_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
". c Black",
" c None",
"X c #FF4040",
/* pixels */
" ....... ",
" .XXXXX. ",
" . . .XXXXX. ",
" .. .. .XXXXX. ",
" ... .XXXXX. ",
" . .XXXXX. ",
" ... .XXXXX. ",
" .. .. .XXXXX. ",
" . . .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XX.XX. ",
" .X. .X. ",
" .. .. "
};

42
wxWidgets/art/delete.xpm
View File

@@ -1,42 +0,0 @@
/* XPM */
static char *delete_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 21 1",
"2 c #A5AEBD",
"* c #5478B4",
"< c #95A3BB",
"O c #9AA7BC",
"; c #758EB7",
"$ c #6986B6",
"# c #4971B2",
"& c #8A9CBA",
"X c #8598B9",
" c None",
"o c #ABB2BE",
"- c #7F95B9",
"= c #4E74B3",
"1 c #A0ABBC",
"+ c #6F8AB7",
". c #B5B9BF",
"@ c #3E69B1",
", c #90A0BA",
": c #6483B5",
"> c #5A7BB4",
"% c #5F7FB5",
/* pixels */
" ",
" .Xo OO ",
" +@#. $@% ",
" &@@X .*@*o ",
" =@= .*@*. ",
" -@@X*@*. ",
" .#@@@$. ",
" ;@@: ",
" ;@@@+ ",
" .>@#%@@. ",
" o*@*oO@@, ",
" <#@*. .@@= ",
"&@@$ :@@1 ",
";#& 2#>. ",
" "
};

52
wxWidgets/art/dir_up.xpm
View File

@@ -1,52 +0,0 @@
/* XPM */
static char *dir_up_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 31 1",
"6 c #9BACC2",
"o c #9AEA53",
"7 c #94A5BD",
"8 c #547897",
"5 c #839CB5",
"@ c #376485",
"$ c #5A809C",
"# c #7F99B4",
": c #D1D9E5",
"< c #EAEDF3",
"& c #446A8C",
"q c #65839D",
"> c #DCE2EA",
", c #E1E6EE",
"2 c #F5F6F7",
"O c #8DA0B9",
" c None",
"% c #467291",
". c #305F81",
"X c #7393AB",
"+ c #6A89A2",
"4 c #A8B6CA",
"1 c #EEF1F3",
"3 c #F8F9FA",
"0 c #215579",
"9 c #7F97B0",
"* c #B3BFD1",
"w c #7A90AC",
"- c #C2CBDB",
"; c #CAD6E1",
"= c #BBC4D6",
/* pixels */
" .. ",
" X.o. ",
".... X.ooo. ",
".OO+....ooooo. ",
".OOOOOO@@ooo.. ",
".OOOO#OO@ooo.$ ",
".OOOOOOO@ooo.$ ",
".O%............&",
".O&*=-;:>,<1231.",
".+.4*=-;:>,<12$.",
"..564*=-;:>,<1. ",
".@O764*=-;:>,<. ",
".89O764*=-;:>$$ ",
"0qw9O764*=-;:. ",
"0............. "
};

21
wxWidgets/art/down.xpm
View File

@@ -1,21 +0,0 @@
/* XPM */
static char * down_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ...... ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" ....XXXX.... ",
" .XXXXXXXX. ",
" .XXXXXX. ",
" .XXXX. ",
" .XX. ",
" .. ",
" "};

73
wxWidgets/art/exefile.xpm
View File

@@ -1,73 +0,0 @@
/* XPM */
static char *exefile_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 51 1",
"% c #E8E8EC",
"= c #E8E8ED",
"z c #CACAD4",
"8 c #D9D9E1",
"p c #D2D2DA",
"u c #E1E1E7",
"a c #D2D2DB",
"< c #E9E9ED",
"q c #DADAE1",
"+ c #F1F1F4",
"g c #D3D3DB",
"1 c #E2E2E8",
"x c #D3D3DC",
"5 c #00A5FF",
"$ c #EAEAEE",
"4 c #DBDBE2",
"h c #CCCCD6",
"y c #D4D4DC",
"r c #E3E3E9",
"d c #D4D4DD",
"7 c #DCDCE2",
": c #EBEBEF",
"0 c #DCDCE3",
" c None",
"O c #F3F3F5",
"> c #E4E4E9",
"& c #F3F3F6",
"j c #D5D5DD",
"6 c #E4E4EA",
". c #C6C6D5",
"# c #ECECF0",
"f c #CECED7",
"l c #CECED8",
"e c #D6D6DE",
"; c #EDEDF0",
"3 c #DEDEE4",
", c #EDEDF1",
"c c #CFCFD8",
"o c #F5F5F7",
"- c #E6E6EB",
"w c #D7D7DF",
"v c #C8C8D3",
"i c #DFDFE5",
"@ c #EEEEF2",
"s c #D0D0D9",
"X c #9494AD",
"9 c #D8D8DF",
"t c #D8D8E0",
"* c #EFEFF2",
"2 c #E0E0E6",
"k c #D1D1DA",
/* pixels */
" ........X ",
" .oO+@#$%XX ",
" .&+*#$=-XXX ",
" .+*;:=->XXXX ",
" .*,:<->1234X ",
" .,5:5612378X ",
" 5,5559530qwX ",
" 55555550q9eX ",
" 5555r5555teyX ",
" 55rui559eypX ",
" 5555i5555yasX ",
" 5555555dasfX ",
" 5355595gsfhX ",
" .3595jgklhzX ",
" .0qwjxkchzvX ",
" XXXXXXXXXXXX "
};

57
wxWidgets/art/fileopen.xpm
View File

@@ -1,57 +0,0 @@
/* XPM */
static char *fileopen_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 36 1",
"6 c #9BACC2",
"< c #9AEA53",
"9 c #94A5BD",
"5 c #839CB5",
"; c #4D7492",
". c #376485",
"$ c #7F99B4",
"r c #D1D9E5",
"7 c #EAEDF3",
"@ c #CAD2DC",
"% c #718BA7",
"t c #BECAD9",
"& c #65839D",
"0 c #DCE2EA",
"4 c #F5F6F7",
"w c #597B9A",
"O c #8DA0B9",
" c None",
"+ c #467291",
"u c #305F81",
"= c #B4C4D3",
"# c #CAE2AA",
"1 c #FAFCFE",
"3 c #A8B6CA",
"q c #E4E9ED",
"8 c #EEF1F3",
"X c #215579",
"2 c #7F97B0",
": c #B3BFD1",
"y c #7A90AC",
", c #C2CBDB",
"- c #ADD668",
"* c #B6D791",
"e c #CAD6E1",
"o c #DFF0D0",
"> c #BBC4D6",
/* pixels */
" ",
" .... ",
"XXXXX .oo. ",
"XOOOO+@.#o. ",
"XOOOO$%&.*oXXX ",
"XOOOOOOO.*oX=X ",
"XOXXXX...-oXXXX;",
"XOX:>,.<<<<<oX1;",
"X2X3:>,.<<<oX4=;",
"XX563:>>.<oX78; ",
"XXO963:>>.X0q7; ",
"Xw2O963:>>er0t; ",
"X&y2O963:>,er; ",
"uXXXXXXXXXXXX; ",
" "
};

42
wxWidgets/art/filesave.xpm
View File

@@ -1,42 +0,0 @@
/* XPM */
static char *filesave_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 21 1",
"O c #FFFFFF",
"> c #D5D6D8",
"; c #446A8C",
"1 c #CAD2DC",
": c #C0C7D1",
" c #5F666D",
"% c #A5B0BA",
"o c #65839D",
", c #DCE2EA",
"< c #C3C5C8",
"- c #E1E6EE",
"* c #C6CCD3",
". c None",
"$ c #305F81",
"2 c #D6DFE7",
"= c #D2D9E0",
"& c #B7BFC7",
"X c #1B4467",
"# c #BCBDBE",
"@ c #7A90AC",
"+ c #5D7C93",
/* pixels */
" .",
" XoOOOOOOOOO+X .",
" @oO#######O+@ .",
" @oOOOOOOOOO+@ .",
" @oO#######O+@ .",
" @oOOOOOOOOO+@ .",
" @@+++++++++@@ .",
" @@@@@@@@@@@@@ .",
" @@@$$$$$$$$@@ .",
" @@$%%%&*=-O$@ .",
" @@$%X;;*=-O$@ .",
" @@$%X;;:>,O$@ .",
" @@$%X;;<12O$@ .",
" @@$<<2OOOOO$@ .",
". .."
};

44
wxWidgets/art/filesaveas.xpm
View File

@@ -1,44 +0,0 @@
/* XPM */
static char *filesaveas_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 23 1",
"X c Black",
"+ c #FFFFFF",
"< c #D5D6D8",
"> c #446A8C",
"3 c #CAD2DC",
", c #C0C7D1",
" c #5F666D",
"* c #A5B0BA",
"O c #65839D",
"1 c #DCE2EA",
"2 c #C3C5C8",
": c #E1E6EE",
". c #FFFF00",
"- c #C6CCD3",
"@ c None",
"& c #305F81",
"4 c #D6DFE7",
"; c #D2D9E0",
"= c #B7BFC7",
"o c #1B4467",
"$ c #BCBDBE",
"# c #7A90AC",
"% c #5D7C93",
/* pixels */
" .X .XX.",
" oO+++++++.X.X.@",
" #O+$$$$$XX...XX",
" #O++++++.......",
" #O+$$$$$XX...XX",
" #O+++++++.X.X.@",
" ##%%%%%%.X%.X .",
" ############# @",
" ###&&&&&&&&## @",
" ##&***=-;:+&# @",
" ##&*o>>-;:+&# @",
" ##&*o>>,<1+&# @",
" ##&*o>>234+&# @",
" ##&224+++++&# @",
"@ @@"
};

62
wxWidgets/art/find.xpm
View File

@@ -1,62 +0,0 @@
/* XPM */
static char *find_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 41 1",
"y c #A06959",
"9 c #A7DAF2",
"$ c #B5CAD7",
"> c #35B4E1",
"t c #6B98B8",
"w c #B6E0F4",
"q c #AEC9D7",
"1 c #5A89A6",
"+ c #98B3C6",
"4 c #EAF6FC",
"3 c #DEF1FA",
"= c #4CBCE3",
"d c #DB916B",
"X c #85A7BC",
"s c #D8BCA4",
"o c #749BB4",
"e c #BCD9EF",
"* c #62B4DD",
"< c #91D2EF",
"a c #E6DED2",
"0 c #E9F4FB",
" c None",
"@ c #A0BACB",
"O c #AABFCD",
"i c #6591AE",
": c #B9CBD5",
"- c #71C5E7",
"5 c #D3ECF8",
"% c #81A3B9",
"6 c #8AD0EE",
"8 c #FDFDFE",
"p c #8EA9BC",
"r c #B6D5EE",
", c #81CCEB",
". c #ACC4D3",
"; c #AFD1DE",
"7 c #EFF8FC",
"u c #C2CBDB",
"# c #C0D1DC",
"2 c #CAD6E1",
"& c #8FB0C3",
/* pixels */
" .XooXO ",
" +@###$+% ",
" .&#*==-;@@ ",
" o:*>,<--:X ",
" 12>-345-#% ",
" 12>678392% ",
" %$*,3059q& ",
" @Oq,wwer@@ ",
" t@q22q&+ ",
" yyui+%o%p ",
" yasy ",
" yasdy ",
" yasdy ",
" ysdy ",
" yy "
};

63
wxWidgets/art/findrepl.xpm
View File

@@ -1,63 +0,0 @@
/* XPM */
static char *findrepl_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 42 1",
"y c #A06959",
"9 c #A7DAF2",
"$ c #B5CAD7",
"> c #35B4E1",
"t c #6B98B8",
"w c #B6E0F4",
"q c #AEC9D7",
"1 c #5A89A6",
"+ c #98B3C6",
"4 c #EAF6FC",
"d c #008000",
"3 c #DEF1FA",
"= c #4CBCE3",
"f c #DB916B",
"X c #85A7BC",
"s c #D8BCA4",
"o c #749BB4",
"e c #BCD9EF",
"* c #62B4DD",
"< c #91D2EF",
"a c #E6DED2",
"0 c #E9F4FB",
" c None",
"@ c #A0BACB",
"O c #AABFCD",
"i c #6591AE",
": c #B9CBD5",
"- c #71C5E7",
"5 c #D3ECF8",
"% c #81A3B9",
"6 c #8AD0EE",
"8 c #FDFDFE",
"p c #8EA9BC",
"r c #B6D5EE",
", c #81CCEB",
". c #ACC4D3",
"; c #AFD1DE",
"7 c #EFF8FC",
"u c #C2CBDB",
"# c #C0D1DC",
"2 c #CAD6E1",
"& c #8FB0C3",
/* pixels */
" .XooXO ",
" +@###$+% ",
" .&#*==-;@@ ",
" o:*>,<--:X ",
" 12>-345-#% ",
" 12>678392% ",
" %$*,3059q& ",
" @Oq,wwer@@ ",
" t@q22q&+ ",
" yyui+%o%p ",
" yasy d d ",
" yasfy dd dd ",
"yasfy ddddddddd",
"ysfy dd dd ",
" yy d d "
};

39
wxWidgets/art/floppy.xpm
View File

@@ -1,39 +0,0 @@
/* XPM */
static char *floppy_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 18 1",
"& c #E3E4E6",
"+ c #FFFFFF",
". c #446A8C",
"o c #697787",
"> c #5F666D",
"* c #B2B3B3",
" c None",
", c #4B4C4D",
"= c #DCDBDA",
"$ c #1B4467",
": c #E4E9ED",
"@ c #979BA0",
"X c #203646",
"O c #215579",
"- c #545B63",
"; c #636465",
"# c #CAD6E1",
"% c #7F8286",
/* pixels */
" .XoooooooXO ",
" .o+++++++.O ",
" .o+OOOOO+.O ",
" .o+++++++.O ",
" .o@@@@@@@.O ",
" ..........O ",
" ..#+++++#.O ",
" ..+$O+++#.O ",
" ..+$O+++#.O ",
" %&.........*% ",
"%=+++++++++++&% ",
"--------------; ",
"-:::::::::::::- ",
"-:X:XXXXXXXXX:> ",
"-*************, "
};

43
wxWidgets/art/folder.xpm
View File

@@ -1,43 +0,0 @@
/* XPM */
static char *folder_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 22 1",
"> c #9BACC2",
". c #547897",
"1 c #7F99B4",
"X c #D1D9E5",
"< c #EAEDF3",
"+ c #CAD2DC",
"3 c #718BA7",
"O c #BECAD9",
"$ c #E1E6EE",
"* c #F5F6F7",
", c #8DA0B9",
" c None",
"# c #D6DFE7",
"@ c #D2D9E0",
"- c #FAFCFE",
"; c #ADBACE",
"& c #EEF1F3",
"= c #F8F9FA",
"o c #B3BFD1",
"2 c #7A90AC",
": c #A2B3C5",
"% c #E5EAF1",
/* pixels */
" ",
" ..... ",
" .XXXX. ",
" ............. ",
" .oO+@#$%&*=-. ",
" .oO+@#$%&*=-. ",
" .;oO+X#$%&*=. ",
" .:;oO+X#$%&*. ",
" .>:;oO+X#$%&. ",
" .,>:;oO+X#$<. ",
" .1,>:;oO+X#$. ",
" .21,>:;oO+X#. ",
" .321,>:;oO+X. ",
" ............. ",
" "
};

52
wxWidgets/art/folder_open.xpm
View File

@@ -1,52 +0,0 @@
/* XPM */
static char *folder_open_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 31 1",
"6 c #9BACC2",
"w c #547B99",
"5 c #94A5BD",
". c #376485",
"; c #F1F4F7",
"o c #7F99B4",
"2 c #D1D9E5",
"- c #EAEDF3",
"O c #718BA7",
"0 c #65839D",
"* c #DCE2EA",
": c #F5F6F7",
"7 c #597B9A",
"X c #8DA0B9",
" c None",
"+ c #467291",
"q c #305F81",
"& c #D6DFE7",
"3 c #6A89A2",
"1 c #A8B6CA",
"= c #E4E9ED",
"> c #F8F9FA",
", c #FDFDFE",
"9 c #215579",
"8 c #7F97B0",
"@ c #B3BFD1",
"< c #7A90AC",
"$ c #C2CBDB",
"4 c #A2B3C5",
"% c #CAD6E1",
"# c #BBC4D6",
/* pixels */
" ",
"..... ",
".XXXo. ",
".XXXXO........ ",
".XXXXXXXXXXXX. ",
".XXXXXXXXXXXX. ",
".X++++++++++++++",
".X+@#$%&*=-;:>,+",
".<.1@#$%2*=-;:23",
"..X41@#$%2*=-;3 ",
"..X561@#$%2*=-3 ",
".78X561@#$%2*%3 ",
"90<8X561@#$%23 ",
"q++++++++++++w ",
" "
};

21
wxWidgets/art/forward.xpm
View File

@@ -1,21 +0,0 @@
/* XPM */
static char * forward_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ",
" . ",
" .. ",
" .X. ",
" ........XX. ",
" .XXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXX. ",
" ........XX. ",
" .X. ",
" .. ",
" . ",
" "};

58
wxWidgets/art/gtk/error.xpm
View File

@@ -1,58 +0,0 @@
/* XPM */
static char *error_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 4 1",
" c None",
"X c #242424",
"o c #DCDF00",
". c #C00000",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ............. ",
" ................. ",
" ................... ",
" ....................... ",
" ......................... ",
" ........................... ",
" ...........................X ",
" .............................X ",
" ............................... ",
" ...............................X ",
" .................................X ",
" .................................X ",
" .................................XX ",
" ...ooooooooooooooooooooooooooo...XX ",
" ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ",
" ...ooooooooooooooooooooooooooo...XXX ",
" ...ooooooooooooooooooooooooooo...XXX ",
" .................................XX ",
" .................................XX ",
" ...............................XXX ",
" ...............................XXX ",
" .............................XXX ",
" ...........................XXXX ",
" ...........................XXX ",
" .........................XXX ",
" .......................XXXX ",
" X...................XXXXX ",
" X.................XXXXX ",
" X.............XXXXX ",
" XXXX.....XXXXXXXX ",
" XXXXXXXXXXXXX ",
" XXXXX ",
" ",
" ",
" ",
" ",
" ",
" "
};

63
wxWidgets/art/gtk/info.xpm
View File

@@ -1,63 +0,0 @@
/* XPM */
static char *info_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"$ c Black",
"O c #FFFFFF",
"@ c #808080",
"+ c #000080",
"o c #E8EB01",
" c None",
"X c #FFFF40",
"# c #C0C0C0",
". c #ABAD01",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ..XXXXX.. ",
" ..XXXXXXXXo.. ",
" .XXXOXXXXXXXoo. ",
" .XOOXXX+XXXXXo. ",
" .XOOOXX+++XXXXoo. ",
" .XOOXXX+++XXXXXo. ",
" .XOOOXXX+++XXXXXXo. ",
" .XOOXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXXX. ",
" .XXXXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXoo. ",
" .XXXXXX+++XXXXXo. ",
" .XXXXXXX+XXXXXXo. ",
" .XXXXXXXXXXXXo. ",
" .XXXXX+++XXXoo. ",
" .XXXX+++XXoo. ",
" .XXXXXXXXo. ",
" ..XXXXXXo.. ",
" .XXXXXo.. ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@ ",
" ### ",
" $$$ ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
};

75
wxWidgets/art/gtk/question.xpm
View File

@@ -1,75 +0,0 @@
/* XPM */
static char *question_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 21 1",
". c Black",
"> c #696969",
"O c #1F1F00",
"+ c #181818",
"o c #F6F900",
"; c #3F3F00",
"$ c #111111",
" c None",
"& c #202020",
"X c #AAAA00",
"@ c #949400",
": c #303030",
"1 c #383838",
"% c #2A2A00",
", c #404040",
"= c #B4B400",
"- c #484848",
"# c #151500",
"< c #9F9F00",
"2 c #6A6A00",
"* c #353500",
/* pixels */
" ",
" ",
" ",
" ",
" ......... ",
" ...XXXXXXX.. ",
" ..XXXXoooooXXXO+ ",
" ..XXooooooooooooX@.. ",
" ..XoooooooooooooooXX#. ",
" $%XoooooooooooooooooXX#. ",
" &.XoooooooXXXXXXooooooXX.. ",
" .XooooooXX.$...$XXoooooX*. ",
" $.XoooooX%.$ .*oooooo=.. ",
" .XooooooX.. -.XoooooX.. ",
" .XoooooX..+ .XoooooX;. ",
" ...XXXX..: .XoooooX;. ",
" ........ >.XoooooX;. ",
" +.XoooooX.. ",
" ,.Xoooooo<.. ",
" 1#XooooooXO.. ",
" &#XooooooX2.. ",
" $%XooooooXX.. ",
" $%XooooooXX.. ",
" $%XooooooXX.. ",
" &.XooooooXX.. ",
" .XooooooXX.. ",
" &.XoooooXX.. ",
" ..XooooXX.. ",
" ..XooooX... ",
" ..XXooXX..& ",
" ...XXXXX.. ",
" ........ ",
" ",
" ",
" ....... ",
" ..XXXXX.. ",
" ..XXoooXX.. ",
" ..XoooooX.. ",
" ..XoooooX.. ",
" ..XXoooXX.. ",
" ..XXXXX.. ",
" ....... ",
" ",
" ",
" ",
" ",
" ",
" "
};

63
wxWidgets/art/gtk/warning.xpm
View File

@@ -1,63 +0,0 @@
/* XPM */
static char *warning_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"@ c Black",
"o c #A6A800",
"+ c #8A8C00",
"$ c #B8BA00",
" c None",
"O c #6E7000",
"X c #DCDF00",
". c #C00000",
"# c #373800",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" . ",
" ... ",
" ... ",
" ..... ",
" ...X.. ",
" ..XXX.. ",
" ...XXX... ",
" ..XXXXX.. ",
" ..XXXXXX... ",
" ...XXoO+XX.. ",
" ..XXXO@#XXX.. ",
" ..XXXXO@#XXX... ",
" ...XXXXO@#XXXX.. ",
" ..XXXXXO@#XXXX... ",
" ...XXXXXo@OXXXXX.. ",
" ...XXXXXXo@OXXXXXX.. ",
" ..XXXXXXX$@OXXXXXX... ",
" ...XXXXXXXX@XXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXX... ",
" ..XXXXXXXXXXOXXXXXXXXX.. ",
" ...XXXXXXXXXO@#XXXXXXXXX.. ",
" ..XXXXXXXXXXX#XXXXXXXXXX... ",
" ...XXXXXXXXXXXXXXXXXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXXXXXXXX... ",
" .............................. ",
" .............................. ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
};

60
wxWidgets/art/harddisk.xpm
View File

@@ -1,60 +0,0 @@
/* XPM */
static char *harddisk_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 39 1",
"7 c #E3E4E6",
"4 c #FFFFFF",
"5 c #839CB5",
". c #547897",
"1 c #4D7492",
"@ c #376485",
"o c #7A92A3",
"u c #D1D9E5",
"y c #446A8C",
"i c #51B03D",
"> c #CAD2DC",
"O c #718BA7",
"2 c #65839D",
"6 c #DCE2EA",
"0 c #C3C5C8",
"9 c #F5F6F7",
": c #EBEBEC",
"< c #597B9A",
"t c #C6CCD3",
" c None",
"* c #DFE0E2",
"e c #467291",
"a c #526E8B",
", c #7393AB",
"p c #130A0B",
"# c #AABFCD",
"r c #B4C4D3",
"; c #CFCFD0",
"X c #6F90A6",
"+ c #6A89A2",
"- c #D2D3D4",
"= c #DCDBDA",
"w c #E4E9ED",
"q c #C6C8CA",
"% c #215579",
"$ c #E7E7E7",
"3 c #7F97B0",
"8 c #C0D1DC",
"& c #5D7C93",
/* pixels */
" ",
" .XoooXO+@ ",
" #$$%%%%$$$X ",
" &$*==-;$$$& ",
" &:>+,<1234o5 ",
" ###+67;;78242 ",
" &4,49*0q*9we4. ",
" &4+49*,,*9wo4. ",
"&4%r,67;;782t%4.",
"&44468rrrr84444,",
"y11111111111111e",
"1uu1:::::::::::1",
"1uu1::::::::ip:1",
"auu&:::::::::::1",
"1111111111111111"
};

44
wxWidgets/art/helpicon.xpm
View File

@@ -1,44 +0,0 @@
/* XPM */
static char *helpicon_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 6 1",
" c Gray0",
". c Blue",
"X c #808080808080",
"o c #c0c0c0c0c0c0",
"O c Gray100",
"+ c None",
/* pixels */
"+++++++++++XXXXXXXX+++++++++++++",
"++++++++XXXoOOOOOOoXXX++++++++++",
"++++++XXoOOOOOOOOOOOOoXX++++++++",
"+++++XoOOOOOOOOOOOOOOOOoX+++++++",
"++++XOOOOOOOOOOOOOOOOOOOO ++++++",
"+++XOOOOOOOo......oOOOOOOO +++++",
"++XOOOOOOOo.oOO....oOOOOOOO ++++",
"+XoOOOOOOO..OOOO....OOOOOOOo +++",
"+XOOOOOOOO....OO....OOOOOOOO X++",
"XoOOOOOOOO....Oo....OOOOOOOOo X+",
"XOOOOOOOOOo..oO....OOOOOOOOOO X+",
"XOOOOOOOOOOOOOo...OOOOOOOOOOO XX",
"XOOOOOOOOOOOOO...OOOOOOOOOOOO XX",
"XOOOOOOOOOOOOO..oOOOOOOOOOOOO XX",
"XOOOOOOOOOOOOO..OOOOOOOOOOOOO XX",
"XoOOOOOOOOOOOOOOOOOOOOOOOOOOo XX",
"+XOOOOOOOOOOOo..oOOOOOOOOOOO XXX",
"+XoOOOOOOOOOO....OOOOOOOOOOo XXX",
"++XOOOOOOOOOO....OOOOOOOOOO XXX+",
"+++ OOOOOOOOOo..oOOOOOOOOO XXXX+",
"++++ OOOOOOOOOOOOOOOOOOOO XXXX++",
"+++++ oOOOOOOOOOOOOOOOOo XXXX+++",
"++++++ oOOOOOOOOOOOOo XXXX++++",
"+++++++X oOOOOOOo XXXXX+++++",
"++++++++XXX oOOO XXXXXXX++++++",
"++++++++++XXXX OOO XXXXX++++++++",
"+++++++++++++X OOO XX+++++++++++",
"+++++++++++++++ OO XX+++++++++++",
"++++++++++++++++ O XX+++++++++++",
"+++++++++++++++++ XX+++++++++++",
"++++++++++++++++++XXX+++++++++++",
"+++++++++++++++++++XX+++++++++++"
};

24
wxWidgets/art/home.xpm
View File

@@ -1,24 +0,0 @@
/* XPM */
static char *home_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
". c Black",
"X c #FFFFFF",
" c None",
/* pixels */
" .... ",
" .XXXX. ",
" .XXXXXX. ",
" .XXXXXXXX. ",
" .XXXXXXXXXX. ",
" .............. ",
" .XXXXXXXXXXXX. ",
" .XXXXXXXXXXXX. ",
" .XXXXXXXXXXXX. ",
" .X.....X....X. ",
" .X. .X. .X. ",
" .X. .X. .X. ",
" .X.....X. .X. ",
" .XXXXXXX. .X. ",
" ......... ... "
};

25
wxWidgets/art/htmbook.xpm
View File

@@ -1,25 +0,0 @@
/* XPM */
static char * htmbook_xpm[] = {
"16 16 6 1",
" c None",
". c Black",
"X c #000080",
"o c #c0c0c0",
"O c #808080",
"+ c Gray100",
" ",
" .. ",
" ..XX. ",
" ..XXXXX. ",
" ..XXXXXXXX. ",
".oXXXXXXXXXX. ",
".XoXXXXXXXXXX. ",
".XXoXXXXXXXXXX. ",
".XXXoXXXXXXXXX..",
".XXXXoXXXXXX..O ",
" .XXXXoXXX..O+O ",
" .XXXXo..O++o..",
" .XXX.O+++o.. ",
" .XX.o+o.. ",
" .X.o.. ",
" ... "};

25
wxWidgets/art/htmfoldr.xpm
View File

@@ -1,25 +0,0 @@
/* XPM */
static char * htmfoldr_xpm[] = {
"16 16 6 1",
" c None",
". c Black",
"X c #000080",
"o c #c0c0c0",
"O c #808080",
"+ c Gray100",
" ",
" .. ",
" ..XX. ",
" ..XXXXX. ",
" ..XXXXXXXX. ",
".oXXXXXXXXXX. ",
".XoXXXXXXXXXX. ",
".XXoXXXXXXXXXX. ",
".XXXoXXXXXXXXX..",
".XXXXoXXXXXX..O ",
" .XXXXoXXX..O+O ",
" .XXXXo..O++o..",
" .XXX.O+++o.. ",
" .XX.o+o.. ",
" .X.o.. ",
" ... "};

20
wxWidgets/art/htmoptns.xpm
View File

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

23
wxWidgets/art/htmpage.xpm
View File

@@ -1,23 +0,0 @@
/* XPM */
static char * htmpage_xpm[] = {
"16 16 4 1",
" c None",
". c #808080",
"X c Gray100",
"o c Black",
" ",
" .......... ",
" .XXXXXXXX.. ",
" .XXXXXXXXooo ",
" .X......XXXo ",
" .XXXXXXXXXXo ",
" .X........Xo ",
" .XXXXXXXXXXo ",
" .X........Xo ",
" .XXXXXXXXXXo ",
" .X........Xo ",
" .XXXXXXXXXXo ",
" .X........Xo ",
" .XXXXXXXXXXo ",
" .XXXXXXXXXXo ",
" oooooooooooo "};

27
wxWidgets/art/htmsidep.xpm
View File

@@ -1,27 +0,0 @@
/* XPM */
static char *htmsidep_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 6 1",
". c Black",
"X c #FFFFFF",
"+ c #808080",
" c None",
"O c #0000C0",
"o c #C0C0C0",
/* pixels */
" ",
" .............. ",
" .XXXX.ooooooo. ",
" .XOXX.oo...oo. ",
" .XXOX.ooooooo. ",
" .OOOO.o...+.o. ",
" .XXOX.ooooooo. ",
" .XOXX.ooooooo. ",
" .XXXX.o..+ooo. ",
" .XXOX.ooooooo. ",
" .XOXX.o...+.o. ",
" .OOOO.ooooooo. ",
" .XOXX.o.+...o. ",
" .XXOX.ooooooo. ",
" .............. "
};

25
wxWidgets/art/listview.xpm
View File

@@ -1,25 +0,0 @@
/* XPM */
static char *listview_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c Black",
". c #FFFFFF",
"X c #000084",
"o c #848484",
/* pixels */
" ",
" .............. ",
" .XXX.......... ",
" .XXX. o o . ",
" .XXX.......... ",
" .............. ",
" .XXX.......... ",
" .XXX. o . ",
" .XXX.......... ",
" .............. ",
" .XXX.......... ",
" .XXX. o o . ",
" .XXX.......... ",
" .............. ",
" "
};

43
wxWidgets/art/missimg.xpm
View File

@@ -1,43 +0,0 @@
/* XPM */
static char *missimg_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 5 1",
"X c Black",
"o c #FFFFFF",
" c None",
". c #C0C0C0",
"O c #E0E0E0",
/* pixels */
" .............................X ",
" .ooooooooooooooooooooooooooooX ",
" .ooooooooooooooooooooooooooooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOXOOOOOOOOOOOOOOOOooX ",
" XXXOOOOOXX XOOOOOOOOOOOOOOOooX ",
" XXXXX XOOOOOOOOOOOOOOooX ",
" XOOOXXXOOOOOOOooX ",
" XXX XXOOOOOooX ",
" XOOOOooX ",
" . XOOOooX ",
" .. XXOooX ",
" .o.. XooX ",
" .ooO... XXX ",
" .ooOOOO.......... ",
" .ooOOOOOOOOOOOOOO.. ",
" .ooOOOOOOOOOOOOOOOO.. ",
" .ooOOOOOOOOOOOOOOOOOO......... ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooooooooooooooooooooooooooooX ",
" .ooooooooooooooooooooooooooooX ",
" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "
};

58
wxWidgets/art/motif/error.xpm
View File

@@ -1,58 +0,0 @@
/* XPM */
static char *error_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 4 1",
" c None",
"X c #242424",
"o c #DCDF00",
". c #C00000",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ............. ",
" ................. ",
" ................... ",
" ....................... ",
" ......................... ",
" ........................... ",
" ...........................X ",
" .............................X ",
" ............................... ",
" ...............................X ",
" .................................X ",
" .................................X ",
" .................................XX ",
" ...ooooooooooooooooooooooooooo...XX ",
" ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ",
" ...ooooooooooooooooooooooooooo...XXX ",
" ...ooooooooooooooooooooooooooo...XXX ",
" .................................XX ",
" .................................XX ",
" ...............................XXX ",
" ...............................XXX ",
" .............................XXX ",
" ...........................XXXX ",
" ...........................XXX ",
" .........................XXX ",
" .......................XXXX ",
" X...................XXXXX ",
" X.................XXXXX ",
" X.............XXXXX ",
" XXXX.....XXXXXXXX ",
" XXXXXXXXXXXXX ",
" XXXXX ",
" ",
" ",
" ",
" ",
" ",
" "
};

63
wxWidgets/art/motif/info.xpm
View File

@@ -1,63 +0,0 @@
/* XPM */
static char *info_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"$ c Black",
"O c #FFFFFF",
"@ c #808080",
"+ c #000080",
"o c #E8EB01",
" c None",
"X c #FFFF40",
"# c #C0C0C0",
". c #ABAD01",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ..XXXXX.. ",
" ..XXXXXXXXo.. ",
" .XXXOXXXXXXXoo. ",
" .XOOXXX+XXXXXo. ",
" .XOOOXX+++XXXXoo. ",
" .XOOXXX+++XXXXXo. ",
" .XOOOXXX+++XXXXXXo. ",
" .XOOXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXXX. ",
" .XXXXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXoo. ",
" .XXXXXX+++XXXXXo. ",
" .XXXXXXX+XXXXXXo. ",
" .XXXXXXXXXXXXo. ",
" .XXXXX+++XXXoo. ",
" .XXXX+++XXoo. ",
" .XXXXXXXXo. ",
" ..XXXXXXo.. ",
" .XXXXXo.. ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@ ",
" ### ",
" $$$ ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
};

75
wxWidgets/art/motif/question.xpm
View File

@@ -1,75 +0,0 @@
/* XPM */
static char *question_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 21 1",
". c Black",
"> c #696969",
"O c #1F1F00",
"+ c #181818",
"o c #F6F900",
"; c #3F3F00",
"$ c #111111",
" c None",
"& c #202020",
"X c #AAAA00",
"@ c #949400",
": c #303030",
"1 c #383838",
"% c #2A2A00",
", c #404040",
"= c #B4B400",
"- c #484848",
"# c #151500",
"< c #9F9F00",
"2 c #6A6A00",
"* c #353500",
/* pixels */
" ",
" ",
" ",
" ",
" ......... ",
" ...XXXXXXX.. ",
" ..XXXXoooooXXXO+ ",
" ..XXooooooooooooX@.. ",
" ..XoooooooooooooooXX#. ",
" $%XoooooooooooooooooXX#. ",
" &.XoooooooXXXXXXooooooXX.. ",
" .XooooooXX.$...$XXoooooX*. ",
" $.XoooooX%.$ .*oooooo=.. ",
" .XooooooX.. -.XoooooX.. ",
" .XoooooX..+ .XoooooX;. ",
" ...XXXX..: .XoooooX;. ",
" ........ >.XoooooX;. ",
" +.XoooooX.. ",
" ,.Xoooooo<.. ",
" 1#XooooooXO.. ",
" &#XooooooX2.. ",
" $%XooooooXX.. ",
" $%XooooooXX.. ",
" $%XooooooXX.. ",
" &.XooooooXX.. ",
" .XooooooXX.. ",
" &.XoooooXX.. ",
" ..XooooXX.. ",
" ..XooooX... ",
" ..XXooXX..& ",
" ...XXXXX.. ",
" ........ ",
" ",
" ",
" ....... ",
" ..XXXXX.. ",
" ..XXoooXX.. ",
" ..XoooooX.. ",
" ..XoooooX.. ",
" ..XXoooXX.. ",
" ..XXXXX.. ",
" ....... ",
" ",
" ",
" ",
" ",
" ",
" "
};

63
wxWidgets/art/motif/warning.xpm
View File

@@ -1,63 +0,0 @@
/* XPM */
static char *warning_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"@ c Black",
"o c #A6A800",
"+ c #8A8C00",
"$ c #B8BA00",
" c None",
"O c #6E7000",
"X c #DCDF00",
". c #C00000",
"# c #373800",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" . ",
" ... ",
" ... ",
" ..... ",
" ...X.. ",
" ..XXX.. ",
" ...XXX... ",
" ..XXXXX.. ",
" ..XXXXXX... ",
" ...XXoO+XX.. ",
" ..XXXO@#XXX.. ",
" ..XXXXO@#XXX... ",
" ...XXXXO@#XXXX.. ",
" ..XXXXXO@#XXXX... ",
" ...XXXXXo@OXXXXX.. ",
" ...XXXXXXo@OXXXXXX.. ",
" ..XXXXXXX$@OXXXXXX... ",
" ...XXXXXXXX@XXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXX... ",
" ..XXXXXXXXXXOXXXXXXXXX.. ",
" ...XXXXXXXXXO@#XXXXXXXXX.. ",
" ..XXXXXXXXXXX#XXXXXXXXXX... ",
" ...XXXXXXXXXXXXXXXXXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXXXXXXXX... ",
" .............................. ",
" .............................. ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
};

50
wxWidgets/art/new.xpm
View File

@@ -1,50 +0,0 @@
/* XPM */
static char *new_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 29 1",
"* c #97C4E7",
"- c #72A8D2",
": c #FFFFFF",
"9 c #839CB5",
"o c #6B98B8",
"X c #5A89A6",
"# c #3A749C",
", c #D1E5F5",
"0 c #85A7BC",
"$ c #C3DDF1",
"8 c #749BB4",
"; c #5F9BC8",
" c None",
"+ c #538DB3",
"= c #85BBE2",
"3 c #EFF6FC",
"O c #6591AE",
"5 c #F7FBFD",
"7 c #FAFCFE",
"< c #DAEAF7",
"4 c #E9F3FA",
"6 c #FDFDFE",
"1 c #E2EFF8",
". c #8EA9BC",
"% c #B6D5EE",
"& c #A5CCEA",
"> c #ACE95B",
"2 c #F4F9FD",
"@ c #4581AA",
/* pixels */
" .XoOO+@#. ",
" .$$%&*=O-; ",
" @@@@$%&*O:*o ",
" @>>@$$%&O::*o ",
"@@@>>@@@$%OOoO+ ",
"@>>>>>>@,$%&*=+ ",
"@>>>>>>@<,$%&*+ ",
"@@@>>@@@1<,$%&O ",
" @>>@2341<,$%O ",
" @@@@52341<,$o ",
" .:6752341<,8 ",
" .::6752341<8 ",
" .:::67523419 ",
" .::::6752340 ",
" ............ "
};

43
wxWidgets/art/new_dir.xpm
View File

@@ -1,43 +0,0 @@
/* XPM */
static char *new_dir_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 22 1",
"X c Black",
"> c #9BACC2",
"o c #547897",
"1 c #7F99B4",
"O c #D1D9E5",
"< c #EAEDF3",
"# c #CAD2DC",
"3 c #718BA7",
"@ c #BECAD9",
"& c #E1E6EE",
"; c #F5F6F7",
". c #FFFF00",
", c #8DA0B9",
" c None",
"% c #D6DFE7",
"$ c #D2D9E0",
"- c #ADBACE",
"= c #EEF1F3",
"+ c #B3BFD1",
"2 c #7A90AC",
": c #A2B3C5",
"* c #E5EAF1",
/* pixels */
" .X .XX.",
" ooooo .X.X. ",
" oOOOOo XX...XX",
" oooooooo.......",
" o+@#$%&*XX...XX",
" o+@#$%&*=.X.X. ",
" o-+@#O%&.X;.X .",
" o:-+@#O%&*=;o ",
" o>:-+@#O%&*=o ",
" o,>:-+@#O%&<o ",
" o1,>:-+@#O%&o ",
" o21,>:-+@#O%o ",
" o321,>:-+@#Oo ",
" ooooooooooooo ",
" "
};

46
wxWidgets/art/paste.xpm
View File

@@ -1,46 +0,0 @@
/* XPM */
static char *paste_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 25 1",
"< c #FEECE4",
"> c #FEE3D7",
"O c #FFFFFF",
"o c #7B767D",
"% c #F79586",
"& c #CAE1F3",
"@ c #F08B62",
"# c #FCCBB8",
"- c #FDD8C9",
"4 c #FFF8F4",
"5 c #FFF5F0",
" c None",
"$ c #F8AA8F",
", c #EFF6FC",
"1 c #F7FBFD",
"2 c #FAFCFE",
"; c #DAEAF7",
": c #E9F3FA",
"6 c #FFFAF8",
". c #3C78A6",
"3 c #FFF1ED",
"X c #9B8687",
"+ c #FBBCA4",
"* c #B6D5EE",
"= c #F4F9FD",
/* pixels */
" ...... ",
" .XoOOOOoo. ",
".+XOOOOOOX@. ",
".+XXXXXXXX@. ",
".#++$$%@..... ",
".##++$$%.&*.=. ",
".-##++$$.;&.==. ",
".--##++$.:;.... ",
".>--##++.,:;&*. ",
".<>--##+.1,:;&. ",
".<<>--##.21,:;. ",
".3<<>--#.O21=:. ",
".45<<>--....... ",
".6453<>----. ",
"............ "
};

60
wxWidgets/art/print.xpm
View File

@@ -1,60 +0,0 @@
/* XPM */
static char *print_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 39 1",
"< c #E3E4E6",
"+ c #C3C3C4",
"i c #FFFFFF",
": c #74879B",
"# c #5A89A6",
"a c #F1F4F7",
"r c #5A809C",
"@ c #BDCCD9",
"e c #7A92A4",
"% c #3F6F93",
"t c #9FA2A6",
"3 c #939495",
"w c #5F666D",
"9 c #65839E",
"5 c #4A7291",
"$ c #4B7F9E",
" c None",
"O c #DFE0E2",
"o c #F3F3F3",
"; c #84A5BB",
"& c #467291",
". c #7897AD",
"* c #407598",
"4 c #CFCFD0",
"7 c #6F90A6",
"y c #6A89A2",
"0 c #AAADB2",
"1 c #D2D3D4",
"u c #4F7592",
", c #BCBDBE",
"p c #57778E",
"q c #979BA0",
"2 c #ABABAC",
"- c #E7E7E7",
"= c #D6DEE6",
"> c #9FA0A0",
"8 c #829EB5",
"X c #8FB0C3",
"6 c #5D7C93",
/* pixels */
" .XXXXXXXX ",
" .oooooooX ",
" .OOOOOOOX ",
" .+++++++X ",
"@##$%&&&&&%*##@ ",
"$=-;:>,<123$-=$ ",
".44.5678.96$44. ",
"7,,,,,,,,,,,,,7 ",
"900qwwwwwwwe009 ",
"rtt9ryyyyyyuttr ",
"6qq6iiiiiii%qq6 ",
"633paiiiiii%336 ",
"XXX*iiiiiii%XXX ",
" 6iiiiiii% ",
" $XXXXXXX# "
};

90
wxWidgets/art/quit.xpm
View File

@@ -1,90 +0,0 @@
/* XPM */
static char *quit_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 69 1",
"@ c Black",
"i c #9AEA53",
"D c #7E9BB1",
"H c #839FB4",
", c #B7C7D3",
"8 c #BCCBD6",
"7 c #C1CFDA",
"v c #92ABBD",
"- c #D0DBE2",
"O c #547897",
"+ c #376485",
"L c #7090A8",
"t c #AEC0CE",
"g c #B3C4D1",
"S c #84A0B4",
"G c #89A4B8",
"> c #BDCCD7",
"F c #5A809C",
"2 c #C2D0DA",
"k c #93ACBE",
"= c #D6E0E6",
"* c #446A8C",
"z c #A5B9C8",
"# c #DEE5EB",
"0 c #AFC1CE",
"r c #B4C5D2",
"p c #B9C9D5",
"A c #8AA5B8",
"M c #92AABD",
"j c #A6BAC9",
"K c #7796AC",
"l c #ABBECC",
"o c #E4EAEF",
"9 c #B5C6D2",
" c None",
"; c #C9D6DF",
"X c #305F81",
"m c #98AFC0",
"V c #9DB3C3",
"% c #D1DBE3",
"u c #A2B7C6",
"y c #A7BBCA",
"h c #ACBFCD",
"4 c #B6C7D3",
"w c #C0CFD9",
"d c #982106",
"B c #85A0B5",
"6 c #C8D4DE",
"c c #99B0C1",
"x c #9EB4C4",
"$ c #D7E0E7",
"q c #A8BCCA",
"s c #ADC0CD",
"3 c #BCCCD7",
"N c #8BA5B9",
": c #C4D1DB",
"1 c #C9D5DE",
"f c #9AB1C2",
"n c #A4B9C8",
"a c #B3C5D1",
". c #215579",
"J c #7D9AB0",
"& c #829EB5",
"e c #BBCAD6",
"b c #8CA6B9",
"Z c #91AABC",
"C c #96AEC0",
"< c #CFDAE2",
"5 c #AFC2CF",
/* pixels */
" ..XXXXXXXXXX ",
" XoO+X@@@@@@X ",
" X#$%&X*@@@@X ",
" X=-;:>,X@@@X ",
" X<12345X@@@X ",
" X67890qX@XXX ",
" XwertyuX@XiX ",
" XpasddfX++iiX ",
" XghjddkXiiiiiX ",
" XlzxcvbXiiiiiiX",
" XnxmMNBXiiiiiX ",
" XVCZASDXXXiiX ",
" XXFGHJKX XiX ",
" FXXFLX XX ",
" XX* "
};

58
wxWidgets/art/redo.xpm
View File

@@ -1,58 +0,0 @@
/* XPM */
static char *redo_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 37 1",
"4 c #9BACC2",
"; c #4C7398",
"3 c #547B99",
"* c #547897",
"# c #5A89A6",
"8 c #3A749C",
"5 c #5A809C",
", c #7F99B4",
"& c #3F6F93",
"9 c #85A7BC",
"+ c #749BB4",
"> c #718BA7",
"e c #A5B3C8",
"w c #BECAD9",
": c #65839D",
"u c #E1E6EE",
"o c #236289",
"r c #ADBED2",
"= c #597B9A",
"2 c #8DA0B9",
" c None",
"% c #467291",
"1 c #7393AB",
"i c #4C809F",
"- c #A0BACB",
"O c #6591AE",
"X c #407598",
"6 c #6F90A6",
"t c #D2D9E0",
"7 c #ADBACE",
"@ c #326A8F",
"0 c #467A9C",
". c #ACC4D3",
"< c #7F97B0",
"y c #B3BFD1",
"q c #A2B3C5",
"$ c #8FB0C3",
/* pixels */
" .XoooO ",
" +o@@@@@o# +",
" $@%%&@&%%&@ +o",
" X*=@+-+@*=;@#&@",
" @:=+ @=:=*:@",
" &>:$ @:>>>@",
" &,<X X>,,,&",
" +123 @<2222&",
" X44X #@56<44X",
" O1748 .9#&o",
" 0qwe8 ",
" 8rty8 ",
" 8wu+ ",
" i## ",
" "
};

44
wxWidgets/art/removable.xpm
View File

@@ -1,44 +0,0 @@
/* XPM */
static char *removable_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 23 1",
"@ c #C3C3C4",
"4 c #FFFFFF",
"o c #D5D6D8",
"> c #7A92A3",
". c #8497A5",
"% c #ACAEB2",
"2 c #4A7898",
": c #DCE2EA",
", c #F5F6F7",
"= c #EBEBEC",
"$ c #B7B7B8",
" c None",
"X c #DFE0E2",
"* c #A6A8AD",
"1 c #4C809F",
"3 c #407598",
"O c #CFCFD0",
"; c #9EA2A8",
"# c #BCBDBE",
"+ c #C6C8CA",
"- c #979BA0",
"& c #E7E7E7",
"< c #8FB0C3",
/* pixels */
" ......... ",
" .XoO+@#$%. ",
" .XoO+@#$%. ",
" .&XoO+@#$%*. ",
" .&XoO+@#$%*. ",
" .=&XoO+@#$%*-. ",
" .=&XoO+@#$%*;. ",
".:=&XoO+@#$%*;>.",
".,=&XoO+@#$%*;-.",
"<..............<",
"<,=&XoO+@#$%%%%.",
"<O1111122233*4*.",
"<OOOOOOOOOOO***.",
" <<<<<<<<<<<<<< ",
" "
};

24
wxWidgets/art/repview.xpm
View File

@@ -1,24 +0,0 @@
/* XPM */
static char *repview_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
" c Black",
"X c #FFFFFF",
". c #C0C0C0",
/* pixels */
" ",
" .............. ",
" . . . . ",
" .............. ",
" .............. ",
" XXXXXXXXXXXXXX ",
" X X X X ",
" XXXXXXXXXXXXXX ",
" X X X X ",
" XXXXXXXXXXXXXX ",
" X X X X ",
" XXXXXXXXXXXXXX ",
" X X X X ",
" XXXXXXXXXXXXXX ",
" "
};

17
wxWidgets/art/tick.xpm
View File

@@ -1,17 +0,0 @@
/* XPM */
static char *tick_xpm[] = {
/* columns rows colors chars-per-pixel */
"10 10 2 1",
". c Gray0",
" c None",
/* pixels */
" ",
" ..",
" ...",
" ... ",
".. ... ",
"... ... ",
" ..... ",
" ... ",
" . ",
" "};

47
wxWidgets/art/tipicon.xpm
View File

@@ -1,47 +0,0 @@
/* XPM */
static char *tipicon_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 9 1",
"$ c Black",
"O c #FFFFFF",
"@ c #808080",
"+ c #000080",
"o c #E8EB01",
" c None",
"X c #FFFF40",
"# c #C0C0C0",
". c #ABAD01",
/* pixels */
" ",
" ..... ",
" ..XXXXX.. ",
" ..XXXXXXXXo.. ",
" .XXXOXXXXXXXoo. ",
" .XOOXXX+XXXXXo. ",
" .XOOOXX+++XXXXoo. ",
" .XOOXXX+++XXXXXo. ",
" .XOOOXXX+++XXXXXXo. ",
" .XOOXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXXX. ",
" .XXXXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXoo. ",
" .XXXXXX+++XXXXXo. ",
" .XXXXXXX+XXXXXXo. ",
" .XXXXXXXXXXXXo. ",
" .XXXXX+++XXXoo. ",
" .XXXX+++XXoo. ",
" .XXXXXXXXo. ",
" ..XXXXXXo.. ",
" .XXXXXo.. ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@ ",
" ### ",
" $$$ ",
" ",
" ",
" "
};

21
wxWidgets/art/toparent.xpm
View File

@@ -1,21 +0,0 @@
/* XPM */
static char * toparent_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" .. ",
" .XX. ",
" .XXXX. ",
" .XXXXXX. ",
" .XXXXXXXX. ",
" ....XXXX.... ",
" .XXXX. ",
" .XXXX..... ",
" .XXXXXXXX. ",
" .XXXXXXXX. ",
" .XXXXXXXX. ",
" .XXXXXXXX. ",
" .......... ",
" "};

58
wxWidgets/art/undo.xpm
View File

@@ -1,58 +0,0 @@
/* XPM */
static char *undo_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 37 1",
"4 c #9BACC2",
"* c #4C7398",
"2 c #547B99",
"- c #547897",
"@ c #5A89A6",
"8 c #3A749C",
"6 c #5A809C",
", c #7F99B4",
"$ c #3F6F93",
"7 c #85A7BC",
"+ c #749BB4",
"> c #718BA7",
"0 c #A5B3C8",
"q c #BECAD9",
": c #65839D",
"u c #E1E6EE",
"X c #236289",
"y c #ADBED2",
"= c #597B9A",
"1 c #8DA0B9",
" c None",
"% c #467291",
"3 c #7393AB",
"i c #4C809F",
"; c #A0BACB",
". c #6591AE",
"o c #407598",
"5 c #6F90A6",
"t c #D2D9E0",
"9 c #ADBACE",
"# c #326A8F",
"e c #467A9C",
"O c #ACC4D3",
"< c #7F97B0",
"r c #B3BFD1",
"w c #A2B3C5",
"& c #8FB0C3",
/* pixels */
" .XXXoO ",
"+ @X#####X+ ",
"X+ #$%%$#$%%#& ",
"#$@#*=-#+;+#=-o ",
"#:-=:=# +=:# ",
"#>>>:# &:>$ ",
"$,,,>o o<,$ ",
"$1111<# 213+ ",
"o44<56#@ o44o ",
"X$@7O 8493. ",
" 80qwe ",
" 8rty8 ",
" +uq8 ",
" @@i ",
" "
};

21
wxWidgets/art/up.xpm
View File

@@ -1,21 +0,0 @@
/* XPM */
static char * up_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" .. ",
" .XX. ",
" .XXXX. ",
" .XXXXXX. ",
" .XXXXXXXX. ",
" ....XXXX.... ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" ...... ",
" "};

BIN
wxWidgets/art/wxwin.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
wxWidgets/art/wxwin16x16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

25
wxWidgets/art/wxwin16x16.xpm
View File

@@ -1,25 +0,0 @@
/* XPM */
static char *wxwin16x16_xpm[] = {
"16 16 6 1",
" c None",
". c #000000",
"X c #000084",
"o c #FFFFFF",
"O c #FFFF00",
"+ c #FF0000",
" ",
" ",
" ....... ",
" .XXXXX. ",
" .oXXXX. ",
" .oXXX.......",
".....oXXX.OOOOO.",
".+++.XXXX.oOOOO.",
".o++......oOOOO.",
".o++++. .oOOOO.",
".o++++. .OOOOO.",
".+++++. .......",
"....... ",
" ",
" ",
" "};

BIN
wxWidgets/art/wxwin32x32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

41
wxWidgets/art/wxwin32x32.xpm
View File

@@ -1,41 +0,0 @@
/* XPM */
static char *wxwin32x32_xpm[] = {
"32 32 6 1",
" c None",
". c #000000",
"X c #000084",
"o c #FFFFFF",
"O c #FFFF00",
"+ c #FF0000",
" ",
" ",
" ",
" ",
" ",
" .............. ",
" .XXXXXXXXXXXX. ",
" .XXXXXXXXXXXX. ",
" .XooXXXXXXXXX. ",
" .XooXXXXXXXXX. ",
" .XooXXXXXXXXX. ",
" .XooXXXXXX..............",
" .XooXXXXXX.OOOOOOOOOOOO.",
".........XooXXXXXX.OOOOOOOOOOOO.",
".+++++++.XooXXXXXX.OooOOOOOOOOO.",
".+++++++.XooXXXXXX.OooOOOOOOOOO.",
".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
".+oo++++...........OooOOOOOOOOO.",
".+oo+++++++++. .OooOOOOOOOOO.",
".+oo+++++++++. .OooOOOOOOOOO.",
".+oo+++++++++. .OooOOOOOOOOO.",
".+oo+++++++++. .OOOOOOOOOOOO.",
".+oo+++++++++. .OOOOOOOOOOOO.",
".++++++++++++. ..............",
".++++++++++++. ",
".............. ",
" ",
" ",
" ",
" ",
" "};

940
wxWidgets/autoconf_inc.m4
View File

File diff suppressed because one or more lines are too long

3
wxWidgets/autogen.sh
View File

@@ -1,3 +0,0 @@
#!/bin/sh
#autoconf
make -f build/autogen.mk

1
wxWidgets/build/.cvsignore
View File

@@ -1 +0,0 @@
wince

27
wxWidgets/build/README.txt
View File

@@ -1,27 +0,0 @@
autogen.mk
autogen.mk is a makefile provided to automatically update the GNU autotools
build system. It will run Bakefile, aclocal, and autoconf as appropriate.
The .m4 files required for running aclocal are located in build/aclocal.
When upgrading software that wxWidgets depends on (for example, Bakefile,
cppunit, GTK, SDL, or others) it is advisable to upgrade the .m4 files
located in the build/aclocal directory.
It is particularly important that if you use a newer version of Bakefile
to generate the Makefile.in files that you use the newer bakefile*.m4.
Because build/autogen.mk is a Makefile it will automatically rerun
aclocal and autoconf as necessary whenever any m4 in build/aclocal is
newer than the generated aclocal.m4.
You can achieve this simply by copying the new bakefile*.m4 files from
PREFIX/share/aclocal/ into the build/aclocal/ directory and
rerunning make -f build/autogen.mk. Note that you should _not_ preserve
source file times (don't use cp -p) or else it's possible your .m4 files
will be older than the generated aclocal.m4).
Example:
cp /usr/share/aclocal/bakefile*.m4 build/aclocal/
make -f build/autogen.mk
Please don't forget to commit updated .m4 files as well as updated aclocal.m4,
configure, and Makefile.in files to wxWidgets.

78
wxWidgets/build/aclocal/ac_raf_func_which_getservbyname_r.m4
View File

@@ -1,78 +0,0 @@
dnl @synopsis AC_raf_FUNC_WHICH_GETSERVBYNAME_R
dnl
dnl Provides a test to determine the correct way to call
dnl getservbyname_r:
dnl
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_6 if it needs 6 arguments (e.g linux)
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_5 if it needs 5 arguments (e.g. solaris)
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_4 if it needs 4 arguments (e.g. osf/1)
dnl
dnl An example use can be found at
dnl http://raf.org/autoconf/net_getservbyname.c
dnl
dnl Based on Caolan McNamara's gethostbyname_r macro. Based on David
dnl Arnold's autoconf suggestion in the threads faq.
dnl
dnl @category Misc
dnl @author raf <raf@raf.org>
dnl @version 2001-08-20
dnl @license GPLWithACException
AC_DEFUN([AC_raf_FUNC_WHICH_GETSERVBYNAME_R],
[
AC_CACHE_CHECK(how many arguments getservbyname_r() takes,
ac_cv_func_which_getservbyname_r,
[
dnl we need to use C++ to detect missing prototypes
AC_LANG_PUSH(C++)
AC_TRY_COMPILE([#include <netdb.h>],
[
char *name;
char *proto;
struct servent *se, *res;
char buffer[2048];
int buflen = 2048;
(void) getservbyname_r(name, proto, se, buffer, buflen, &res)
],
ac_cv_func_which_getservbyname_r=six,
[
AC_TRY_COMPILE([#include <netdb.h>],
[
char *name;
char *proto;
struct servent *se;
char buffer[2048];
int buflen = 2048;
(void) getservbyname_r(name, proto, se, buffer, buflen)
],
ac_cv_func_which_getservbyname_r=five,
[
AC_TRY_COMPILE([#include <netdb.h>],
[
char *name;
char *proto;
struct servent *se;
struct servent_data data;
(void) getservbyname_r(name, proto, se, &data);
],
ac_cv_func_which_getservbyname_r=four,
ac_cv_func_which_getservbyname_r=no
)
]
)
]
)
AC_LANG_POP()
]
)
if test $ac_cv_func_which_getservbyname_r = six; then
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_6)
elif test $ac_cv_func_which_getservbyname_r = five; then
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_5)
elif test $ac_cv_func_which_getservbyname_r = four; then
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_4)
fi
])

155
wxWidgets/build/aclocal/ax_func_which_gethostbyname_r.m4
View File

@@ -1,155 +0,0 @@
dnl @synopsis AX_FUNC_WHICH_GETHOSTBYNAME_R
dnl
dnl Determines which historical variant of the gethostbyname_r() call
dnl (taking three, five, or six arguments) is available on the system
dnl and defines one of the following macros accordingly:
dnl
dnl HAVE_FUNC_GETHOSTBYNAME_R_6
dnl HAVE_FUNC_GETHOSTBYNAME_R_5
dnl HAVE_FUNC_GETHOSTBYNAME_R_3
dnl
dnl If used in conjunction with gethostname.c, the API demonstrated in
dnl test.c can be used regardless of which gethostbyname_r() is
dnl available. These example files can be found at
dnl http://www.csn.ul.ie/~caolan/publink/gethostbyname_r
dnl
dnl based on David Arnold's autoconf suggestion in the threads faq
dnl
dnl Originally named "AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten
dnl for Autoconf 2.5x by Daniel Richard G.
dnl
dnl @category InstalledPackages
dnl @author Caolan McNamara <caolan@skynet.ie>
dnl @author Daniel Richard G. <skunk@iskunk.org>
dnl @version 2005-01-21
dnl @license GPLWithACException
AC_DEFUN([AX_FUNC_WHICH_GETHOSTBYNAME_R], [
AC_LANG_PUSH(C)
AC_MSG_CHECKING([how many arguments gethostbyname_r() takes])
AC_CACHE_VAL(ac_cv_func_which_gethostbyname_r, [
################################################################
ac_cv_func_which_gethostbyname_r=unknown
#
# ONE ARGUMENT (sanity check)
#
# This should fail, as there is no variant of gethostbyname_r() that takes
# a single argument. If it actually compiles, then we can assume that
# netdb.h is not declaring the function, and the compiler is thereby
# assuming an implicit prototype. In which case, we're out of luck.
#
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
(void)gethostbyname_r(name) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=no)
#
# SIX ARGUMENTS
# (e.g. Linux)
#
if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
struct hostent ret, *retp;
char buf@<:@1024@:>@;
int buflen = 1024;
int my_h_errno;
(void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=six)
fi
#
# FIVE ARGUMENTS
# (e.g. Solaris)
#
if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
struct hostent ret;
char buf@<:@1024@:>@;
int buflen = 1024;
int my_h_errno;
(void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=five)
fi
#
# THREE ARGUMENTS
# (e.g. AIX, HP-UX, Tru64)
#
if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
struct hostent ret;
struct hostent_data data;
(void)gethostbyname_r(name, &ret, &data) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=three)
fi
################################################################
]) dnl end AC_CACHE_VAL
case "$ac_cv_func_which_gethostbyname_r" in
three)
AC_MSG_RESULT([three])
AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_3)
;;
five)
AC_MSG_RESULT([five])
AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_5)
;;
six)
AC_MSG_RESULT([six])
AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_6)
;;
no)
AC_MSG_RESULT([cannot find function declaration in netdb.h])
;;
unknown)
AC_MSG_RESULT([can't tell])
;;
*)
AC_MSG_ERROR([internal error])
;;
esac
AC_LANG_POP(C)
]) dnl end AC_DEFUN

483
wxWidgets/build/aclocal/bakefile-dllar.m4
View File

@@ -1,483 +0,0 @@
AC_DEFUN([AC_BAKEFILE_CREATE_FILE_DLLAR_SH],
[
dnl ===================== dllar.sh begins here =====================
dnl (Created by merge-scripts.py from dllar.sh
dnl file do not edit here!)
D='$'
cat <<EOF >dllar.sh
#!/bin/sh
#
# dllar - a tool to build both a .dll and an .a file
# from a set of object (.o) files for EMX/OS2.
#
# Written by Andrew Zabolotny, bit@freya.etu.ru
# Ported to Unix like shell by Stefan Neis, Stefan.Neis@t-online.de
#
# This script will accept a set of files on the command line.
# All the public symbols from the .o files will be exported into
# a .DEF file, then linker will be run (through gcc) against them to
# build a shared library consisting of all given .o files. All libraries
# (.a) will be first decompressed into component .o files then act as
# described above. You can optionally give a description (-d "description")
# which will be put into .DLL. To see the list of accepted options (as well
# as command-line format) simply run this program without options. The .DLL
# is built to be imported by name (there is no guarantee that new versions
# of the library you build will have same ordinals for same symbols).
#
# dllar is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# dllar is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with dllar; see the file COPYING. If not, write to the Free
# Software Foundation, 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
# To successfuly run this program you will need:
# - Current drive should have LFN support (HPFS, ext2, network, etc)
# (Sometimes dllar generates filenames which won't fit 8.3 scheme)
# - gcc
# (used to build the .dll)
# - emxexp
# (used to create .def file from .o files)
# - emximp
# (used to create .a file from .def file)
# - GNU text utilites (cat, sort, uniq)
# used to process emxexp output
# - GNU file utilities (mv, rm)
# - GNU sed
# - lxlite (optional, see flag below)
# (used for general .dll cleanup)
#
flag_USE_LXLITE=1;
#
# helper functions
# basnam, variant of basename, which does _not_ remove the path, _iff_
# second argument (suffix to remove) is given
basnam(){
case ${D}# in
1)
echo ${D}1 | sed 's/.*\\///' | sed 's/.*\\\\//'
;;
2)
echo ${D}1 | sed 's/'${D}2'${D}//'
;;
*)
echo "error in basnam ${D}*"
exit 8
;;
esac
}
# Cleanup temporary files and output
CleanUp() {
cd ${D}curDir
for i in ${D}inputFiles ; do
case ${D}i in
*!)
rm -rf \`basnam ${D}i !\`
;;
*)
;;
esac
done
# Kill result in case of failure as there is just to many stupid make/nmake
# things out there which doesn't do this.
if @<:@ ${D}# -eq 0 @:>@; then
rm -f ${D}arcFile ${D}arcFile2 ${D}defFile ${D}dllFile
fi
}
# Print usage and exit script with rc=1.
PrintHelp() {
echo 'Usage: dllar.sh @<:@-o@<:@utput@:>@ output_file@:>@ @<:@-i@<:@mport@:>@ importlib_name@:>@'
echo ' @<:@-name-mangler-script script.sh@:>@'
echo ' @<:@-d@<:@escription@:>@ "dll descrption"@:>@ @<:@-cc "CC"@:>@ @<:@-f@<:@lags@:>@ "CFLAGS"@:>@'
echo ' @<:@-ord@<:@inals@:>@@:>@ -ex@<:@clude@:>@ "symbol(s)"'
echo ' @<:@-libf@<:@lags@:>@ "{INIT|TERM}{GLOBAL|INSTANCE}"@:>@ @<:@-nocrt@<:@dll@:>@@:>@ @<:@-nolxl@<:@ite@:>@@:>@'
echo ' @<:@*.o@:>@ @<:@*.a@:>@'
echo '*> "output_file" should have no extension.'
echo ' If it has the .o, .a or .dll extension, it is automatically removed.'
echo ' The import library name is derived from this and is set to "name".a,'
echo ' unless overridden by -import'
echo '*> "importlib_name" should have no extension.'
echo ' If it has the .o, or .a extension, it is automatically removed.'
echo ' This name is used as the import library name and may be longer and'
echo ' more descriptive than the DLL name which has to follow the old '
echo ' 8.3 convention of FAT.'
echo '*> "script.sh may be given to override the output_file name by a'
echo ' different name. It is mainly useful if the regular make process'
echo ' of some package does not take into account OS/2 restriction of'
echo ' DLL name lengths. It takes the importlib name as input and is'
echo ' supposed to procude a shorter name as output. The script should'
echo ' expect to get importlib_name without extension and should produce'
echo ' a (max.) 8 letter name without extension.'
echo '*> "cc" is used to use another GCC executable. (default: gcc.exe)'
echo '*> "flags" should be any set of valid GCC flags. (default: -s -Zcrtdll)'
echo ' These flags will be put at the start of GCC command line.'
echo '*> -ord@<:@inals@:>@ tells dllar to export entries by ordinals. Be careful.'
echo '*> -ex@<:@clude@:>@ defines symbols which will not be exported. You can define'
echo ' multiple symbols, for example -ex "myfunc yourfunc _GLOBAL*".'
echo ' If the last character of a symbol is "*", all symbols beginning'
echo ' with the prefix before "*" will be exclude, (see _GLOBAL* above).'
echo '*> -libf@<:@lags@:>@ can be used to add INITGLOBAL/INITINSTANCE and/or'
echo ' TERMGLOBAL/TERMINSTANCE flags to the dynamically-linked library.'
echo '*> -nocrt@<:@dll@:>@ switch will disable linking the library against emx''s'
echo ' C runtime DLLs.'
echo '*> -nolxl@<:@ite@:>@ switch will disable running lxlite on the resulting DLL.'
echo '*> All other switches (for example -L./ or -lmylib) will be passed'
echo ' unchanged to GCC at the end of command line.'
echo '*> If you create a DLL from a library and you do not specify -o,'
echo ' the basename for DLL and import library will be set to library name,'
echo ' the initial library will be renamed to 'name'_s.a (_s for static)'
echo ' i.e. "dllar gcc.a" will create gcc.dll and gcc.a, and the initial'
echo ' library will be renamed into gcc_s.a.'
echo '--------'
echo 'Example:'
echo ' dllar -o gcc290.dll libgcc.a -d "GNU C runtime library" -ord'
echo ' -ex "__main __ctordtor*" -libf "INITINSTANCE TERMINSTANCE"'
CleanUp
exit 1
}
# Execute a command.
# If exit code of the commnad <> 0 CleanUp() is called and we'll exit the script.
# @Uses Whatever CleanUp() uses.
doCommand() {
echo "${D}*"
eval ${D}*
rcCmd=${D}?
if @<:@ ${D}rcCmd -ne 0 @:>@; then
echo "command failed, exit code="${D}rcCmd
CleanUp
exit ${D}rcCmd
fi
}
# main routine
# setup globals
cmdLine=${D}*
outFile=""
outimpFile=""
inputFiles=""
renameScript=""
description=""
CC=gcc.exe
CFLAGS="-s -Zcrtdll"
EXTRA_CFLAGS=""
EXPORT_BY_ORDINALS=0
exclude_symbols=""
library_flags=""
curDir=\`pwd\`
curDirS=curDir
case ${D}curDirS in
*/)
;;
*)
curDirS=${D}{curDirS}"/"
;;
esac
# Parse commandline
libsToLink=0
omfLinking=0
while @<:@ ${D}1 @:>@; do
case ${D}1 in
-ord*)
EXPORT_BY_ORDINALS=1;
;;
-o*)
shift
outFile=${D}1
;;
-i*)
shift
outimpFile=${D}1
;;
-name-mangler-script)
shift
renameScript=${D}1
;;
-d*)
shift
description=${D}1
;;
-f*)
shift
CFLAGS=${D}1
;;
-c*)
shift
CC=${D}1
;;
-h*)
PrintHelp
;;
-ex*)
shift
exclude_symbols=${D}{exclude_symbols}${D}1" "
;;
-libf*)
shift
library_flags=${D}{library_flags}${D}1" "
;;
-nocrt*)
CFLAGS="-s"
;;
-nolxl*)
flag_USE_LXLITE=0
;;
-* | /*)
case ${D}1 in
-L* | -l*)
libsToLink=1
;;
-Zomf)
omfLinking=1
;;
*)
;;
esac
EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
;;
*.dll)
EXTRA_CFLAGS="${D}{EXTRA_CFLAGS} \`basnam ${D}1 .dll\`"
if @<:@ ${D}omfLinking -eq 1 @:>@; then
EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.lib"
else
EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.a"
fi
;;
*)
found=0;
if @<:@ ${D}libsToLink -ne 0 @:>@; then
EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
else
for file in ${D}1 ; do
if @<:@ -f ${D}file @:>@; then
inputFiles="${D}{inputFiles} ${D}file"
found=1
fi
done
if @<:@ ${D}found -eq 0 @:>@; then
echo "ERROR: No file(s) found: "${D}1
exit 8
fi
fi
;;
esac
shift
done # iterate cmdline words
#
if @<:@ -z "${D}inputFiles" @:>@; then
echo "dllar: no input files"
PrintHelp
fi
# Now extract all .o files from .a files
newInputFiles=""
for file in ${D}inputFiles ; do
case ${D}file in
*.a | *.lib)
case ${D}file in
*.a)
suffix=".a"
AR="ar"
;;
*.lib)
suffix=".lib"
AR="emxomfar"
EXTRA_CFLAGS="${D}EXTRA_CFLAGS -Zomf"
;;
*)
;;
esac
dirname=\`basnam ${D}file ${D}suffix\`"_%"
mkdir ${D}dirname
if @<:@ ${D}? -ne 0 @:>@; then
echo "Failed to create subdirectory ./${D}dirname"
CleanUp
exit 8;
fi
# Append '!' to indicate archive
newInputFiles="${D}newInputFiles ${D}{dirname}!"
doCommand "cd ${D}dirname; ${D}AR x ../${D}file"
cd ${D}curDir
found=0;
for subfile in ${D}dirname/*.o* ; do
if @<:@ -f ${D}subfile @:>@; then
found=1
if @<:@ -s ${D}subfile @:>@; then
# FIXME: This should be: is file size > 32 byte, _not_ > 0!
newInputFiles="${D}newInputFiles ${D}subfile"
fi
fi
done
if @<:@ ${D}found -eq 0 @:>@; then
echo "WARNING: there are no files in archive \\'${D}file\\'"
fi
;;
*)
newInputFiles="${D}{newInputFiles} ${D}file"
;;
esac
done
inputFiles="${D}newInputFiles"
# Output filename(s).
do_backup=0;
if @<:@ -z ${D}outFile @:>@; then
do_backup=1;
set outFile ${D}inputFiles; outFile=${D}2
fi
# If it is an archive, remove the '!' and the '_%' suffixes
case ${D}outFile in
*_%!)
outFile=\`basnam ${D}outFile _%!\`
;;
*)
;;
esac
case ${D}outFile in
*.dll)
outFile=\`basnam ${D}outFile .dll\`
;;
*.DLL)
outFile=\`basnam ${D}outFile .DLL\`
;;
*.o)
outFile=\`basnam ${D}outFile .o\`
;;
*.obj)
outFile=\`basnam ${D}outFile .obj\`
;;
*.a)
outFile=\`basnam ${D}outFile .a\`
;;
*.lib)
outFile=\`basnam ${D}outFile .lib\`
;;
*)
;;
esac
case ${D}outimpFile in
*.a)
outimpFile=\`basnam ${D}outimpFile .a\`
;;
*.lib)
outimpFile=\`basnam ${D}outimpFile .lib\`
;;
*)
;;
esac
if @<:@ -z ${D}outimpFile @:>@; then
outimpFile=${D}outFile
fi
defFile="${D}{outFile}.def"
arcFile="${D}{outimpFile}.a"
arcFile2="${D}{outimpFile}.lib"
#create ${D}dllFile as something matching 8.3 restrictions,
if @<:@ -z ${D}renameScript @:>@ ; then
dllFile="${D}outFile"
else
dllFile=\`${D}renameScript ${D}outimpFile\`
fi
if @<:@ ${D}do_backup -ne 0 @:>@ ; then
if @<:@ -f ${D}arcFile @:>@ ; then
doCommand "mv ${D}arcFile ${D}{outFile}_s.a"
fi
if @<:@ -f ${D}arcFile2 @:>@ ; then
doCommand "mv ${D}arcFile2 ${D}{outFile}_s.lib"
fi
fi
# Extract public symbols from all the object files.
tmpdefFile=${D}{defFile}_%
rm -f ${D}tmpdefFile
for file in ${D}inputFiles ; do
case ${D}file in
*!)
;;
*)
doCommand "emxexp -u ${D}file >> ${D}tmpdefFile"
;;
esac
done
# Create the def file.
rm -f ${D}defFile
echo "LIBRARY \`basnam ${D}dllFile\` ${D}library_flags" >> ${D}defFile
dllFile="${D}{dllFile}.dll"
if @<:@ ! -z ${D}description @:>@; then
echo "DESCRIPTION \\"${D}{description}\\"" >> ${D}defFile
fi
echo "EXPORTS" >> ${D}defFile
doCommand "cat ${D}tmpdefFile | sort.exe | uniq.exe > ${D}{tmpdefFile}%"
grep -v "^ *;" < ${D}{tmpdefFile}% | grep -v "^ *${D}" >${D}tmpdefFile
# Checks if the export is ok or not.
for word in ${D}exclude_symbols; do
grep -v ${D}word < ${D}tmpdefFile >${D}{tmpdefFile}%
mv ${D}{tmpdefFile}% ${D}tmpdefFile
done
if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
sed "=" < ${D}tmpdefFile | \\
sed '
N
: loop
s/^\\(@<:@0-9@:>@\\+\\)\\(@<:@^;@:>@*\\)\\(;.*\\)\\?/\\2 @\\1 NONAME/
t loop
' > ${D}{tmpdefFile}%
grep -v "^ *${D}" < ${D}{tmpdefFile}% > ${D}tmpdefFile
else
rm -f ${D}{tmpdefFile}%
fi
cat ${D}tmpdefFile >> ${D}defFile
rm -f ${D}tmpdefFile
# Do linking, create implib, and apply lxlite.
gccCmdl="";
for file in ${D}inputFiles ; do
case ${D}file in
*!)
;;
*)
gccCmdl="${D}gccCmdl ${D}file"
;;
esac
done
doCommand "${D}CC ${D}CFLAGS -Zdll -o ${D}dllFile ${D}defFile ${D}gccCmdl ${D}EXTRA_CFLAGS"
touch "${D}{outFile}.dll"
doCommand "emximp -o ${D}arcFile ${D}defFile"
if @<:@ ${D}flag_USE_LXLITE -ne 0 @:>@; then
add_flags="";
if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
add_flags="-ynd"
fi
doCommand "lxlite -cs -t: -mrn -mln ${D}add_flags ${D}dllFile"
fi
doCommand "emxomf -s -l ${D}arcFile"
# Successful exit.
CleanUp 1
exit 0
EOF
dnl ===================== dllar.sh ends here =====================
])

282
wxWidgets/build/aclocal/bakefile-lang.m4
View File

@@ -1,282 +0,0 @@
dnl
dnl This file is part of Bakefile (http://bakefile.sourceforge.net)
dnl
dnl Copyright (C) 2003-2007 Vaclav Slavik, David Elliott and others
dnl
dnl Permission is hereby granted, free of charge, to any person obtaining a
dnl copy of this software and associated documentation files (the "Software"),
dnl to deal in the Software without restriction, including without limitation
dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
dnl and/or sell copies of the Software, and to permit persons to whom the
dnl Software is furnished to do so, subject to the following conditions:
dnl
dnl The above copyright notice and this permission notice shall be included in
dnl all copies or substantial portions of the Software.
dnl
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
dnl DEALINGS IN THE SOFTWARE.
dnl
dnl $Id$
dnl
dnl Compiler detection macros by David Elliott
dnl
dnl ===========================================================================
dnl Macros to detect non-GNU compilers (MetroWerks, XLC)
dnl ===========================================================================
dnl Based on autoconf _AC_LANG_COMPILER_GNU
AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_MWERKS],
[AC_CACHE_CHECK([whether we are using the Metrowerks _AC_LANG compiler],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks],
[AC_TRY_COMPILE([],[#ifndef __MWERKS__
choke me
#endif
],
[bakefile_compiler_mwerks=yes],
[bakefile_compiler_mwerks=no])
bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks=$bakefile_compiler_mwerks
])
])
dnl Loosely based on autoconf AC_PROG_CC
dnl TODO: Maybe this should wrap the call to AC_PROG_CC and be used instead.
AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
[AC_LANG_PUSH(C)
_AC_BAKEFILE_LANG_COMPILER_MWERKS
MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes`
AC_LANG_POP(C)
])
dnl Loosely based on autoconf AC_PROG_CXX
dnl TODO: Maybe this should wrap the call to AC_PROG_CXX and be used instead.
AC_DEFUN([AC_BAKEFILE_PROG_MWCXX],
[AC_LANG_PUSH(C++)
_AC_BAKEFILE_LANG_COMPILER_MWERKS
MWCXX=`test $bakefile_cv_cxx_compiler_mwerks = yes && echo yes`
AC_LANG_POP(C++)
])
dnl Based on autoconf _AC_LANG_COMPILER_GNU
AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_XLC],
[AC_CACHE_CHECK([whether we are using the IBM xlC _AC_LANG compiler],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc],
[AC_TRY_COMPILE([],[#ifndef __xlC__
choke me
#endif
],
[bakefile_compiler_xlc=yes],
[bakefile_compiler_xlc=no])
bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc=$bakefile_compiler_xlc
])
])
dnl Loosely based on autoconf AC_PROG_CC
AC_DEFUN([AC_BAKEFILE_PROG_XLCC],
[AC_LANG_PUSH(C)
_AC_BAKEFILE_LANG_COMPILER_XLC
XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes`
AC_LANG_POP(C)
])
dnl Loosely based on autoconf AC_PROG_CXX
AC_DEFUN([AC_BAKEFILE_PROG_XLCXX],
[AC_LANG_PUSH(C++)
_AC_BAKEFILE_LANG_COMPILER_XLC
XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes`
AC_LANG_POP(C++)
])
dnl Based on autoconf _AC_LANG_COMPILER_GNU
dnl _AC_BAKEFILE_LANG_COMPILER(NAME, LANG, SYMBOL, IF-YES, IF-NO)
AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
[
AC_LANG_PUSH($2)
AC_CACHE_CHECK(
[whether we are using the $1 $2 compiler],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3],
[AC_TRY_COMPILE(
[],
[
#ifndef $3
choke me
#endif
],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=yes],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=no]
)
]
)
AC_LANG_POP($2)
if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3" = "xyes"; then
:; $4
else
:; $5
fi
])
dnl recent versions of SGI mipsPro compiler define _SGI_COMPILER_VERSION
dnl
dnl NB: old versions define _COMPILER_VERSION but this could probably be
dnl defined by other compilers too so don't test for it to be safe
AC_DEFUN([AC_BAKEFILE_PROG_SGICC],
[
_AC_BAKEFILE_LANG_COMPILER(SGI, C, _SGI_COMPILER_VERSION, SGICC=yes)
])
AC_DEFUN([AC_BAKEFILE_PROG_SGICXX],
[
_AC_BAKEFILE_LANG_COMPILER(SGI, C++, _SGI_COMPILER_VERSION, SGICXX=yes)
])
dnl Sun compiler defines __SUNPRO_C/__SUNPRO_CC
AC_DEFUN([AC_BAKEFILE_PROG_SUNCC],
[
_AC_BAKEFILE_LANG_COMPILER(Sun, C, __SUNPRO_C, SUNCC=yes)
])
AC_DEFUN([AC_BAKEFILE_PROG_SUNCXX],
[
_AC_BAKEFILE_LANG_COMPILER(Sun, C++, __SUNPRO_CC, SUNCXX=yes)
])
dnl Intel icc compiler defines __INTEL_COMPILER for both C and C++
AC_DEFUN([AC_BAKEFILE_PROG_INTELCC],
[
_AC_BAKEFILE_LANG_COMPILER(Intel, C, __INTEL_COMPILER, INTELCC=yes)
])
AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX],
[
_AC_BAKEFILE_LANG_COMPILER(Intel, C++, __INTEL_COMPILER, INTELCXX=yes)
])
dnl HP-UX aCC: see http://docs.hp.com/en/6162/preprocess.htm#macropredef
AC_DEFUN([AC_BAKEFILE_PROG_HPCC],
[
_AC_BAKEFILE_LANG_COMPILER(HP, C, __HP_cc, HPCC=yes)
])
AC_DEFUN([AC_BAKEFILE_PROG_HPCXX],
[
_AC_BAKEFILE_LANG_COMPILER(HP, C++, __HP_aCC, HPCXX=yes)
])
dnl Tru64 cc and cxx
AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCC],
[
_AC_BAKEFILE_LANG_COMPILER(Compaq, C, __DECC, COMPAQCC=yes)
])
AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCXX],
[
_AC_BAKEFILE_LANG_COMPILER(Compaq, C++, __DECCXX, COMPAQCXX=yes)
])
dnl ===========================================================================
dnl macros to detect specialty compiler options
dnl ===========================================================================
dnl Figure out if we need to pass -ext o to compiler (MetroWerks)
AC_DEFUN([AC_BAKEFILE_METROWERKS_EXTO],
[AC_CACHE_CHECK([if the _AC_LANG compiler requires -ext o], bakefile_cv_[]_AC_LANG_ABBREV[]_exto,
dnl First create an empty conf test
[AC_LANG_CONFTEST([AC_LANG_PROGRAM()])
dnl Now remove .o and .c.o or .cc.o
rm -f conftest.$ac_objext conftest.$ac_ext.o
dnl Now compile the test
AS_IF([AC_TRY_EVAL(ac_compile)],
dnl If the test succeeded look for conftest.c.o or conftest.cc.o
[for ac_file in `(ls conftest.* 2>/dev/null)`; do
case $ac_file in
conftest.$ac_ext.o)
bakefile_cv_[]_AC_LANG_ABBREV[]_exto="-ext o"
;;
*)
;;
esac
done],
[AC_MSG_FAILURE([cannot figure out if compiler needs -ext o: cannot compile])
]) dnl AS_IF
rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext
]) dnl AC_CACHE_CHECK
if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_exto" '!=' "x"; then
if test "[]_AC_LANG_ABBREV[]" = "c"; then
CFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CFLAGS"
fi
if test "[]_AC_LANG_ABBREV[]" = "cxx"; then
CXXFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CXXFLAGS"
fi
fi
]) dnl AC_DEFUN
dnl ===========================================================================
dnl Macros to do all of the compiler detections as one macro
dnl ===========================================================================
dnl check for different proprietary compilers depending on target platform
dnl _AC_BAKEFILE_PROG_COMPILER(LANG)
AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
[
AC_PROG_$1
AC_BAKEFILE_PROG_INTEL$1
dnl if we're using gcc, we can't be using any of incompatible compilers
if test "x$G$1" != "xyes"; then
if test "x$1" = "xC"; then
AC_BAKEFILE_METROWERKS_EXTO
if test "x$bakefile_cv_c_exto" '!=' "x"; then
unset ac_cv_prog_cc_g
_AC_PROG_CC_G
fi
fi
dnl most of these compilers are only used under well-defined OS so
dnl don't waste time checking for them on other ones
case `uname -s` in
AIX*)
AC_BAKEFILE_PROG_XL$1
;;
Darwin)
AC_BAKEFILE_PROG_MW$1
AC_BAKEFILE_PROG_XL$1
;;
IRIX*)
AC_BAKEFILE_PROG_SGI$1
;;
HP-UX*)
AC_BAKEFILE_PROG_HP$1
;;
OSF1)
AC_BAKEFILE_PROG_COMPAQ$1
;;
SunOS)
AC_BAKEFILE_PROG_SUN$1
;;
esac
fi
])
AC_DEFUN([AC_BAKEFILE_PROG_CC],
[
_AC_BAKEFILE_PROG_COMPILER(CC)
])
AC_DEFUN([AC_BAKEFILE_PROG_CXX],
[
_AC_BAKEFILE_PROG_COMPILER(CXX)
])

1128
wxWidgets/build/aclocal/bakefile.m4
View File

File diff suppressed because it is too large Load Diff

81
wxWidgets/build/aclocal/cppunit.m4
View File

@@ -1,81 +0,0 @@
dnl
dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl
AC_DEFUN([AM_PATH_CPPUNIT],
[
AC_ARG_WITH(cppunit-prefix,[ --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional)],
cppunit_config_prefix="$withval", cppunit_config_prefix="")
AC_ARG_WITH(cppunit-exec-prefix,[ --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional)],
cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
if test x$cppunit_config_exec_prefix != x ; then
cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
if test x${CPPUNIT_CONFIG+set} != xset ; then
CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
fi
fi
if test x$cppunit_config_prefix != x ; then
cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
if test x${CPPUNIT_CONFIG+set} != xset ; then
CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
fi
fi
AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
cppunit_version_min=$1
AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
no_cppunit=""
if test "$CPPUNIT_CONFIG" = "no" ; then
AC_MSG_RESULT(no)
no_cppunit=yes
else
CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
cppunit_version=`$CPPUNIT_CONFIG --version`
cppunit_major_version=`echo $cppunit_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
cppunit_minor_version=`echo $cppunit_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
cppunit_micro_version=`echo $cppunit_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
cppunit_major_min=`echo $cppunit_version_min | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
cppunit_minor_min=`echo $cppunit_version_min | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
cppunit_micro_min=`echo $cppunit_version_min | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
cppunit_version_proper=`expr \
$cppunit_major_version \> $cppunit_major_min \| \
$cppunit_major_version \= $cppunit_major_min \& \
$cppunit_minor_version \> $cppunit_minor_min \| \
$cppunit_major_version \= $cppunit_major_min \& \
$cppunit_minor_version \= $cppunit_minor_min \& \
$cppunit_micro_version \>= $cppunit_micro_min `
if test "$cppunit_version_proper" = "1" ; then
AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
else
AC_MSG_RESULT(no)
no_cppunit=yes
fi
fi
if test "x$no_cppunit" = x ; then
ifelse([$2], , :, [$2])
else
CPPUNIT_CFLAGS=""
CPPUNIT_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(CPPUNIT_CFLAGS)
AC_SUBST(CPPUNIT_LIBS)
])

23
wxWidgets/build/aclocal/gst-element-check.m4
View File

@@ -1,23 +0,0 @@
dnl Perform a check for a GStreamer element using gst-inspect
dnl Thomas Vander Stichele <thomas at apestaart dot org>
dnl Last modification: 25/01/2005
dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
AC_DEFUN([AM_GST_ELEMENT_CHECK],
[
if test "x$GST_INSPECT" == "x"; then
AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
fi
if test "x$GST_INSPECT" != "x"; then
AC_MSG_CHECKING(GStreamer element $1)
if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
AC_MSG_RESULT(found.)
$2
else
AC_MSG_RESULT(not found.)
$3
fi
fi
])

196
wxWidgets/build/aclocal/gtk-2.0.m4
View File

@@ -1,196 +0,0 @@
# Configure paths for GTK+
# Owen Taylor 1997-2001
dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
dnl pass to pkg-config
dnl
AC_DEFUN([AM_PATH_GTK_2_0],
[dnl
dnl Get the cflags and libraries from pkg-config
dnl
AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
, enable_gtktest=yes)
pkg_config_args=gtk+-2.0
for module in . $4
do
case "$module" in
gthread)
pkg_config_args="$pkg_config_args gthread-2.0"
;;
esac
done
no_gtk=""
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test x$PKG_CONFIG != xno ; then
if pkg-config --atleast-pkgconfig-version 0.7 ; then
:
else
echo "*** pkg-config too old; version 0.7 or better required."
no_gtk=yes
PKG_CONFIG=no
fi
else
no_gtk=yes
fi
min_gtk_version=ifelse([$1], ,2.0.0,$1)
AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
if test x$PKG_CONFIG != xno ; then
## don't try to run the test against uninstalled libtool libs
if $PKG_CONFIG --uninstalled $pkg_config_args; then
echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
enable_gtktest=no
fi
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
:
else
no_gtk=yes
fi
fi
if test x"$no_gtk" = x ; then
GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_gtktest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$GTK_LIBS $LIBS"
dnl
dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
dnl checks the results of pkg-config to some extent)
dnl
rm -f conf.gtktest
AC_TRY_RUN([
#include <gtk/gtk.h>
#include <stdio.h>
#include <stdlib.h>
int
main ()
{
int major, minor, micro;
char *tmp_version;
system ("touch conf.gtktest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = g_strdup("$min_gtk_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_gtk_version");
exit(1);
}
if ((gtk_major_version != $gtk_config_major_version) ||
(gtk_minor_version != $gtk_config_minor_version) ||
(gtk_micro_version != $gtk_config_micro_version))
{
printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf ("*** was found! If pkg-config was correct, then it is best\n");
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
printf("*** to point to the correct configuration files\n");
}
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
(gtk_minor_version != GTK_MINOR_VERSION) ||
(gtk_micro_version != GTK_MICRO_VERSION))
{
printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
printf("*** library (version %d.%d.%d)\n",
gtk_major_version, gtk_minor_version, gtk_micro_version);
}
else
{
if ((gtk_major_version > major) ||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
major, minor, micro);
printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n");
printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
printf("*** correct copy of pkg-config. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
}
return 1;
}
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_gtk" = x ; then
AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$PKG_CONFIG" = "no" ; then
echo "*** A new enough version of pkg-config was not found."
echo "*** See http://pkgconfig.sourceforge.net"
else
if test -f conf.gtktest ; then
:
else
echo "*** Could not run GTK+ test program, checking why..."
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
AC_TRY_LINK([
#include <gtk/gtk.h>
#include <stdio.h>
], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
GTK_CFLAGS=""
GTK_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
rm -f conf.gtktest
])

194
wxWidgets/build/aclocal/gtk.m4
View File

@@ -1,194 +0,0 @@
# Configure paths for GTK+
# Owen Taylor 97-11-3
dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
dnl
AC_DEFUN([AM_PATH_GTK],
[dnl
dnl Get the cflags and libraries from the gtk-config script
dnl
AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
gtk_config_prefix="$withval", gtk_config_prefix="")
AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
, enable_gtktest=yes)
for module in . $4
do
case "$module" in
gthread)
gtk_config_args="$gtk_config_args gthread"
;;
esac
done
if test x$gtk_config_exec_prefix != x ; then
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
if test x${GTK_CONFIG+set} != xset ; then
GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
fi
fi
if test x$gtk_config_prefix != x ; then
gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
if test x${GTK_CONFIG+set} != xset ; then
GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
fi
fi
AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
min_gtk_version=ifelse([$1], ,0.99.7,$1)
AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
no_gtk=""
if test "$GTK_CONFIG" = "no" ; then
no_gtk=yes
else
GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_gtktest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$GTK_LIBS $LIBS"
dnl
dnl Now check if the installed GTK is sufficiently new. (Also sanity
dnl checks the results of gtk-config to some extent
dnl
rm -f conf.gtktest
AC_TRY_RUN([
#include <gtk/gtk.h>
#include <stdio.h>
#include <stdlib.h>
int
main ()
{
int major, minor, micro;
char *tmp_version;
system ("touch conf.gtktest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = g_strdup("$min_gtk_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_gtk_version");
exit(1);
}
if ((gtk_major_version != $gtk_config_major_version) ||
(gtk_minor_version != $gtk_config_minor_version) ||
(gtk_micro_version != $gtk_config_micro_version))
{
printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf ("*** was found! If gtk-config was correct, then it is best\n");
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
printf("*** before re-running configure\n");
}
#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
(gtk_minor_version != GTK_MINOR_VERSION) ||
(gtk_micro_version != GTK_MICRO_VERSION))
{
printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
printf("*** library (version %d.%d.%d)\n",
gtk_major_version, gtk_minor_version, gtk_micro_version);
}
#endif /* defined (GTK_MAJOR_VERSION) ... */
else
{
if ((gtk_major_version > major) ||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
major, minor, micro);
printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n");
printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
printf("*** correct copy of gtk-config. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
}
return 1;
}
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_gtk" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$GTK_CONFIG" = "no" ; then
echo "*** The gtk-config script installed by GTK could not be found"
echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the GTK_CONFIG environment variable to the"
echo "*** full path to gtk-config."
else
if test -f conf.gtktest ; then
:
else
echo "*** Could not run GTK test program, checking why..."
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
AC_TRY_LINK([
#include <gtk/gtk.h>
#include <stdio.h>
], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK or finding the wrong"
echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
echo "***"
echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
echo "*** came with the system with the command"
echo "***"
echo "*** rpm --erase --nodeps gtk gtk-devel" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GTK was incorrectly installed"
echo "*** or that you have moved GTK since it was installed. In the latter case, you"
echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
GTK_CFLAGS=""
GTK_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
rm -f conf.gtktest
])

156
wxWidgets/build/aclocal/pkg.m4
View File

@@ -1,156 +0,0 @@
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
#
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=m4_default([$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
fi[]dnl
])# PKG_PROG_PKG_CONFIG
# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
#
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
#
# Similar to PKG_CHECK_MODULES, make sure that the first instance of
# this or PKG_CHECK_MODULES is called, or make sure to call
# PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
m4_ifval([$2], [$2], [:])
m4_ifvaln([$3], [else
$3])dnl
fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
[if test -n "$PKG_CONFIG"; then
if test -n "$$1"; then
pkg_cv_[]$1="$$1"
else
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
fi
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
# _PKG_SHORT_ERRORS_SUPPORTED
# -----------------------------
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi[]dnl
])# _PKG_SHORT_ERRORS_SUPPORTED
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
# [ACTION-IF-NOT-FOUND])
#
#
# Note that if there is a possibility the first call to
# PKG_CHECK_MODULES might not happen, you should be sure to include an
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
#
#
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_MODULES],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
AC_MSG_CHECKING([for $1])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
and $1[]_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
else
$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
_PKG_TEXT
])],
[$4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
_PKG_TEXT
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
ifelse([$3], , :, [$3])
fi[]dnl
])# PKG_CHECK_MODULES

181
wxWidgets/build/aclocal/sdl.m4
View File

@@ -1,181 +0,0 @@
# Configure paths for SDL
# Sam Lantinga 9/21/99
# stolen from Manish Singh
# stolen back from Frank Belew
# stolen from Manish Singh
# Shamelessly stolen from Owen Taylor
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
dnl
AC_DEFUN([AM_PATH_SDL],
[dnl
dnl Get the cflags and libraries from the sdl-config script
dnl
AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
sdl_prefix="$withval", sdl_prefix="")
AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
sdl_exec_prefix="$withval", sdl_exec_prefix="")
AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
, enable_sdltest=yes)
if test x$sdl_exec_prefix != x ; then
sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
if test x${SDL_CONFIG+set} != xset ; then
SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
fi
fi
if test x$sdl_prefix != x ; then
sdl_args="$sdl_args --prefix=$sdl_prefix"
if test x${SDL_CONFIG+set} != xset ; then
SDL_CONFIG=$sdl_prefix/bin/sdl-config
fi
fi
if test "x$prefix" != xNONE; then
PATH="$prefix/bin:$prefix/usr/bin:$PATH"
fi
AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
min_sdl_version=ifelse([$1], ,0.11.0,$1)
AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
no_sdl=""
if test "$SDL_CONFIG" = "no" ; then
no_sdl=yes
else
SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_sdltest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_CXXFLAGS="$CXXFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $SDL_CFLAGS"
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
dnl
dnl Now check if the installed SDL is sufficiently new. (Also sanity
dnl checks the results of sdl-config to some extent
dnl
rm -f conf.sdltest
AC_TRY_RUN([
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "SDL.h"
char*
my_strdup (char *str)
{
char *new_str;
if (str)
{
new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
strcpy (new_str, str);
}
else
new_str = NULL;
return new_str;
}
int main (int argc, char *argv[])
{
int major, minor, micro;
char *tmp_version;
/* This hangs on some systems (?)
system ("touch conf.sdltest");
*/
{ FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = my_strdup("$min_sdl_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_sdl_version");
exit(1);
}
if (($sdl_major_version > major) ||
(($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
(($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
printf("*** best to upgrade to the required version.\n");
printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
printf("*** to point to the correct copy of sdl-config, and remove the file\n");
printf("*** config.cache before re-running configure\n");
return 1;
}
}
],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_sdl" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$SDL_CONFIG" = "no" ; then
echo "*** The sdl-config script installed by SDL could not be found"
echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the SDL_CONFIG environment variable to the"
echo "*** full path to sdl-config."
else
if test -f conf.sdltest ; then
:
else
echo "*** Could not run SDL test program, checking why..."
CFLAGS="$CFLAGS $SDL_CFLAGS"
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
AC_TRY_LINK([
#include <stdio.h>
#include "SDL.h"
int main(int argc, char *argv[])
{ return 0; }
#undef main
#define main K_and_R_C_main
], [ return 0; ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding SDL or finding the wrong"
echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
SDL_CFLAGS=""
SDL_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(SDL_CFLAGS)
AC_SUBST(SDL_LIBS)
rm -f conf.sdltest
])

26
wxWidgets/build/autoconf_prepend-include/Makefile
View File

@@ -1,26 +0,0 @@
# Created: 2005/03/12
# Author: David Elliott
# For autoconf: Debian in their infinite wisdom decided to improve upon
# the standard autoconf 2.59 macros. Thus Debian's autoconf generates
# a totally different configure script. This fixes it to look
# mostly like Debian's. There are also some fixes pulled in from the OS/2
# fork of autoconf.
# Rule to freeze the m4 so autoconf will actually use it.
# NOTE: VERY important to cd to somewhere there are no .m4 files.
# or at least no aclocal.m4 or else autom4te helpfully picks it up.
.PHONY: all
all: autoconf/autoconf.m4f
AUTOCONF_SOURCES = \
autoconf/c.m4 \
autoconf/general.m4 \
autoconf/libs.m4 \
autoconf/status.m4
AUTOM4TE=autom4te
autoconf/autoconf.m4f: $(AUTOCONF_SOURCES)
$(AUTOM4TE) -B . --language=Autoconf --freeze --output=autoconf/autoconf.m4f

22
wxWidgets/build/autoconf_prepend-include/README.txt
View File

@@ -1,22 +0,0 @@
wxAutohacks
wxAutohacks is a way of ensuring the configure script remains consistent
between developer commits. Previous releases include a build/aclocal_include
which has now been moved into the wxWidgets build/aclocal directory.
At the moment, it is intended to be copied and or symlinked into a wxWidgets
source tree. For example, assume you have wxWidgets checked out in the
/home/myname/wxCVS/wxWidgets/ path. Then from /home/myname/wxCVS do this:
cvs -d :pserver:anoncvs@cvs.wxwidgets.org:/pack/cvsroots/wxwidgets checkout wxAutohacks
You will now have wxAutohacks in /home/myname/wxCVS/wxAutohacks/. Now go into
the wxWidgets build (/home/myname/wxCVS/wxWidgets/build/) and do this:
ln -s ../../wxAutohacks/build/autoconf_prepend-include .
From now on from the root of your wxWidgets source tree when you do this:
make -f build/autogen.mk
you will also build an autoconf.m4f file which will ensure the configure
script stays consistent.
Alternatively you can do this:
make -f build/autogen.mk AUTOHACKS_PREPEND_INCLUDE_DIR=../wxAutohacks/build/autoconf_prepend-include

10079
wxWidgets/build/autoconf_prepend-include/autoconf/autoconf.m4f
View File

File diff suppressed because it is too large Load Diff

1219
wxWidgets/build/autoconf_prepend-include/autoconf/c.m4
View File

File diff suppressed because it is too large Load Diff

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