class wxPaintDC;
class wxMemoryDC;
class wxToolBarGTK;
+class wxBitmapButton;
+class wxStaticBitmap;
class wxMask;
class wxBitmap;
friend wxDC;
friend wxPaintDC;
friend wxToolBarGTK;
+ friend wxBitmapButton;
+ friend wxStaticBitmap;
GdkBitmap *GetBitmap(void) const;
friend wxPaintDC;
friend wxMemoryDC;
friend wxToolBarGTK;
+ friend wxBitmapButton;
+ friend wxStaticBitmap;
GdkPixmap *GetPixmap(void) const;
GdkBitmap *GetBitmap(void) const;
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: tabctrl.h
+// Purpose: wxTabCtrl class
+// Author: Robert Roebling
+// Modified by:
+// RCS-ID: $Id$
+// Copyright: (c) Julian Smart and Markus Holzem
+// Licence: wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __TABCTRLH__
+#define __TABCTRLH__
+
+#ifdef __GNUG__
+#pragma interface "notebook.h"
+#endif
+
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/string.h"
+#include "wx/control.h"
+
+//-----------------------------------------------------------------------------
+// classes
+//-----------------------------------------------------------------------------
+
+class wxImageList;
+class wxPanel;
+
+class wxNotebook;
+
+//-----------------------------------------------------------------------------
+// global data
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// wxNotebook
+//-----------------------------------------------------------------------------
+
+class wxNotebook: public wxControl
+{
+ DECLARE_DYNAMIC_CLASS(wxNotebook)
+
+ public:
+
+ wxNotebook(void);
+ wxNotebook( wxWindow *parent, const wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ const long style = 0, const wxString& name = "notebook" );
+ ~wxNotebook(void);
+ bool Create(wxWindow *parent, const wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ const long style = 0, const wxString& name = "notebook" );
+ int GetSelection(void) const;
+ wxImageList* GetImageList(void) const;
+ int GetPageCount(void) const;
+ int GetRowCount(void) const;
+ wxString GetPageText( const int page ) const;
+ int GetPageImage( const int page ) const;
+ void* GetPageData( const int page ) const;
+ int SetSelection( const int page );
+ void SetImageList( wxImageList* imageList );
+ bool SetPageText( const int page, const wxString& text );
+ bool SetPageImage( const int oage, const int image );
+ bool SetPageData( const int page, void* data );
+ void SetPageSize( const wxSize& size );
+ void SetPadding( const wxSize& padding );
+ bool DeleteAllPages(void);
+ bool DeletePage( const int page );
+ wxPanel *CreatePage( const int page, const wxString& text, const int imageId = -1, void* data = NULL );
+ wxPanel *GetPanel( const int page );
+
+ // overriden to do nothing
+ virtual void AddChild( wxWindow *win );
+
+ protected:
+
+ wxImageList* m_imageList;
+ wxList m_pages;
+ GtkWidget *m_frame;
+
+ DECLARE_EVENT_TABLE()
+};
+
+//-----------------------------------------------------------------------------
+// wxTabEvent
+//-----------------------------------------------------------------------------
+
+class wxTabEvent: public wxCommandEvent
+{
+ DECLARE_DYNAMIC_CLASS(wxTabEvent)
+
+ public:
+
+ wxTabEvent( WXTYPE commandType = 0, int id = 0 );
+};
+
+typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&);
+
+#define EVT_TAB_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TAB_SEL_CHANGED, \
+ id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL },
+#define EVT_TAB_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TAB_SEL_CHANGING, \
+ id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL },
+
+#endif
+ // __TABCTRLH__
+++ /dev/null
-/* ../../include/wx/gtk/setup.h. Generated automatically by configure. */
-/* wx_setup.h
- This file is in the public domain.
-
- Descriptive text for the C preprocessor macros that
- the distributed Autoconf macros can define.
- No software package will use all of them; autoheader copies the ones
- your configure.in uses into your configuration header file templates.
-
- The entries are in sort -df order: alphabetical, case insensitive,
- ignoring punctuation (such as underscores). Although this order
- can split up related entries, it makes it easier to check whether
- a given entry is in the file.
-
- Leave the following blank line there!! Autoheader needs it. */
-\f
-#ifndef __GTKSETUPH__
-#define __GTKSETUPH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-/* define the system to compile */
-#define __GTK__ 1
-#define __UNIX__ 1
-#define __LINUX__ 1
-/* #undef __SGI__ */
-/* #undef __HPUX__ */
-/* #undef __SYSV__ */
-/* #undef __SVR4__ */
-/* #undef __AIX__ */
-/* #undef __SUN__ */
-/* #undef __SOLARIS__ */
-/* #undef __SUNOS__ */
-/* #undef __ALPHA__ */
-/* #undef __OSF__ */
-/* #undef __BSD__ */
-/* #undef __FREEBSD__ */
-/* #undef __VMS__ */
-/* #undef __ULTRIX__ */
-/* #undef __DATA_GENERAL__ */
-
-/*
- * Use zlib
- */
-#define USE_ZLIB 1
-/*
- * Use gdk_imlib
- */
-#define USE_GDK_IMLIB 1
-/*
- * Use libpng
- */
-#define USE_LIBPNG 1
-/*
- * Use Threads
- */
-/* #undef USE_THREADS */
-/* #undef USE_THREADS_POSIX */
-/* #undef USE_THREADS_SGI */
-/*
- * Use storable classes
- */
-#define USE_STORABLE_CLASSES 1
-/*
- * Use automatic translation via gettext() in wxTString
- */
-#define USE_AUTOTRANS 1
-/*
- * Use font metric files in GetTextExtent for wxPostScriptDC
- * Use consistent PostScript fonts for AFM and printing (!)
- */
-#define USE_AFM_FOR_POSTSCRIPT 1
-#define WX_NORMALIZED_PS_FONTS 1
-/*
- * Use clipboard
- */
-/* #undef USE_CLIPBOARD */
-/*
- * Use wxWindows layout constraint system
- */
-#define USE_CONSTRAINTS 1
-/*
- * Use the document/view architecture
- */
-#define USE_DOC_VIEW_ARCHITECTURE 1
-/*
- * Use enhanced dialog
- */
-/* #undef USE_ENHANCED_DIALOG */
-/*
- * Use Form panel item placement
- */
-/* #undef USE_FORM */
-/*
- * Use fraction class
- */
-#define USE_FRACTION 1
-/*
- * Use gauge item
- */
-#define USE_GAUGE 1
-/*
- * Implement a GLCanvas class as an interface to OpenGL, using the GLX
- * extension to the X11 protocol. You can use the (free) Mesa library
- * if you don't have a 'real' OpenGL.
- */
-#define USE_GLX 0
-/*
- * Use wxWindows help facility (needs USE_IPC 1)
- */
-/* #undef USE_HELP */
-/*
- * Use iostream.h rather than iostream
- */
-#define USE_IOSTREAMH 1
-/*
- * Use Interprocess communication
- */
-#define USE_IPC 1
-/*
- * Use Metafile and Metafile device context
- */
-/* #undef USE_METAFILE */
-/*
- * Use PostScript device context
- */
-#define USE_POSTSCRIPT 1
-/*
- * Use the print/preview architecture
- */
-#define USE_PRINTING_ARCHITECTURE 1
-/*
- * Use Prolog IO
- */
-/* #undef USE_PROLOGIO */
-/*
- * Use Remote Procedure Call (Needs USE_IPC and USE_PROLOGIO)
- */
-/* #undef USE_RPC */
-/*
- * Use wxGetResource & wxWriteResource (change .Xdefaults)
- */
-#define USE_RESOURCES 1
-/*
- * Use scrollbar item
- */
-#define USE_SCROLLBAR 1
-/*
- * Use time and date classes
- */
-#define USE_TIMEDATE 1
-/*
- * Use toolbar, use Xt port toolbar (3D look)
- */
-#define USE_TOOLBAR 1
-#define USE_XT_TOOLBAR
-/*
- * Enables old type checking mechanism (wxSubType)
- */
-/* #undef USE_TYPETREE */
-/*
- * Use virtual list box item
- */
-/* #undef USE_VLBOX */
-/*
- * Use wxWindows resource loading (.wxr-files) (Needs USE_PROLOGIO 1)
- */
-#define USE_WX_RESOURCES 1
-/*
- * Use wxGraph
- */
-/* #undef USE_WXGRAPH */
-/*
- * Use wxTree
- */
-
-/*
- * Use wxConfig profile management classes (wxFileConfig only under Unix)
- */
-#define USE_WXCONFIG 1
-
-/********************** DO NOT CHANGE BELOW THIS POINT **********************/
-
-/**************************** DEBUGGING FEATURES ****************************/
-
-/* Compatibility with 1.66 API.
- Level 0: no backward compatibility, all new features
- Level 1: wxDC, OnSize (etc.) compatibility, but
- some new features such as event tables */
-#define WXWIN_COMPATIBILITY 1
-/*
- * Enables debugging: memory tracing, assert, etc.
- */
-#define DEBUG 1
-/*
- * Enables debugging version of wxObject::new and wxObject::delete (IF DEBUG)
- * WARNING: this code may not work with all architectures, especially
- * if alignment is an issue.
- */
-/* #undef USE_MEMORY_TRACING */
-/*
- * Enable debugging version of global memory operators new and delete
- * Disable it, If this causes problems (e.g. link errors)
- */
-/* #undef USE_GLOBAL_MEMORY_OPERATORS */
-/*
- * If WXDEBUG && USE_MEMORY_TRACING && USE_GLOBAL_MEMORY_OPERATORS
- * used to debug the memory allocation of wxWindows Xt port code
- */
-#define USE_INTERNAL_MEMORY_TRACING 0
-/*
- * Matthews garbage collection (used for MrEd?)
- */
-#define WXGARBAGE_COLLECTION_ON 0
-
-/**************************** COMPILER FEATURES *****************************/
-
-/*
- * Disable this if your compiler can't cope
- * with omission of prototype parameters.
- */
-#define REMOVE_UNUSED_ARG 1
-/*
- * The const keyword is being introduced more in wxWindows.
- * You can use this setting to maintain backward compatibility.
- * If 0: will use const wherever possible.
- * If 1: will use const only where necessary
- * for precompiled headers to work.
- * If 2: will be totally backward compatible, but precompiled
- * headers may not work and program size will be larger.
- */
-#define CONST_COMPATIBILITY 0
-
-/************************ WINDOWS 3.1 COMPATIBILITY *************************/
-
-/*
- * Normalize X drawing code to behave exactly as MSW.
- */
-#define WX_STANDARD_GRAPHICS 0
-
-/******************* other stuff **********************************/
-/*
- * Support image loading for wxBitmap (wxImage is needed for this)
- */
-#define USE_IMAGE_LOADING 0
-#define WXIMAGE_INCLUDE "../../utils/image/src/wx_image.h"
-/*
- * Use splines
- */
-#define USE_SPLINES 1
-
-/*
- * USE_DYNAMIC_CLASSES is TRUE for the Xt port
- */
-#define USE_DYNAMIC_CLASSES 1
-/*
- * USE_EXTENDED_STATICS is FALSE for the Xt port
-*/
-#define USE_EXTENDED_STATICS 0
-
-/*************************** IMAKEFILE EVALUATIOS ***************************/
-
-#if USE_XPM
- #define USE_XPM_IN_X 1
-#else
- #define USE_XPM_IN_X 0
-#endif
-#if USE_IMAGE_LOADING
- #define USE_IMAGE_LOADING_IN_X 1
-#else
- #define USE_IMAGE_LOADING_IN_X 0
-#endif
-
-/* here comes the system-specific stuff */
-
-/* acconfig.h
- This file is in the public domain.
-
- Descriptive text for the C preprocessor macros that
- the distributed Autoconf macros can define.
- No software package will use all of them; autoheader copies the ones
- your configure.in uses into your configuration header file templates.
-
- The entries are in sort -df order: alphabetical, case insensitive,
- ignoring punctuation (such as underscores). Although this order
- can split up related entries, it makes it easier to check whether
- a given entry is in the file. */
-
-/* Define if on AIX 3.
- System headers sometimes define this.
- We just want to avoid a redefinition error message. */
-#ifndef _ALL_SOURCE
-/* #undef _ALL_SOURCE */
-#endif
-
-/* Define if using alloca.c. */
-/* #undef C_ALLOCA */
-
-/* Define if type char is unsigned and you are not using gcc. */
-#ifndef __CHAR_UNSIGNED__
-/* #undef __CHAR_UNSIGNED__ */
-#endif
-
-/* Define if the closedir function returns void instead of int. */
-/* #undef CLOSEDIR_VOID */
-
-/* Define to empty if the keyword does not work. */
-/* #undef const */
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
- This function is required for alloca.c support on those systems. */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define for DGUX with <sys/dg_sys_info.h>. */
-/* #undef DGUX */
-
-/* Define if you have <dirent.h>. */
-/* #undef DIRENT */
-
-/* Define to the type of elements in the array set by `getgroups'.
- Usually this is either `int' or `gid_t'. */
-#define GETGROUPS_T gid_t
-
-/* Define if the `getloadavg' function needs to be run setuid or setgid. */
-/* #undef GETLOADAVG_PRIVILEGED */
-
-/* Define if the `getpgrp' function takes no argument. */
-/* #undef GETPGRP_VOID */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef gid_t */
-
-/* Define if you have alloca, as a function or macro. */
-/* #undef HAVE_ALLOCA */
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define if you don't have vprintf but do have _doprnt. */
-/* #undef HAVE_DOPRNT */
-
-/* Define if your system has its own `getloadavg' function. */
-/* #undef HAVE_GETLOADAVG */
-
-/* Define if you have the getmntent function. */
-/* #undef HAVE_GETMNTENT */
-
-/* Define if the `long double' type works. */
-#define HAVE_LONG_DOUBLE 1
-
-/* Define if you support file names longer than 14 characters. */
-#define HAVE_LONG_FILE_NAMES 1
-
-/* Define if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
-
-/* Define if system calls automatically restart after interruption
- by a signal. */
-/* #undef HAVE_RESTARTABLE_SYSCALLS */
-
-/* Define if your struct stat has st_blksize. */
-#define HAVE_ST_BLKSIZE 1
-
-/* Define if your struct stat has st_blocks. */
-#define HAVE_ST_BLOCKS 1
-
-/* Define if you have the strcoll function and it is properly defined. */
-/* #undef HAVE_STRCOLL */
-
-/* Define if your struct stat has st_rdev. */
-#define HAVE_ST_RDEV 1
-
-/* Define if you have the strftime function. */
-/* #undef HAVE_STRFTIME */
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-#define HAVE_SYS_WAIT_H 1
-
-/* Define if your struct tm has tm_zone. */
-/* #undef HAVE_TM_ZONE */
-
-/* Define if you don't have tm_zone but do have the external array
- tzname. */
-#define HAVE_TZNAME 1
-
-/* Define if you have <unistd.h>. */
-/* #undef HAVE_UNISTD_H */
-
-/* Define if utime(file, NULL) sets file's timestamp to the present. */
-/* #undef HAVE_UTIME_NULL */
-
-/* Define if you have <vfork.h>. */
-/* #undef HAVE_VFORK_H */
-
-/* Define if you have the vprintf function. */
-/* #undef HAVE_VPRINTF */
-
-/* Define if you have the wait3 system call. */
-/* #undef HAVE_WAIT3 */
-
-/* Define as __inline if that's what the C compiler calls it. */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define if major, minor, and makedev are declared in <mkdev.h>. */
-/* #undef MAJOR_IN_MKDEV */
-
-/* Define if major, minor, and makedev are declared in <sysmacros.h>. */
-/* #undef MAJOR_IN_SYSMACROS */
-
-/* Define if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef mode_t */
-
-/* Define if you don't have <dirent.h>, but have <ndir.h>. */
-/* #undef NDIR */
-
-/* Define if you have <memory.h>, and <string.h> doesn't declare the
- mem* functions. */
-/* #undef NEED_MEMORY_H */
-
-/* Define if your struct nlist has an n_un member. */
-/* #undef NLIST_NAME_UNION */
-
-/* Define if you have <nlist.h>. */
-/* #undef NLIST_STRUCT */
-
-/* Define if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
-/* Define to `long' if <sys/types.h> doesn't define. */
-/* #undef off_t */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef pid_t */
-
-/* Define if the system does not provide POSIX.1 features except
- with this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define if you need to in order for stat and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define as the return type of signal handlers (int or void). */
-#define RETSIGTYPE void
-
-/* Define if the setvbuf function takes the buffering type as its second
- argument and the buffer pointer as the third, as on System V
- before release 3. */
-/* #undef SETVBUF_REVERSED */
-
-/* Define SIZESOF for some Objects */
-#define SIZEOF_INT 4
-#define SIZEOF_INT_P 4
-#define SIZEOF_LONG 4
-
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-/* #undef size_t */
-
-/* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-/* #undef STACK_DIRECTION */
-
-/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-/* #undef STAT_MACROS_BROKEN */
-
-/* Define if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define on System V Release 4. */
-/* #undef SVR4 */
-
-/* Define on BSD */
-/* #undef BSD */
-
-/* Define on System V */
-/* #undef SYSV */
-
-/* Define if you don't have <dirent.h>, but have <sys/dir.h>. */
-/* #undef SYSDIR */
-
-/* Define if you don't have <dirent.h>, but have <sys/ndir.h>. */
-/* #undef SYSNDIR */
-
-/* Define if `sys_siglist' is declared by <signal.h>. */
-/* #undef SYS_SIGLIST_DECLARED */
-
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define if your <sys/time.h> declares struct tm. */
-/* #undef TM_IN_SYS_TIME */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef uid_t */
-
-/* Define for Encore UMAX. */
-/* #undef UMAX */
-
-/* Define for Encore UMAX 4.3 that has <inq_status/cpustats.h>
- instead of <sys/cpustats.h>. */
-/* #undef UMAX4_3 */
-
-/* Define if you do not have <strings.h>, index, bzero, etc.. */
-/* #undef USG */
-
-/* Define if the system is System V Release 4 */
-/* #undef SVR4 */
-
-/* Define vfork as fork if vfork does not work. */
-/* #undef vfork */
-
-/* Define if the closedir function returns void instead of int. */
-/* #undef VOID_CLOSEDIR */
-
-/* Define if your processor stores words with the most significant
- byte first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
-
-/* Define if lex declares yytext as a char * by default, not a char[]. */
-#define YYTEXT_POINTER 1
-
-#endif /* __GTKSETUPH__ */
-
-\f
-/* Leave that blank line there!! Autoheader needs it.
- If you're adding to this file, keep in mind:
- The entries are in sort -df order: alphabetical, case insensitive,
- ignoring punctuation (such as underscores). */
class wxPaintDC;
class wxMemoryDC;
class wxToolBarGTK;
+class wxBitmapButton;
+class wxStaticBitmap;
class wxMask;
class wxBitmap;
friend wxDC;
friend wxPaintDC;
friend wxToolBarGTK;
+ friend wxBitmapButton;
+ friend wxStaticBitmap;
GdkBitmap *GetBitmap(void) const;
friend wxPaintDC;
friend wxMemoryDC;
friend wxToolBarGTK;
+ friend wxBitmapButton;
+ friend wxStaticBitmap;
GdkPixmap *GetPixmap(void) const;
GdkBitmap *GetBitmap(void) const;
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: tabctrl.h
+// Purpose: wxTabCtrl class
+// Author: Robert Roebling
+// Modified by:
+// RCS-ID: $Id$
+// Copyright: (c) Julian Smart and Markus Holzem
+// Licence: wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __TABCTRLH__
+#define __TABCTRLH__
+
+#ifdef __GNUG__
+#pragma interface "notebook.h"
+#endif
+
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/string.h"
+#include "wx/control.h"
+
+//-----------------------------------------------------------------------------
+// classes
+//-----------------------------------------------------------------------------
+
+class wxImageList;
+class wxPanel;
+
+class wxNotebook;
+
+//-----------------------------------------------------------------------------
+// global data
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// wxNotebook
+//-----------------------------------------------------------------------------
+
+class wxNotebook: public wxControl
+{
+ DECLARE_DYNAMIC_CLASS(wxNotebook)
+
+ public:
+
+ wxNotebook(void);
+ wxNotebook( wxWindow *parent, const wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ const long style = 0, const wxString& name = "notebook" );
+ ~wxNotebook(void);
+ bool Create(wxWindow *parent, const wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+ const long style = 0, const wxString& name = "notebook" );
+ int GetSelection(void) const;
+ wxImageList* GetImageList(void) const;
+ int GetPageCount(void) const;
+ int GetRowCount(void) const;
+ wxString GetPageText( const int page ) const;
+ int GetPageImage( const int page ) const;
+ void* GetPageData( const int page ) const;
+ int SetSelection( const int page );
+ void SetImageList( wxImageList* imageList );
+ bool SetPageText( const int page, const wxString& text );
+ bool SetPageImage( const int oage, const int image );
+ bool SetPageData( const int page, void* data );
+ void SetPageSize( const wxSize& size );
+ void SetPadding( const wxSize& padding );
+ bool DeleteAllPages(void);
+ bool DeletePage( const int page );
+ wxPanel *CreatePage( const int page, const wxString& text, const int imageId = -1, void* data = NULL );
+ wxPanel *GetPanel( const int page );
+
+ // overriden to do nothing
+ virtual void AddChild( wxWindow *win );
+
+ protected:
+
+ wxImageList* m_imageList;
+ wxList m_pages;
+ GtkWidget *m_frame;
+
+ DECLARE_EVENT_TABLE()
+};
+
+//-----------------------------------------------------------------------------
+// wxTabEvent
+//-----------------------------------------------------------------------------
+
+class wxTabEvent: public wxCommandEvent
+{
+ DECLARE_DYNAMIC_CLASS(wxTabEvent)
+
+ public:
+
+ wxTabEvent( WXTYPE commandType = 0, int id = 0 );
+};
+
+typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&);
+
+#define EVT_TAB_SEL_CHANGED(id, fn) { wxEVT_COMMAND_TAB_SEL_CHANGED, \
+ id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL },
+#define EVT_TAB_SEL_CHANGING(id, fn) { wxEVT_COMMAND_TAB_SEL_CHANGING, \
+ id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL },
+
+#endif
+ // __TABCTRLH__
+++ /dev/null
-/* ../../include/wx/gtk/setup.h. Generated automatically by configure. */
-/* wx_setup.h
- This file is in the public domain.
-
- Descriptive text for the C preprocessor macros that
- the distributed Autoconf macros can define.
- No software package will use all of them; autoheader copies the ones
- your configure.in uses into your configuration header file templates.
-
- The entries are in sort -df order: alphabetical, case insensitive,
- ignoring punctuation (such as underscores). Although this order
- can split up related entries, it makes it easier to check whether
- a given entry is in the file.
-
- Leave the following blank line there!! Autoheader needs it. */
-\f
-#ifndef __GTKSETUPH__
-#define __GTKSETUPH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-/* define the system to compile */
-#define __GTK__ 1
-#define __UNIX__ 1
-#define __LINUX__ 1
-/* #undef __SGI__ */
-/* #undef __HPUX__ */
-/* #undef __SYSV__ */
-/* #undef __SVR4__ */
-/* #undef __AIX__ */
-/* #undef __SUN__ */
-/* #undef __SOLARIS__ */
-/* #undef __SUNOS__ */
-/* #undef __ALPHA__ */
-/* #undef __OSF__ */
-/* #undef __BSD__ */
-/* #undef __FREEBSD__ */
-/* #undef __VMS__ */
-/* #undef __ULTRIX__ */
-/* #undef __DATA_GENERAL__ */
-
-/*
- * Use zlib
- */
-#define USE_ZLIB 1
-/*
- * Use gdk_imlib
- */
-#define USE_GDK_IMLIB 1
-/*
- * Use libpng
- */
-#define USE_LIBPNG 1
-/*
- * Use Threads
- */
-/* #undef USE_THREADS */
-/* #undef USE_THREADS_POSIX */
-/* #undef USE_THREADS_SGI */
-/*
- * Use storable classes
- */
-#define USE_STORABLE_CLASSES 1
-/*
- * Use automatic translation via gettext() in wxTString
- */
-#define USE_AUTOTRANS 1
-/*
- * Use font metric files in GetTextExtent for wxPostScriptDC
- * Use consistent PostScript fonts for AFM and printing (!)
- */
-#define USE_AFM_FOR_POSTSCRIPT 1
-#define WX_NORMALIZED_PS_FONTS 1
-/*
- * Use clipboard
- */
-/* #undef USE_CLIPBOARD */
-/*
- * Use wxWindows layout constraint system
- */
-#define USE_CONSTRAINTS 1
-/*
- * Use the document/view architecture
- */
-#define USE_DOC_VIEW_ARCHITECTURE 1
-/*
- * Use enhanced dialog
- */
-/* #undef USE_ENHANCED_DIALOG */
-/*
- * Use Form panel item placement
- */
-/* #undef USE_FORM */
-/*
- * Use fraction class
- */
-#define USE_FRACTION 1
-/*
- * Use gauge item
- */
-#define USE_GAUGE 1
-/*
- * Implement a GLCanvas class as an interface to OpenGL, using the GLX
- * extension to the X11 protocol. You can use the (free) Mesa library
- * if you don't have a 'real' OpenGL.
- */
-#define USE_GLX 0
-/*
- * Use wxWindows help facility (needs USE_IPC 1)
- */
-/* #undef USE_HELP */
-/*
- * Use iostream.h rather than iostream
- */
-#define USE_IOSTREAMH 1
-/*
- * Use Interprocess communication
- */
-#define USE_IPC 1
-/*
- * Use Metafile and Metafile device context
- */
-/* #undef USE_METAFILE */
-/*
- * Use PostScript device context
- */
-#define USE_POSTSCRIPT 1
-/*
- * Use the print/preview architecture
- */
-#define USE_PRINTING_ARCHITECTURE 1
-/*
- * Use Prolog IO
- */
-/* #undef USE_PROLOGIO */
-/*
- * Use Remote Procedure Call (Needs USE_IPC and USE_PROLOGIO)
- */
-/* #undef USE_RPC */
-/*
- * Use wxGetResource & wxWriteResource (change .Xdefaults)
- */
-#define USE_RESOURCES 1
-/*
- * Use scrollbar item
- */
-#define USE_SCROLLBAR 1
-/*
- * Use time and date classes
- */
-#define USE_TIMEDATE 1
-/*
- * Use toolbar, use Xt port toolbar (3D look)
- */
-#define USE_TOOLBAR 1
-#define USE_XT_TOOLBAR
-/*
- * Enables old type checking mechanism (wxSubType)
- */
-/* #undef USE_TYPETREE */
-/*
- * Use virtual list box item
- */
-/* #undef USE_VLBOX */
-/*
- * Use wxWindows resource loading (.wxr-files) (Needs USE_PROLOGIO 1)
- */
-#define USE_WX_RESOURCES 1
-/*
- * Use wxGraph
- */
-/* #undef USE_WXGRAPH */
-/*
- * Use wxTree
- */
-
-/*
- * Use wxConfig profile management classes (wxFileConfig only under Unix)
- */
-#define USE_WXCONFIG 1
-
-/********************** DO NOT CHANGE BELOW THIS POINT **********************/
-
-/**************************** DEBUGGING FEATURES ****************************/
-
-/* Compatibility with 1.66 API.
- Level 0: no backward compatibility, all new features
- Level 1: wxDC, OnSize (etc.) compatibility, but
- some new features such as event tables */
-#define WXWIN_COMPATIBILITY 1
-/*
- * Enables debugging: memory tracing, assert, etc.
- */
-#define DEBUG 1
-/*
- * Enables debugging version of wxObject::new and wxObject::delete (IF DEBUG)
- * WARNING: this code may not work with all architectures, especially
- * if alignment is an issue.
- */
-/* #undef USE_MEMORY_TRACING */
-/*
- * Enable debugging version of global memory operators new and delete
- * Disable it, If this causes problems (e.g. link errors)
- */
-/* #undef USE_GLOBAL_MEMORY_OPERATORS */
-/*
- * If WXDEBUG && USE_MEMORY_TRACING && USE_GLOBAL_MEMORY_OPERATORS
- * used to debug the memory allocation of wxWindows Xt port code
- */
-#define USE_INTERNAL_MEMORY_TRACING 0
-/*
- * Matthews garbage collection (used for MrEd?)
- */
-#define WXGARBAGE_COLLECTION_ON 0
-
-/**************************** COMPILER FEATURES *****************************/
-
-/*
- * Disable this if your compiler can't cope
- * with omission of prototype parameters.
- */
-#define REMOVE_UNUSED_ARG 1
-/*
- * The const keyword is being introduced more in wxWindows.
- * You can use this setting to maintain backward compatibility.
- * If 0: will use const wherever possible.
- * If 1: will use const only where necessary
- * for precompiled headers to work.
- * If 2: will be totally backward compatible, but precompiled
- * headers may not work and program size will be larger.
- */
-#define CONST_COMPATIBILITY 0
-
-/************************ WINDOWS 3.1 COMPATIBILITY *************************/
-
-/*
- * Normalize X drawing code to behave exactly as MSW.
- */
-#define WX_STANDARD_GRAPHICS 0
-
-/******************* other stuff **********************************/
-/*
- * Support image loading for wxBitmap (wxImage is needed for this)
- */
-#define USE_IMAGE_LOADING 0
-#define WXIMAGE_INCLUDE "../../utils/image/src/wx_image.h"
-/*
- * Use splines
- */
-#define USE_SPLINES 1
-
-/*
- * USE_DYNAMIC_CLASSES is TRUE for the Xt port
- */
-#define USE_DYNAMIC_CLASSES 1
-/*
- * USE_EXTENDED_STATICS is FALSE for the Xt port
-*/
-#define USE_EXTENDED_STATICS 0
-
-/*************************** IMAKEFILE EVALUATIOS ***************************/
-
-#if USE_XPM
- #define USE_XPM_IN_X 1
-#else
- #define USE_XPM_IN_X 0
-#endif
-#if USE_IMAGE_LOADING
- #define USE_IMAGE_LOADING_IN_X 1
-#else
- #define USE_IMAGE_LOADING_IN_X 0
-#endif
-
-/* here comes the system-specific stuff */
-
-/* acconfig.h
- This file is in the public domain.
-
- Descriptive text for the C preprocessor macros that
- the distributed Autoconf macros can define.
- No software package will use all of them; autoheader copies the ones
- your configure.in uses into your configuration header file templates.
-
- The entries are in sort -df order: alphabetical, case insensitive,
- ignoring punctuation (such as underscores). Although this order
- can split up related entries, it makes it easier to check whether
- a given entry is in the file. */
-
-/* Define if on AIX 3.
- System headers sometimes define this.
- We just want to avoid a redefinition error message. */
-#ifndef _ALL_SOURCE
-/* #undef _ALL_SOURCE */
-#endif
-
-/* Define if using alloca.c. */
-/* #undef C_ALLOCA */
-
-/* Define if type char is unsigned and you are not using gcc. */
-#ifndef __CHAR_UNSIGNED__
-/* #undef __CHAR_UNSIGNED__ */
-#endif
-
-/* Define if the closedir function returns void instead of int. */
-/* #undef CLOSEDIR_VOID */
-
-/* Define to empty if the keyword does not work. */
-/* #undef const */
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
- This function is required for alloca.c support on those systems. */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define for DGUX with <sys/dg_sys_info.h>. */
-/* #undef DGUX */
-
-/* Define if you have <dirent.h>. */
-/* #undef DIRENT */
-
-/* Define to the type of elements in the array set by `getgroups'.
- Usually this is either `int' or `gid_t'. */
-#define GETGROUPS_T gid_t
-
-/* Define if the `getloadavg' function needs to be run setuid or setgid. */
-/* #undef GETLOADAVG_PRIVILEGED */
-
-/* Define if the `getpgrp' function takes no argument. */
-/* #undef GETPGRP_VOID */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef gid_t */
-
-/* Define if you have alloca, as a function or macro. */
-/* #undef HAVE_ALLOCA */
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define if you don't have vprintf but do have _doprnt. */
-/* #undef HAVE_DOPRNT */
-
-/* Define if your system has its own `getloadavg' function. */
-/* #undef HAVE_GETLOADAVG */
-
-/* Define if you have the getmntent function. */
-/* #undef HAVE_GETMNTENT */
-
-/* Define if the `long double' type works. */
-#define HAVE_LONG_DOUBLE 1
-
-/* Define if you support file names longer than 14 characters. */
-#define HAVE_LONG_FILE_NAMES 1
-
-/* Define if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
-
-/* Define if system calls automatically restart after interruption
- by a signal. */
-/* #undef HAVE_RESTARTABLE_SYSCALLS */
-
-/* Define if your struct stat has st_blksize. */
-#define HAVE_ST_BLKSIZE 1
-
-/* Define if your struct stat has st_blocks. */
-#define HAVE_ST_BLOCKS 1
-
-/* Define if you have the strcoll function and it is properly defined. */
-/* #undef HAVE_STRCOLL */
-
-/* Define if your struct stat has st_rdev. */
-#define HAVE_ST_RDEV 1
-
-/* Define if you have the strftime function. */
-/* #undef HAVE_STRFTIME */
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
-#define HAVE_SYS_WAIT_H 1
-
-/* Define if your struct tm has tm_zone. */
-/* #undef HAVE_TM_ZONE */
-
-/* Define if you don't have tm_zone but do have the external array
- tzname. */
-#define HAVE_TZNAME 1
-
-/* Define if you have <unistd.h>. */
-/* #undef HAVE_UNISTD_H */
-
-/* Define if utime(file, NULL) sets file's timestamp to the present. */
-/* #undef HAVE_UTIME_NULL */
-
-/* Define if you have <vfork.h>. */
-/* #undef HAVE_VFORK_H */
-
-/* Define if you have the vprintf function. */
-/* #undef HAVE_VPRINTF */
-
-/* Define if you have the wait3 system call. */
-/* #undef HAVE_WAIT3 */
-
-/* Define as __inline if that's what the C compiler calls it. */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define if major, minor, and makedev are declared in <mkdev.h>. */
-/* #undef MAJOR_IN_MKDEV */
-
-/* Define if major, minor, and makedev are declared in <sysmacros.h>. */
-/* #undef MAJOR_IN_SYSMACROS */
-
-/* Define if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef mode_t */
-
-/* Define if you don't have <dirent.h>, but have <ndir.h>. */
-/* #undef NDIR */
-
-/* Define if you have <memory.h>, and <string.h> doesn't declare the
- mem* functions. */
-/* #undef NEED_MEMORY_H */
-
-/* Define if your struct nlist has an n_un member. */
-/* #undef NLIST_NAME_UNION */
-
-/* Define if you have <nlist.h>. */
-/* #undef NLIST_STRUCT */
-
-/* Define if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
-/* Define to `long' if <sys/types.h> doesn't define. */
-/* #undef off_t */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef pid_t */
-
-/* Define if the system does not provide POSIX.1 features except
- with this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define if you need to in order for stat and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define as the return type of signal handlers (int or void). */
-#define RETSIGTYPE void
-
-/* Define if the setvbuf function takes the buffering type as its second
- argument and the buffer pointer as the third, as on System V
- before release 3. */
-/* #undef SETVBUF_REVERSED */
-
-/* Define SIZESOF for some Objects */
-#define SIZEOF_INT 4
-#define SIZEOF_INT_P 4
-#define SIZEOF_LONG 4
-
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-/* #undef size_t */
-
-/* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-/* #undef STACK_DIRECTION */
-
-/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-/* #undef STAT_MACROS_BROKEN */
-
-/* Define if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define on System V Release 4. */
-/* #undef SVR4 */
-
-/* Define on BSD */
-/* #undef BSD */
-
-/* Define on System V */
-/* #undef SYSV */
-
-/* Define if you don't have <dirent.h>, but have <sys/dir.h>. */
-/* #undef SYSDIR */
-
-/* Define if you don't have <dirent.h>, but have <sys/ndir.h>. */
-/* #undef SYSNDIR */
-
-/* Define if `sys_siglist' is declared by <signal.h>. */
-/* #undef SYS_SIGLIST_DECLARED */
-
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define if your <sys/time.h> declares struct tm. */
-/* #undef TM_IN_SYS_TIME */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef uid_t */
-
-/* Define for Encore UMAX. */
-/* #undef UMAX */
-
-/* Define for Encore UMAX 4.3 that has <inq_status/cpustats.h>
- instead of <sys/cpustats.h>. */
-/* #undef UMAX4_3 */
-
-/* Define if you do not have <strings.h>, index, bzero, etc.. */
-/* #undef USG */
-
-/* Define if the system is System V Release 4 */
-/* #undef SVR4 */
-
-/* Define vfork as fork if vfork does not work. */
-/* #undef vfork */
-
-/* Define if the closedir function returns void instead of int. */
-/* #undef VOID_CLOSEDIR */
-
-/* Define if your processor stores words with the most significant
- byte first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
-
-/* Define if lex declares yytext as a char * by default, not a char[]. */
-#define YYTEXT_POINTER 1
-
-#endif /* __GTKSETUPH__ */
-
-\f
-/* Leave that blank line there!! Autoheader needs it.
- If you're adding to this file, keep in mind:
- The entries are in sort -df order: alphabetical, case insensitive,
- ignoring punctuation (such as underscores). */
--- /dev/null
+#ifndef __NOTEBOOKH_BASE__
+#define __NOTEBOOKH_BASE__
+
+#if defined(__WINDOWS__)
+#elif defined(__MOTIF__)
+#elif defined(__GTK__)
+ #include "wx/gtk/notebook.h"
+#endif
+
+#endif
+ // __NOTEBOOKH_BASE__
#elif defined(__MOTIF__)
#include "wx/xt/tabctrl.h"
#elif defined(__GTK__)
-#include "wx/gtk/tabctrl.h"
#endif
#endif
ac_help="$ac_help
**--with-postscript use postscript-device-context"
ac_help="$ac_help
+**--with-wxconfig use wxconfig"
+ac_help="$ac_help
**--with-metafile use metafile"
ac_help="$ac_help
**--with-form use form"
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:674: checking for $ac_word" >&5
+echo "configure:676: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:703: checking for $ac_word" >&5
+echo "configure:705: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:751: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:753: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
-#line 761 "configure"
+#line 763 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:785: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:787: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:790: checking whether we are using GNU C" >&5
+echo "configure:792: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:814: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:816: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "x$CC" != xcc; then
echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
-echo "configure:846: checking whether $CC and cc understand -c and -o together" >&5
+echo "configure:848: checking whether $CC and cc understand -c and -o together" >&5
else
echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
-echo "configure:849: checking whether cc understands -c and -o together" >&5
+echo "configure:851: checking whether cc understands -c and -o together" >&5
fi
set dummy $CC; ac_cc="`echo $2 |
sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
# We do the test twice because some compilers refuse to overwrite an
# existing .o file with -o, though they will create one.
ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
-if { (eval echo configure:861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
- test -f conftest.o && { (eval echo configure:862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+if { (eval echo configure:863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+ test -f conftest.o && { (eval echo configure:864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
then
eval ac_cv_prog_cc_${ac_cc}_c_o=yes
if test "x$CC" != xcc; then
# Test first that cc exists at all.
- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
ac_try='cc -c conftest.c -o conftest.o 1>&5'
- if { (eval echo configure:869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
- test -f conftest.o && { (eval echo configure:870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+ if { (eval echo configure:871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+ test -f conftest.o && { (eval echo configure:872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
then
# cc works too.
:
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:897: checking how to run the C preprocessor" >&5
+echo "configure:899: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 912 "configure"
+#line 914 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 929 "configure"
+#line 931 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
if test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:959: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:961: checking whether ${CC-cc} needs -traditional" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_pattern="Autoconf.*'x'"
cat > conftest.$ac_ext <<EOF
-#line 965 "configure"
+#line 967 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 983 "configure"
+#line 985 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1012: checking for $ac_word" >&5
+echo "configure:1014: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1043: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1045: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF
-#line 1053 "configure"
+#line 1055 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1083: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1085: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1088: checking whether we are using GNU C++" >&5
+echo "configure:1090: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1112: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1114: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
fi
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:1140: checking how to run the C++ preprocessor" >&5
+echo "configure:1142: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
-#line 1153 "configure"
+#line 1155 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1190: checking for $ac_word" >&5
+echo "configure:1192: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1220: checking for $ac_word" >&5
+echo "configure:1222: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1277: checking for a BSD compatible install" >&5
+echo "configure:1279: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1328: checking whether ln -s works" >&5
+echo "configure:1330: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1354: checking for $ac_word" >&5
+echo "configure:1356: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6
-echo "configure:1384: checking "make for VPATH support"" >&5
+echo "configure:1386: checking "make for VPATH support"" >&5
cat - << EOF > confMake
check : file
cp \$? \$@
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:1414: checking for X" >&5
+echo "configure:1416: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 1476 "configure"
+#line 1478 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1481: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1550 "configure"
+#line 1552 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:1557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:1663: checking whether -R must be followed by a space" >&5
+echo "configure:1665: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 1666 "configure"
+#line 1668 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
ac_R_nospace=yes
else
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 1689 "configure"
+#line 1691 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
ac_R_space=yes
else
# libraries were built with DECnet support. And karl@cs.umb.edu says
# the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:1728: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:1730: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1736 "configure"
+#line 1738 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:1747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:1769: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:1771: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1777 "configure"
+#line 1779 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey@clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:1817: checking for gethostbyname" >&5
+echo "configure:1819: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1822 "configure"
+#line 1824 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
; return 0; }
EOF
-if { (eval echo configure:1845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1866: checking for gethostbyname in -lnsl" >&5
+echo "configure:1868: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1874 "configure"
+#line 1876 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:1885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:1915: checking for connect" >&5
+echo "configure:1917: checking for connect" >&5
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1920 "configure"
+#line 1922 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
; return 0; }
EOF
-if { (eval echo configure:1943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:1964: checking for connect in -lsocket" >&5
+echo "configure:1966: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1972 "configure"
+#line 1974 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
connect()
; return 0; }
EOF
-if { (eval echo configure:1983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:2007: checking for remove" >&5
+echo "configure:2009: checking for remove" >&5
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2012 "configure"
+#line 2014 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
; return 0; }
EOF
-if { (eval echo configure:2035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:2056: checking for remove in -lposix" >&5
+echo "configure:2058: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2064 "configure"
+#line 2066 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
remove()
; return 0; }
EOF
-if { (eval echo configure:2075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:2099: checking for shmat" >&5
+echo "configure:2101: checking for shmat" >&5
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2104 "configure"
+#line 2106 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
; return 0; }
EOF
-if { (eval echo configure:2127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:2148: checking for shmat in -lipc" >&5
+echo "configure:2150: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2156 "configure"
+#line 2158 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
shmat()
; return 0; }
EOF
-if { (eval echo configure:2167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
# libraries we check for below, so use a different variable.
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:2200: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:2202: checking for IceConnectionNumber in -lICE" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lICE $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2208 "configure"
+#line 2210 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:2219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:2249: checking for $ac_hdr that defines DIR" >&5
+echo "configure:2251: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2254 "configure"
+#line 2256 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:2262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:2287: checking for opendir in -ldir" >&5
+echo "configure:2289: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2295 "configure"
+#line 2297 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
opendir()
; return 0; }
EOF
-if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:2328: checking for opendir in -lx" >&5
+echo "configure:2330: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2336 "configure"
+#line 2338 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
opendir()
; return 0; }
EOF
-if { (eval echo configure:2347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2370: checking for ANSI C header files" >&5
+echo "configure:2372: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2375 "configure"
+#line 2377 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 2400 "configure"
+#line 2402 "configure"
#include "confdefs.h"
#include <string.h>
EOF
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 2418 "configure"
+#line 2420 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
:
else
cat > conftest.$ac_ext <<EOF
-#line 2439 "configure"
+#line 2441 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
exit (0); }
EOF
-if { (eval echo configure:2450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
:
else
fi
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2474: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2476: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2479 "configure"
+#line 2481 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:2495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
ac_safe=`echo "fcntl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for fcntl.h""... $ac_c" 1>&6
-echo "configure:2517: checking for fcntl.h" >&5
+echo "configure:2519: checking for fcntl.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2522 "configure"
+#line 2524 "configure"
#include "confdefs.h"
#include <fcntl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
ac_safe=`echo "limits.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for limits.h""... $ac_c" 1>&6
-echo "configure:2550: checking for limits.h" >&5
+echo "configure:2552: checking for limits.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2555 "configure"
+#line 2557 "configure"
#include "confdefs.h"
#include <limits.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
ac_safe=`echo "sys/file.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/file.h""... $ac_c" 1>&6
-echo "configure:2583: checking for sys/file.h" >&5
+echo "configure:2585: checking for sys/file.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2588 "configure"
+#line 2590 "configure"
#include "confdefs.h"
#include <sys/file.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
ac_safe=`echo "sys/time.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/time.h""... $ac_c" 1>&6
-echo "configure:2616: checking for sys/time.h" >&5
+echo "configure:2618: checking for sys/time.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2621 "configure"
+#line 2623 "configure"
#include "confdefs.h"
#include <sys/time.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
ac_safe=`echo "unistd.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for unistd.h""... $ac_c" 1>&6
-echo "configure:2649: checking for unistd.h" >&5
+echo "configure:2651: checking for unistd.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2654 "configure"
+#line 2656 "configure"
#include "confdefs.h"
#include <unistd.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:2682: checking for uid_t in sys/types.h" >&5
+echo "configure:2684: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2687 "configure"
+#line 2689 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
fi
echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:2716: checking type of array argument to getgroups" >&5
+echo "configure:2718: checking type of array argument to getgroups" >&5
if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_type_getgroups=cross
else
cat > conftest.$ac_ext <<EOF
-#line 2724 "configure"
+#line 2726 "configure"
#include "confdefs.h"
/* Thanks to Mike Rendell for this test. */
}
EOF
-if { (eval echo configure:2749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_type_getgroups=gid_t
else
if test $ac_cv_type_getgroups = cross; then
cat > conftest.$ac_ext <<EOF
-#line 2763 "configure"
+#line 2765 "configure"
#include "confdefs.h"
#include <unistd.h>
EOF
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:2787: checking for mode_t" >&5
+echo "configure:2789: checking for mode_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2792 "configure"
+#line 2794 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2820: checking for off_t" >&5
+echo "configure:2822: checking for off_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2825 "configure"
+#line 2827 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:2853: checking for pid_t" >&5
+echo "configure:2855: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2858 "configure"
+#line 2860 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2886: checking return type of signal handlers" >&5
+echo "configure:2888: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2891 "configure"
+#line 2893 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
int i;
; return 0; }
EOF
-if { (eval echo configure:2908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2927: checking for size_t" >&5
+echo "configure:2929: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2932 "configure"
+#line 2934 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:2960: checking for uid_t in sys/types.h" >&5
+echo "configure:2962: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2965 "configure"
+#line 2967 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:2996: checking whether stat file-mode macros are broken" >&5
+echo "configure:2998: checking whether stat file-mode macros are broken" >&5
if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3001 "configure"
+#line 3003 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3052: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3054: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3057 "configure"
+#line 3059 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:3066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
fi
echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:3087: checking for st_blksize in struct stat" >&5
+echo "configure:3089: checking for st_blksize in struct stat" >&5
if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3092 "configure"
+#line 3094 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
struct stat s; s.st_blksize;
; return 0; }
EOF
-if { (eval echo configure:3100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_blksize=yes
else
fi
echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
-echo "configure:3121: checking for st_blocks in struct stat" >&5
+echo "configure:3123: checking for st_blocks in struct stat" >&5
if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3126 "configure"
+#line 3128 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
struct stat s; s.st_blocks;
; return 0; }
EOF
-if { (eval echo configure:3134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_blocks=yes
else
fi
echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
-echo "configure:3157: checking for st_rdev in struct stat" >&5
+echo "configure:3159: checking for st_rdev in struct stat" >&5
if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3162 "configure"
+#line 3164 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
struct stat s; s.st_rdev;
; return 0; }
EOF
-if { (eval echo configure:3170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3172: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_rdev=yes
else
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:3191: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:3193: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3196 "configure"
+#line 3198 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:3204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
fi
echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:3225: checking for tm_zone in struct tm" >&5
+echo "configure:3227: checking for tm_zone in struct tm" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3230 "configure"
+#line 3232 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
struct tm tm; tm.tm_zone;
; return 0; }
EOF
-if { (eval echo configure:3238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone=yes
else
else
echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:3258: checking for tzname" >&5
+echo "configure:3260: checking for tzname" >&5
if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3263 "configure"
+#line 3265 "configure"
#include "confdefs.h"
#include <time.h>
#ifndef tzname /* For SGI. */
atoi(*tzname);
; return 0; }
EOF
-if { (eval echo configure:3273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
ac_cv_var_tzname=yes
else
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3297: checking for working const" >&5
+echo "configure:3299: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3302 "configure"
+#line 3304 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3372: checking for inline" >&5
+echo "configure:3374: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 3379 "configure"
+#line 3381 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:3386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
esac
echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:3412: checking whether char is unsigned" >&5
+echo "configure:3414: checking whether char is unsigned" >&5
if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$GCC" = yes; then
# GCC predefines this symbol on systems where it applies.
cat > conftest.$ac_ext <<EOF
-#line 3419 "configure"
+#line 3421 "configure"
#include "confdefs.h"
#ifdef __CHAR_UNSIGNED__
yes
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 3441 "configure"
+#line 3443 "configure"
#include "confdefs.h"
/* volatile prevents gcc2 from optimizing the test away on sparcs. */
#if !defined(__STDC__) || __STDC__ != 1
volatile char c = 255; exit(c < 0);
}
EOF
-if { (eval echo configure:3451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_c_char_unsigned=yes
else
fi
echo $ac_n "checking for long double""... $ac_c" 1>&6
-echo "configure:3475: checking for long double" >&5
+echo "configure:3477: checking for long double" >&5
if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 3486 "configure"
+#line 3488 "configure"
#include "confdefs.h"
int main() {
/* The Stardent Vistra knows sizeof(long double), but does not support it. */
/* On Ultrix 4.3 cc, long double is 4 and double is 8. */
exit(sizeof(long double) < sizeof(double)); }
EOF
-if { (eval echo configure:3494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_c_long_double=yes
else
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3519: checking whether byte ordering is bigendian" >&5
+echo "configure:3521: checking whether byte ordering is bigendian" >&5
if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 3526 "configure"
+#line 3528 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:3537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 3541 "configure"
+#line 3543 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:3552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 3572 "configure"
+#line 3574 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:3585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_c_bigendian=no
else
echo $ac_n "checking size of int *""... $ac_c" 1>&6
-echo "configure:3610: checking size of int *" >&5
+echo "configure:3612: checking size of int *" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 3618 "configure"
+#line 3620 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:3629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int_p=`cat conftestval`
else
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:3649: checking size of int" >&5
+echo "configure:3651: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 3657 "configure"
+#line 3659 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:3668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:3688: checking size of long" >&5
+echo "configure:3690: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 3696 "configure"
+#line 3698 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:3707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:3730: checking for long file names" >&5
+echo "configure:3732: checking for long file names" >&5
if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3781: checking for $ac_word" >&5
+echo "configure:3783: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3814: checking for $ac_word" >&5
+echo "configure:3816: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:3847: checking for yywrap in -l$ac_lib" >&5
+echo "configure:3849: checking for yywrap in -l$ac_lib" >&5
ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3855 "configure"
+#line 3857 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
yywrap()
; return 0; }
EOF
-if { (eval echo configure:3866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
fi
echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:3889: checking lex output file root" >&5
+echo "configure:3891: checking lex output file root" >&5
if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:3910: checking whether yytext is a pointer" >&5
+echo "configure:3912: checking whether yytext is a pointer" >&5
if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LEXLIB"
cat > conftest.$ac_ext <<EOF
-#line 3922 "configure"
+#line 3924 "configure"
#include "confdefs.h"
`cat $LEX_OUTPUT_ROOT.c`
int main() {
; return 0; }
EOF
-if { (eval echo configure:3929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
ac_cv_prog_lex_yytext_pointer=yes
else
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:3963: checking host system type" >&5
+echo "configure:3965: checking host system type" >&5
host_alias=$host
case "$host_alias" in
DEFAULT_USE_THREADS_POSIX=0
DEFAULT_USE_OPENGL=0
+DEFAULT_USE_WXCONFIG=1
DEFAULT_USE_POSTSCRIPT=1
DEFAULT_USE_IPC=1
DEFAULT_USE_RESOURCES=1
DEFAULT_USE_ENHANCED_DIALOG=0
DEFAULT_USE_FORM=0
-DEFAULT_USE_PROLOGIO=0
+DEFAULT_USE_PROLOGIO=1
DEFAULT_USE_RPC=0
DEFAULT_USE_WX_RESOURCES=1
echo $ac_n "checking "for shared"""... $ac_c" 1>&6
-echo "configure:4198: checking "for shared"" >&5
+echo "configure:4201: checking "for shared"" >&5
# Check whether --with-shared or --without-shared was given.
if test "${with_shared+set}" = set; then
withval="$with_shared"
echo $ac_n "checking "for optimise"""... $ac_c" 1>&6
-echo "configure:4228: checking "for optimise"" >&5
+echo "configure:4231: checking "for optimise"" >&5
# Check whether --with-optimise or --without-optimise was given.
if test "${with_optimise+set}" = set; then
withval="$with_optimise"
echo $ac_n "checking "for debug_flag"""... $ac_c" 1>&6
-echo "configure:4258: checking "for debug_flag"" >&5
+echo "configure:4261: checking "for debug_flag"" >&5
# Check whether --with-debug_flag or --without-debug_flag was given.
if test "${with_debug_flag+set}" = set; then
withval="$with_debug_flag"
echo $ac_n "checking "for debug_info"""... $ac_c" 1>&6
-echo "configure:4288: checking "for debug_info"" >&5
+echo "configure:4291: checking "for debug_info"" >&5
# Check whether --with-debug_info or --without-debug_info was given.
if test "${with_debug_info+set}" = set; then
withval="$with_debug_info"
echo $ac_n "checking "for mem_tracing"""... $ac_c" 1>&6
-echo "configure:4318: checking "for mem_tracing"" >&5
+echo "configure:4321: checking "for mem_tracing"" >&5
# Check whether --with-mem_tracing or --without-mem_tracing was given.
if test "${with_mem_tracing+set}" = set; then
withval="$with_mem_tracing"
echo $ac_n "checking "for profile"""... $ac_c" 1>&6
-echo "configure:4348: checking "for profile"" >&5
+echo "configure:4351: checking "for profile"" >&5
# Check whether --with-profile or --without-profile was given.
if test "${with_profile+set}" = set; then
withval="$with_profile"
echo $ac_n "checking "for zlib"""... $ac_c" 1>&6
-echo "configure:4379: checking "for zlib"" >&5
+echo "configure:4382: checking "for zlib"" >&5
# Check whether --with-zlib or --without-zlib was given.
if test "${with_zlib+set}" = set; then
withval="$with_zlib"
echo $ac_n "checking "for gdk_imlib"""... $ac_c" 1>&6
-echo "configure:4409: checking "for gdk_imlib"" >&5
+echo "configure:4412: checking "for gdk_imlib"" >&5
# Check whether --with-gdk_imlib or --without-gdk_imlib was given.
if test "${with_gdk_imlib+set}" = set; then
withval="$with_gdk_imlib"
echo $ac_n "checking "for libpng"""... $ac_c" 1>&6
-echo "configure:4439: checking "for libpng"" >&5
+echo "configure:4442: checking "for libpng"" >&5
# Check whether --with-libpng or --without-libpng was given.
if test "${with_libpng+set}" = set; then
withval="$with_libpng"
echo $ac_n "checking "for threads"""... $ac_c" 1>&6
-echo "configure:4469: checking "for threads"" >&5
+echo "configure:4472: checking "for threads"" >&5
# Check whether --with-threads or --without-threads was given.
if test "${with_threads+set}" = set; then
withval="$with_threads"
echo $ac_n "checking "for opengl"""... $ac_c" 1>&6
-echo "configure:4499: checking "for opengl"" >&5
+echo "configure:4502: checking "for opengl"" >&5
# Check whether --with-opengl or --without-opengl was given.
if test "${with_opengl+set}" = set; then
withval="$with_opengl"
echo $ac_n "checking "for storable"""... $ac_c" 1>&6
-echo "configure:4530: checking "for storable"" >&5
+echo "configure:4533: checking "for storable"" >&5
# Check whether --with-storable or --without-storable was given.
if test "${with_storable+set}" = set; then
withval="$with_storable"
echo $ac_n "checking "for autotrans"""... $ac_c" 1>&6
-echo "configure:4560: checking "for autotrans"" >&5
+echo "configure:4563: checking "for autotrans"" >&5
# Check whether --with-autotrans or --without-autotrans was given.
if test "${with_autotrans+set}" = set; then
withval="$with_autotrans"
echo $ac_n "checking "for afmfonts"""... $ac_c" 1>&6
-echo "configure:4590: checking "for afmfonts"" >&5
+echo "configure:4593: checking "for afmfonts"" >&5
# Check whether --with-afmfonts or --without-afmfonts was given.
if test "${with_afmfonts+set}" = set; then
withval="$with_afmfonts"
echo $ac_n "checking "for normalized"""... $ac_c" 1>&6
-echo "configure:4620: checking "for normalized"" >&5
+echo "configure:4623: checking "for normalized"" >&5
# Check whether --with-normalized or --without-normalized was given.
if test "${with_normalized+set}" = set; then
withval="$with_normalized"
echo $ac_n "checking "for RPC"""... $ac_c" 1>&6
-echo "configure:4650: checking "for RPC"" >&5
+echo "configure:4653: checking "for RPC"" >&5
# Check whether --with-rpc or --without-rpc was given.
if test "${with_rpc+set}" = set; then
withval="$with_rpc"
echo $ac_n "checking "for wxresources"""... $ac_c" 1>&6
-echo "configure:4680: checking "for wxresources"" >&5
+echo "configure:4683: checking "for wxresources"" >&5
# Check whether --with-wxresources or --without-wxresources was given.
if test "${with_wxresources+set}" = set; then
withval="$with_wxresources"
echo $ac_n "checking "for prologio"""... $ac_c" 1>&6
-echo "configure:4710: checking "for prologio"" >&5
+echo "configure:4713: checking "for prologio"" >&5
# Check whether --with-prologio or --without-prologio was given.
if test "${with_prologio+set}" = set; then
withval="$with_prologio"
echo $ac_n "checking "for postscript"""... $ac_c" 1>&6
-echo "configure:4740: checking "for postscript"" >&5
+echo "configure:4743: checking "for postscript"" >&5
# Check whether --with-postscript or --without-postscript was given.
if test "${with_postscript+set}" = set; then
withval="$with_postscript"
+echo $ac_n "checking "for wxconfig"""... $ac_c" 1>&6
+echo "configure:4773: checking "for wxconfig"" >&5
+# Check whether --with-wxconfig or --without-wxconfig was given.
+if test "${with_wxconfig+set}" = set; then
+ withval="$with_wxconfig"
+ if test "x$with_wxconfig" = xyes; then
+ ac_cv_use_wxconfig='USE_WXCONFIG="1"'
+else
+ ac_cv_use_wxconfig='USE_WXCONFIG="0"'
+fi
+else
+
+ LINE=`grep "USE_WXCONFIG" ${OSTYPE}.system.cache`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ fi
+ ac_cv_use_wxconfig='USE_WXCONFIG='$DEFAULT_USE_WXCONFIG
+
+fi
+
+eval "$ac_cv_use_wxconfig"
+echo $ac_cv_use_wxconfig >> ${OSTYPE}.system.cache.tmp
+if test "$USE_WXCONFIG" = 1; then
+ echo "$ac_t""yes" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
+
echo $ac_n "checking "for metafile"""... $ac_c" 1>&6
-echo "configure:4770: checking "for metafile"" >&5
+echo "configure:4803: checking "for metafile"" >&5
# Check whether --with-metafile or --without-metafile was given.
if test "${with_metafile+set}" = set; then
withval="$with_metafile"
echo $ac_n "checking "for form"""... $ac_c" 1>&6
-echo "configure:4800: checking "for form"" >&5
+echo "configure:4833: checking "for form"" >&5
# Check whether --with-form or --without-form was given.
if test "${with_form+set}" = set; then
withval="$with_form"
echo $ac_n "checking "for help"""... $ac_c" 1>&6
-echo "configure:4830: checking "for help"" >&5
+echo "configure:4863: checking "for help"" >&5
# Check whether --with-help or --without-help was given.
if test "${with_help+set}" = set; then
withval="$with_help"
echo $ac_n "checking "for IPC"""... $ac_c" 1>&6
-echo "configure:4860: checking "for IPC"" >&5
+echo "configure:4893: checking "for IPC"" >&5
# Check whether --with-ipc or --without-ipc was given.
if test "${with_ipc+set}" = set; then
withval="$with_ipc"
echo $ac_n "checking "for enhanced dialog"""... $ac_c" 1>&6
-echo "configure:4890: checking "for enhanced dialog"" >&5
+echo "configure:4923: checking "for enhanced dialog"" >&5
# Check whether --with-enhanceddialog or --without-enhanceddialog was given.
if test "${with_enhanceddialog+set}" = set; then
withval="$with_enhanceddialog"
echo $ac_n "checking "for resources"""... $ac_c" 1>&6
-echo "configure:4920: checking "for resources"" >&5
+echo "configure:4953: checking "for resources"" >&5
# Check whether --with-resources or --without-resources was given.
if test "${with_resources+set}" = set; then
withval="$with_resources"
echo $ac_n "checking "for clipboard"""... $ac_c" 1>&6
-echo "configure:4950: checking "for clipboard"" >&5
+echo "configure:4983: checking "for clipboard"" >&5
# Check whether --with-clipboard or --without-clipboard was given.
if test "${with_clipboard+set}" = set; then
withval="$with_clipboard"
echo $ac_n "checking "for timedate"""... $ac_c" 1>&6
-echo "configure:4980: checking "for timedate"" >&5
+echo "configure:5013: checking "for timedate"" >&5
# Check whether --with-timedate or --without-timedate was given.
if test "${with_timedate+set}" = set; then
withval="$with_timedate"
echo $ac_n "checking "for fraction"""... $ac_c" 1>&6
-echo "configure:5010: checking "for fraction"" >&5
+echo "configure:5043: checking "for fraction"" >&5
# Check whether --with-fraction or --without-fraction was given.
if test "${with_fraction+set}" = set; then
withval="$with_fraction"
echo $ac_n "checking "for constrains"""... $ac_c" 1>&6
-echo "configure:5040: checking "for constrains"" >&5
+echo "configure:5073: checking "for constrains"" >&5
# Check whether --with-constraints or --without-constraints was given.
if test "${with_constraints+set}" = set; then
withval="$with_constraints"
echo $ac_n "checking "for toolbar"""... $ac_c" 1>&6
-echo "configure:5070: checking "for toolbar"" >&5
+echo "configure:5103: checking "for toolbar"" >&5
# Check whether --with-toolbar or --without-toolbar was given.
if test "${with_toolbar+set}" = set; then
withval="$with_toolbar"
echo $ac_n "checking "for gauge"""... $ac_c" 1>&6
-echo "configure:5100: checking "for gauge"" >&5
+echo "configure:5133: checking "for gauge"" >&5
# Check whether --with-gauge or --without-gauge was given.
if test "${with_gauge+set}" = set; then
withval="$with_gauge"
echo $ac_n "checking "for vllist"""... $ac_c" 1>&6
-echo "configure:5130: checking "for vllist"" >&5
+echo "configure:5163: checking "for vllist"" >&5
# Check whether --with-vllist or --without-vllist was given.
if test "${with_vllist+set}" = set; then
withval="$with_vllist"
echo $ac_n "checking "for scrollbar"""... $ac_c" 1>&6
-echo "configure:5160: checking "for scrollbar"" >&5
+echo "configure:5193: checking "for scrollbar"" >&5
# Check whether --with-scrollbar or --without-scrollbar was given.
if test "${with_scrollbar+set}" = set; then
withval="$with_scrollbar"
echo $ac_n "checking "for docview"""... $ac_c" 1>&6
-echo "configure:5190: checking "for docview"" >&5
+echo "configure:5223: checking "for docview"" >&5
# Check whether --with-docview or --without-docview was given.
if test "${with_docview+set}" = set; then
withval="$with_docview"
echo $ac_n "checking "for printarch"""... $ac_c" 1>&6
-echo "configure:5220: checking "for printarch"" >&5
+echo "configure:5253: checking "for printarch"" >&5
# Check whether --with-printarch or --without-printarch was given.
if test "${with_printarch+set}" = set; then
withval="$with_printarch"
echo $ac_n "checking "for typetree"""... $ac_c" 1>&6
-echo "configure:5250: checking "for typetree"" >&5
+echo "configure:5283: checking "for typetree"" >&5
# Check whether --with-typetree or --without-typetree was given.
if test "${with_typetree+set}" = set; then
withval="$with_typetree"
echo $ac_n "checking "for wxgraph"""... $ac_c" 1>&6
-echo "configure:5280: checking "for wxgraph"" >&5
+echo "configure:5313: checking "for wxgraph"" >&5
# Check whether --with-wxgraph or --without-wxgraph was given.
if test "${with_wxgraph+set}" = set; then
withval="$with_wxgraph"
echo $ac_n "checking "for wxtree"""... $ac_c" 1>&6
-echo "configure:5310: checking "for wxtree"" >&5
+echo "configure:5343: checking "for wxtree"" >&5
# Check whether --with-wxtree or --without-wxtree was given.
if test "${with_wxtree+set}" = set; then
withval="$with_wxtree"
fi
+if test "$USE_WXCONFIG" = 1 ; then
+ cat >> confdefs.h <<EOF
+#define USE_WXCONFIG $USE_WXCONFIG
+EOF
+
+fi
+
METAFILE=NONE
if test "$USE_METAFILE" = 1 ; then
METAFILE="METAFILE"
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5756: checking for $ac_word" >&5
+echo "configure:5796: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
min_gtk_version=0.99.7
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:5787: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:5827: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG" != "no" ; then
GTK_CFLAGS=`$GTK_CONFIG --cflags`
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 5800 "configure"
+#line 5840 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:5822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
:
else
if test "$USE_OPENGL" = 1; then
echo $ac_n "checking for OpenGL includes""... $ac_c" 1>&6
-echo "configure:5873: checking for OpenGL includes" >&5
+echo "configure:5913: checking for OpenGL includes" >&5
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
OPENGL_INCLUDE="-I$ac_find_includes"
echo "$ac_t""found $ac_find_includes" 1>&6
echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
-echo "configure:5888: checking for OpenGL library" >&5
+echo "configure:5928: checking for OpenGL library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
DEFAULT_USE_THREADS_POSIX=0
DEFAULT_USE_OPENGL=0
+DEFAULT_USE_WXCONFIG=1
DEFAULT_USE_POSTSCRIPT=1
DEFAULT_USE_IPC=1
DEFAULT_USE_RESOURCES=1
**--with-postscript use postscript-device-context,
USE_POSTSCRIPT)
+AC_OVERRIDES(wxconfig, wxconfig,
+**--with-wxconfig use wxconfig,
+USE_WXCONFIG)
+
AC_OVERRIDES(metafile, metafile,
**--with-metafile use metafile,
USE_METAFILE)
fi
AC_SUBST(POSTSCRIPTDC)
+if test "$USE_WXCONFIG" = 1 ; then
+ AC_DEFINE_UNQUOTED(USE_WXCONFIG,$USE_WXCONFIG)
+fi
+
METAFILE=NONE
if test "$USE_METAFILE" = 1 ; then
METAFILE="METAFILE"
#include "wx/wx.h"
#endif
-#include "wx/tabctrl.h"
+#include "wx/notebook.h"
//----------------------------------------------------------------------
// class definitions
wxListBox *m_listbox;
wxTextCtrl *m_text;
- wxTabCtrl *m_tab;
+ wxNotebook *m_notebook;
DECLARE_EVENT_TABLE()
};
// MyPanel
//----------------------------------------------------------------------
-const MINIMAL_TAB = 1000;
+const ID_NOTEBOOK = 1000;
const ID_LISTBOX = 130;
const ID_LISTBOX_SEL_NUM = 131;
{
m_text = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,50), wxSize(100,50), wxTE_MULTILINE );
- m_tab = new wxTabCtrl( this, MINIMAL_TAB, wxPoint(0,0), wxSize(200,150) );
+ m_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) );
wxString choices[4] =
{
"wonderfull example."
};
- m_tab->InsertItem( 0, "wxList" );
- m_listbox = new wxListBox( m_tab, ID_LISTBOX, wxPoint(10,10), wxSize(120,70), 4, choices );
- (void)new wxButton( m_tab, ID_LISTBOX_SEL_NUM, "Select #2", wxPoint(140,30), wxSize(100,30) );
- (void)new wxButton( m_tab, ID_LISTBOX_SEL_STR, "Select 'This'", wxPoint(260,30), wxSize(100,30) );
- (void)new wxButton( m_tab, ID_LISTBOX_CLEAR, "Clear", wxPoint(140,80), wxSize(100,30) );
- (void)new wxButton( m_tab, ID_LISTBOX_APPEND, "Append 'Hi!'", wxPoint(260,80), wxSize(100,30) );
+ wxPanel *panel = m_notebook->CreatePage( 0, "wxList" );
- m_tab->InsertItem( 1, "wxChoice" );
+ m_listbox = new wxListBox( panel, ID_LISTBOX, wxPoint(10,10), wxSize(120,70), 4, choices );
+ (void)new wxButton( panel, ID_LISTBOX_SEL_NUM, "Select #2", wxPoint(140,30), wxSize(100,30) );
+ (void)new wxButton( panel, ID_LISTBOX_SEL_STR, "Select 'This'", wxPoint(260,30), wxSize(100,30) );
+ (void)new wxButton( panel, ID_LISTBOX_CLEAR, "Clear", wxPoint(140,80), wxSize(100,30) );
+ (void)new wxButton( panel, ID_LISTBOX_APPEND, "Append 'Hi!'", wxPoint(260,80), wxSize(100,30) );
+
+ m_notebook->CreatePage( 1, "wxChoice" );
}
void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) )
int y = 0;
GetClientSize( &x, &y );
- if (m_tab) m_tab->SetSize( 2, 2, x-4, y/2-4 );
+ if (m_notebook) m_notebook->SetSize( 2, 2, x-4, y/2-4 );
if (m_text) m_text->SetSize( 2, y/2+2, x-4, y/2-4 );
}
gtk/listbox.cpp \
gtk/mdi.cpp \
gtk/menu.cpp \
+ gtk/notebook.cpp \
gtk/palette.cpp \
gtk/pen.cpp \
gtk/radiobox.cpp \
gtk/statbox.cpp \
gtk/statbmp.cpp \
gtk/stattext.cpp \
- gtk/tabctrl.cpp \
gtk/tbargtk.cpp \
gtk/textctrl.cpp \
gtk/timer.cpp \
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: notebook.cpp
+// Purpose:
+// Author: Robert Roebling
+// Created: 01/02/97
+// Id:
+// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "notebook.h"
+#endif
+
+#include "wx/notebook.h"
+#include "wx/panel.h"
+#include "wx/utils.h"
+#include "wx/imaglist.h"
+
+//-----------------------------------------------------------------------------
+// wxNotebookPage
+//-----------------------------------------------------------------------------
+
+class wxNotebookPage: public wxObject
+{
+ public:
+
+ int m_id;
+ wxString m_text;
+ int m_image;
+ void *m_clientData;
+ GtkNotebookPage *m_page;
+ wxPanel *m_clientPanel;
+
+ wxNotebookPage(void)
+ {
+ m_id = -1;
+ m_text = "";
+ m_image = -1;
+ m_clientData = NULL;
+ m_page = NULL;
+ m_clientPanel = NULL;
+ };
+
+};
+
+//-----------------------------------------------------------------------------
+// wxNotebook
+//-----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxNotebook, wxControl)
+END_EVENT_TABLE()
+
+IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
+
+wxNotebook::wxNotebook(void)
+{
+ m_imageList = NULL;
+ m_frame = NULL;
+ m_pages.DeleteContents( TRUE );
+};
+
+wxNotebook::wxNotebook( wxWindow *parent, const wxWindowID id,
+ const wxPoint& pos, const wxSize& size,
+ const long style, const wxString& name )
+{
+ m_imageList = NULL;
+ m_frame = NULL;
+ m_pages.DeleteContents( TRUE );
+ Create( parent, id, pos, size, style, name );
+};
+
+wxNotebook::~wxNotebook(void)
+{
+ if (m_imageList) delete m_imageList;
+ DeleteAllPages();
+};
+
+bool wxNotebook::Create(wxWindow *parent, const wxWindowID id,
+ const wxPoint& pos, const wxSize& size,
+ const long style, const wxString& name )
+{
+ m_needParent = TRUE;
+
+ PreCreation( parent, id, pos, size, style, name );
+
+ m_widget = gtk_notebook_new();
+
+ PostCreation();
+
+ Show( TRUE );
+
+ return TRUE;
+};
+
+int wxNotebook::GetSelection(void) const
+{
+ if (m_pages.Number() == 0) return -1;
+
+ GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
+
+ wxNotebookPage *page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ page = (wxNotebookPage*)node->Data();
+ if (page->m_page == g_page) break;
+ node = node->Next();
+ };
+
+ if (!node) wxFatalError( "Notebook error." );
+
+ return page->m_id;
+};
+
+wxImageList* wxNotebook::GetImageList(void) const
+{
+ return m_imageList;
+};
+
+int wxNotebook::GetPageCount(void) const
+{
+ return m_pages.Number();
+};
+
+int wxNotebook::GetRowCount(void) const
+{
+ return 1;
+};
+
+wxString wxNotebook::GetPageText( const int page ) const
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return "";
+
+ return nb_page->m_text;
+};
+
+int wxNotebook::GetPageImage( const int page ) const
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return -1;
+
+ return nb_page->m_image;
+};
+
+void* wxNotebook::GetPageData( const int page ) const
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return NULL;
+
+ return nb_page->m_clientData;
+};
+
+int wxNotebook::SetSelection( const int page )
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return -1;
+
+ int page_num = 0;
+ GList *child = GTK_NOTEBOOK(m_widget)->children;
+ while (child)
+ {
+ if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
+ page_num++;
+ child = child->next;
+ };
+
+ if (!child) return -1;
+
+ gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );
+
+ return page;
+};
+
+void wxNotebook::SetImageList( wxImageList* imageList )
+{
+ m_imageList = imageList;
+};
+
+bool wxNotebook::SetPageText( const int page, const wxString &text )
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return FALSE;
+
+ nb_page->m_text = text;
+
+ // recreate
+
+ return TRUE;
+};
+
+bool wxNotebook::SetPageImage( const int page, const int image )
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return FALSE;
+
+ nb_page->m_image = image;
+
+ // recreate
+
+ return TRUE;
+};
+
+bool wxNotebook::SetPageData( const int page, void* data )
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return FALSE;
+
+ nb_page->m_clientData = data;
+
+ return TRUE;
+};
+
+void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
+{
+};
+
+void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
+{
+ // what's this ?
+};
+
+bool wxNotebook::DeleteAllPages(void)
+{
+ wxNode *page_node = m_pages.First();
+ while (page_node)
+ {
+ wxNotebookPage *page = (wxNotebookPage*)page_node->Data();
+
+ DeletePage( page->m_id );
+
+ page_node = m_pages.First();
+ };
+
+ return TRUE;
+};
+
+bool wxNotebook::DeletePage( const int page )
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return FALSE;
+
+ int page_num = 0;
+ GList *child = GTK_NOTEBOOK(m_widget)->children;
+ while (child)
+ {
+ if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
+ page_num++;
+ child = child->next;
+ };
+
+ if (!child) wxFatalError( "Notebook delete error" );;
+
+ gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
+
+ m_pages.DeleteObject( nb_page );
+
+ return TRUE;
+};
+
+wxPanel *wxNotebook::CreatePage( const int item, const wxString &text, const int imageId, void* data )
+{
+ wxNotebookPage *page = new wxNotebookPage;
+
+ page->m_text = text;
+ if (page->m_text.IsNull()) page->m_text = "";
+ page->m_id = item;
+ page->m_image = imageId;
+ page->m_clientData = data;
+
+ m_frame = gtk_label_new( page->m_text );
+ gtk_misc_set_alignment( GTK_MISC(m_frame), 0.0, 0.5 );
+
+ page->m_clientPanel = new wxPanel( this, -1, wxPoint(0,0), wxSize(100,100) );
+
+ m_frame = NULL;
+
+ page->m_page = GTK_NOTEBOOK(m_widget)->cur_page;
+
+ m_pages.Append( page );
+
+ return page->m_clientPanel;
+};
+
+wxPanel *wxNotebook::GetPanel( const int page )
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return NULL;
+
+ return nb_page->m_clientPanel;
+};
+
+void wxNotebook::AddChild( wxWindow *win )
+{
+ if (!m_frame) wxFatalError( "Notebook::Addchild() must not be called directly." );
+
+ gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, m_frame );
+};
+
+//-----------------------------------------------------------------------------
+// wxTabEvent
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxCommandEvent)
+
+wxTabEvent::wxTabEvent( WXTYPE commandType, int id ) :
+ wxCommandEvent(commandType, id)
+{
+};
+
+++ /dev/null
-# Makefile for Autoconf.
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
-
-# 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, 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.
-
-#### Start of system configuration section. ####
-
-GLOBAL_LIB_DIR = $(WXBASEDIR)/lib/$(OS)
-GLOBAL_BIN_DIR = $(WXBASEDIR)/bin/$(OS)
-
-# define toolkit to use
-TOOLKIT_DEF = -D__GTK__
-
-# general compiler stuff
-OPTIMISE = -O2
-PROFILE =
-DEBUG =
-
-# c-compiler stuff
-CC = gcc
-CFLAGS = -Wall $(OPTIMISE) $(PROFILE) $(DEBUG)
-CPP = gcc -E
-
-# c++-compiler stuff
-CXX = c++
-CXXFLAGS = -Wall $(OPTIMISE) $(PROFILE) $(DEBUG)
-CXXCPP = c++ -E
-
-# shared compile stuff
-PICFLAGS =
-CREATE_SHARED =
-
-# other stuff
-RM = rm -f
-LEX = flex
-LEXLIB = -lfl
-YACC = bison -y
-RANLIB = ranlib
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA = ${INSTALL} -m 644
-AWK = mawk
-LN_S = ln -s
-CJPEG_PROG =
-CONVERT_PATH = /usr/bin/X11
-CONVERT_PROG = /usr/bin/X11/convert
-DJPEG_PROG =
-GIFTOPNM_PROG =
-NETPBM_PATH =
-
-prefix = /usr/local
-exec_prefix = ${prefix}
-
-# Directory in which to install scripts.
-#bindir = ${exec_prefix}/bin
-
-# Directory in which to install library files.
-datadir = ${prefix}/share
-acdatadir = $(datadir)/autoconf
-
-# Directory in which to install documentation info files.
-infodir = ${prefix}/info
-
-X_CFLAGS = -I/usr/X11R6/include
-X_LIBS = -L/usr/X11R6/lib
-X_EXTRA_LIBS =
-X_PRE_LIBS = -lSM -lICE
-
-GUI_TK_INCLUDE = -I/usr/local/lib/glib/include -I/usr/local/include -I/usr/X11R6/include
-GUI_TK_LIBRARY = -L/usr/local/lib -L/usr/X11R6/lib -lgtk -lgdk -lglib -lXext -lX11 -lm
-GUI_TK_LINK =
-
-OPENGL_INCLUDE =
-OPENGL_LIBRARY =
-OPENGL_LINK =
-
-THREADS_LINK =
-
-# INCLUDES
-WX_INCLUDES = \
-$(TOOLKIT_DEF) \
--I. \
--I.. \
--I$(WXBASEDIR)/include \
--I$(WXBASEDIR)/src/png \
--I$(WXBASEDIR)/src/zlib \
--I$(WXBASEDIR)/src/gdk_imlib \
-$(GUI_TK_INCLUDE) \
-$(OPENGL_INCLUDE) \
-$(X_CFLAGS)
-
-WX_LIBS = -L$(GLOBAL_LIB_DIR) -lwx_gtk
-
-OPENGL_LIBS = $(OPENGL_LIBRARY) $(OPENGL_LINK)
-
-GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK)
-
-LINK = $(CXX) -o $@
-LINK_LIBS= \
- $(WX_LIBS) \
- $(GUI_TK_LIBS) \
- $(X_EXTRA_LIBS) \
- $(X_PRE_LIBS)
-
-# $(X_LIBS) -lX11 -lXext -lm gtk-config does this for me
-
-# Don't include $(OPENGL_LIBS) or $(THREADS_LINK) in LINK_LIBS; they
-# can be conveniently added to BIN_LINK in Makefile.in.
-
-#### End of system configuration section. ####
+++ /dev/null
-s|@OS@|linux|g
-s|@WXBASEDIR@|/home/karl/cvs/wxWindows|g
-s|@PROFILE@||g
-s|@DEBUG@||g
-s|@OPTIMISE@|-O2 |g
-s|@CC@|gcc|g
-s|@CFLAGS@| -Wall|g
-s|@CPP@|gcc -E|g
-s|@CXX@|c++|g
-s|@CXXFLAGS@| -Wall|g
-s|@CXXCPP@|c++ -E|g
-s|@PICFLAGS@||g
-s|@CREATE_SHARED@||g
-s|@LEX@|flex|g
-s|@LEXLIB@|-lfl|g
-s|@YACC@|bison -y|g
-s|@RANLIB@|ranlib|g
-s|@INSTALL@|/usr/bin/install -c|g
-s|@INSTALL_PROGRAM@|${INSTALL}|g
-s|@INSTALL_DATA@|${INSTALL} -m 644|g
-s|@AWK@|mawk|g
-s|@LN_S@|ln -s|g
-s|@prefix@|/usr/local|g
-s|@exec_prefix@|${prefix}|g
-s|@bindir@|${exec_prefix}/bin|g
-s|@datadir@|${prefix}/share|g
-s|@infodir@|${prefix}/info|g
-s|@X_CFLAGS@| -I/usr/X11R6/include|g
-s|@X_LIBS@| -L/usr/X11R6/lib|g
-s|@X_EXTRA_LIBS@||g
-s|@X_PRE_LIBS@| -lSM -lICE|g
-s|@GUI_TK_INCLUDE@|-I/usr/local/lib/glib/include -I/usr/local/include -I/usr/X11R6/include|g
-s|@GUI_TK_LIBRARY@|-L/usr/local/lib -L/usr/X11R6/lib -lgtk -lgdk -lglib -lXext -lX11 -lm|g
-s|@GUI_TK_LINK@||g
-s|@OPENGL_INCLUDE@||g
-s|@OPENGL_LIBRARY@||g
-s|@OPENGL_LINK@||g
-s|@TOOLKIT@|GTK|g
-s|@TOOLKIT_DEF@|__GTK__|g
-s|@THREADS@|NONE|g
-s|@THREADS_LINK@||g
-s|@WXSTRING@|@WXSTRING@|g
-s|@TYPETREE@|NONE|g
-s|@METAFILE@|NONE|g
-s|@POSTSCRIPTDC@|POSTSCRIPTDC|g
-s|@WXGRAPH@|NONE|g
-s|@WXTREE@|NONE|g
-s|@DOCVIEW@|DOCVIEW|g
-s|@FORM@|NONE|g
-s|@PRINTPREVIEW@|PRINTPREVIEW|g
-s|@IPC@|IPC|g
-s|@HELP@|NONE|g
-s|@CLIPBOARD@|NONE|g
-s|@TIMEDATE@|TIMEDATE|g
-s|@FRACTION@|FRACTION|g
-s|@PROLOGIO@|NONE|g
-s|@PROLOGIOSRC@|NONE|g
-s|@ENHDIALOGBOX@|NONE|g
-s|@GAUGE@|GAUGE|g
-s|@GLCANVAS@|NONE|g
-s|@LAYOUT@|@LAYOUT@|g
-s|@WXRESOURCES@|WXRESOURCES|g
-s|@XRESOURCES@|XRESOURCES|g
-s|@SCROLLBAR@|SCROLLBAR|g
-s|@STATICITEMS@|@STATICITEMS@|g
-s|@TOOLBAR@|TOOLBAR|g
-s|@CONSTRAINTS@|CONSTRAINTS|g
-s|@RPC@|NONE|g
-s|@VIRLISTBOX@|NONE|g
-
* Use PostScript device context
*/
#undef USE_POSTSCRIPT
+/*
+ * Use wxConfig system
+ */
+#undef USE_WXCONFIG
/*
* Use the print/preview architecture
*/
+++ /dev/null
-/////////////////////////////////////////////////////////////////////////////
-// Name: tabctrl.cpp
-// Purpose:
-// Author: Robert Roebling
-// Created: 01/02/97
-// Id:
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "tabctrl.h"
-#endif
-
-#include "wx/tabctrl.h"
-#include "wx/utils.h"
-#include "wx/imaglist.h"
-
-#include "wx/gtk/win_gtk.h"
-
-//-----------------------------------------------------------------------------
-// wxTabPage
-//-----------------------------------------------------------------------------
-
-class wxTabPage: public wxObject
-{
- public:
-
- int m_id;
- wxString m_text;
- int m_image;
- void *m_clientData;
- GtkNotebookPage *m_page;
- GtkWidget *m_wxwindow;
- wxList m_children;
-
- wxTabPage(void)
- {
- m_id = -1;
- m_text = "";
- m_image = -1;
- m_clientData = NULL;
- m_page = NULL;
- m_wxwindow = NULL;
- };
-
-};
-
-//-----------------------------------------------------------------------------
-// wxTabCtrl
-//-----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
-END_EVENT_TABLE()
-
-IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl,wxControl)
-
-wxTabCtrl::wxTabCtrl(void)
-{
- m_imageList = NULL;
- m_pages.DeleteContents( TRUE );
-};
-
-wxTabCtrl::wxTabCtrl( wxWindow *parent, const wxWindowID id,
- const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
-{
- m_imageList = NULL;
- m_pages.DeleteContents( TRUE );
- Create( parent, id, pos, size, style, name );
-};
-
-wxTabCtrl::~wxTabCtrl(void)
-{
- if (m_imageList) delete m_imageList;
- DeleteAllItems();
-};
-
-bool wxTabCtrl::Create(wxWindow *parent, const wxWindowID id,
- const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
-{
- m_needParent = TRUE;
-
- PreCreation( parent, id, pos, size, style, name );
-
- m_widget = gtk_notebook_new();
-
- PostCreation();
-
- Show( TRUE );
-
- return TRUE;
-};
-
-int wxTabCtrl::GetSelection(void) const
-{
- return gtk_notebook_current_page( GTK_NOTEBOOK(m_widget) );
-};
-
-wxImageList* wxTabCtrl::GetImageList(void) const
-{
- return m_imageList;
-};
-
-int wxTabCtrl::GetItemCount(void) const
-{
- return m_pages.Number();
-};
-
-bool wxTabCtrl::GetItemRect( const int WXUNUSED(item), wxRect& WXUNUSED(rect) ) const
-{
- return FALSE;
-};
-
-int wxTabCtrl::GetRowCount(void) const
-{
- return 1;
-};
-
-wxString wxTabCtrl::GetItemText( const int item ) const
-{
- wxNode *node = m_pages.Nth( item );
- if (node)
- {
- wxTabPage *page = (wxTabPage*)node->Data();
- return page->m_text;
- };
- return "";
-};
-
-int wxTabCtrl::GetItemImage( const int item ) const
-{
- wxNode *node = m_pages.Nth( item );
- if (node)
- {
- wxTabPage *page = (wxTabPage*)node->Data();
- return page->m_image;
- };
- return -1;
-};
-
-void* wxTabCtrl::GetItemData( const int item ) const
-{
- wxNode *node = m_pages.Nth( item );
- if (node)
- {
- wxTabPage *page = (wxTabPage*)node->Data();
- return page->m_clientData;
- };
- return NULL;
-};
-
-int wxTabCtrl::SetSelection( const int item )
-{
- wxTabPage *page = NULL;
-
- wxNode *node = m_pages.First();
- while (node)
- {
- page = (wxTabPage*)node->Data();
- if (page->m_id == item) break;
- page = NULL;
- node = node->Next();
- };
- if (!page) return -1;
-
- int page_num = 0;
- GList *child = GTK_NOTEBOOK(m_widget)->children;
- while (child)
- {
- if (page->m_page == (GtkNotebookPage*)child->data) break;
- page_num++;
- child = child->next;
- };
-
- if (!child) return -1;
-
- gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );
-
- return item;
-};
-
-void wxTabCtrl::SetImageList( wxImageList* imageList )
-{
- m_imageList = imageList;
-};
-
-bool wxTabCtrl::SetItemText( const int WXUNUSED(item), const wxString& WXUNUSED(text) )
-{
- return TRUE;
-};
-
-bool wxTabCtrl::SetItemImage( const int WXUNUSED(item), const int WXUNUSED(image) )
-{
- return TRUE;
-};
-
-bool wxTabCtrl::SetItemData( const int WXUNUSED(item), void* WXUNUSED(data) )
-{
- return TRUE;
-};
-
-void wxTabCtrl::SetItemSize( const wxSize &WXUNUSED(size) )
-{
-};
-
-void wxTabCtrl::SetPadding( const wxSize &WXUNUSED(padding) )
-{
-};
-
-bool wxTabCtrl::DeleteAllItems(void)
-{
- wxNode *page_node = m_pages.First();
- while (page_node)
- {
- wxTabPage *page = (wxTabPage*)page_node->Data();
-
- wxNode *node = page->m_children.First();
- while (node)
- {
- wxWindow *child = (wxWindow*)node->Data();
- delete child;
-
- node = node->Next();
- };
-
- gtk_widget_destroy( page->m_wxwindow );
-
- m_pages.DeleteObject( page );
-
- page_node = m_pages.First();
- };
-
- return TRUE;
-};
-
-bool wxTabCtrl::DeleteItem( const int item )
-{
- wxTabPage *page = NULL;
-
- wxNode *node = m_pages.First();
- while (node)
- {
- page = (wxTabPage*)node->Data();
- if (page->m_id == item) break;
- node = node->Next();
- };
- if (!node) return FALSE;
-
- node = page->m_children.First();
- while (node)
- {
- wxWindow *child = (wxWindow*)node->Data();
- delete child;
-
- node = node->Next();
- };
-
- gtk_widget_destroy( page->m_wxwindow );
-
- m_pages.DeleteObject( page );
-
- return TRUE;
-};
-
-int wxTabCtrl::HitTest( const wxPoint &WXUNUSED(pt), long &WXUNUSED(flags) )
-{
- return wxTAB_HITTEST_NOWHERE;
-};
-
-int wxTabCtrl::InsertItem( const int item, const wxString &text, const int imageId, void* data )
-{
- wxTabPage *page = new wxTabPage;
-
- page->m_text = text;
- if (page->m_text.IsNull()) page->m_text = "";
- page->m_id = item;
- page->m_image = imageId;
- page->m_clientData = data;
-
- GtkWidget *label_widget = gtk_label_new( page->m_text );
- gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
-
- page->m_wxwindow = gtk_myfixed_new();
- gtk_widget_show( page->m_wxwindow );
- gtk_widget_set_usize( page->m_wxwindow, 100, 100 );
-
- gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), page->m_wxwindow, label_widget );
-
- page->m_page = GTK_NOTEBOOK(m_widget)->cur_page;
-
- m_pages.Append( page );
-
- return item;
-};
-
-void wxTabCtrl::AddChild( wxWindow *win )
-{
- GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
-
- wxTabPage *page = NULL;
-
- wxNode *node = m_pages.First();
- while (node)
- {
- page = (wxTabPage*)node->Data();
- if (page->m_page == g_page) break;
- node = node->Next();
- };
-
- if (!page) wxFatalError( "wxTabCtrl error" );
-
- gtk_myfixed_put( GTK_MYFIXED(page->m_wxwindow), win->m_widget, win->m_x, win->m_y );
- gtk_widget_set_usize( win->m_widget, win->m_width, win->m_height );
-
- page->m_children.Append( win );
-};
-
-//-----------------------------------------------------------------------------
-// wxTabEvent
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxCommandEvent)
-
-wxTabEvent::wxTabEvent( WXTYPE commandType, int id ) :
- wxCommandEvent(commandType, id)
-{
-};
\ No newline at end of file
#include "wx/dcclient.h"
#include "wx/dnd.h"
#include "wx/mdi.h"
-#include "wx/tabctrl.h"
+#include "wx/notebook.h"
#include "gdk/gdkkeysyms.h"
#include <math.h>
#include "wx/gtk/win_gtk.h"
};
};
- if (IsKindOf(CLASSINFO(wxTabCtrl)))
+ if (IsKindOf(CLASSINFO(wxNotebook)))
{
- wxTabCtrl *tab = (wxTabCtrl*)this;
+ wxNotebook *tab = (wxNotebook*)this;
tab->AddChild( child );
return;
};
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: notebook.cpp
+// Purpose:
+// Author: Robert Roebling
+// Created: 01/02/97
+// Id:
+// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "notebook.h"
+#endif
+
+#include "wx/notebook.h"
+#include "wx/panel.h"
+#include "wx/utils.h"
+#include "wx/imaglist.h"
+
+//-----------------------------------------------------------------------------
+// wxNotebookPage
+//-----------------------------------------------------------------------------
+
+class wxNotebookPage: public wxObject
+{
+ public:
+
+ int m_id;
+ wxString m_text;
+ int m_image;
+ void *m_clientData;
+ GtkNotebookPage *m_page;
+ wxPanel *m_clientPanel;
+
+ wxNotebookPage(void)
+ {
+ m_id = -1;
+ m_text = "";
+ m_image = -1;
+ m_clientData = NULL;
+ m_page = NULL;
+ m_clientPanel = NULL;
+ };
+
+};
+
+//-----------------------------------------------------------------------------
+// wxNotebook
+//-----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxNotebook, wxControl)
+END_EVENT_TABLE()
+
+IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
+
+wxNotebook::wxNotebook(void)
+{
+ m_imageList = NULL;
+ m_frame = NULL;
+ m_pages.DeleteContents( TRUE );
+};
+
+wxNotebook::wxNotebook( wxWindow *parent, const wxWindowID id,
+ const wxPoint& pos, const wxSize& size,
+ const long style, const wxString& name )
+{
+ m_imageList = NULL;
+ m_frame = NULL;
+ m_pages.DeleteContents( TRUE );
+ Create( parent, id, pos, size, style, name );
+};
+
+wxNotebook::~wxNotebook(void)
+{
+ if (m_imageList) delete m_imageList;
+ DeleteAllPages();
+};
+
+bool wxNotebook::Create(wxWindow *parent, const wxWindowID id,
+ const wxPoint& pos, const wxSize& size,
+ const long style, const wxString& name )
+{
+ m_needParent = TRUE;
+
+ PreCreation( parent, id, pos, size, style, name );
+
+ m_widget = gtk_notebook_new();
+
+ PostCreation();
+
+ Show( TRUE );
+
+ return TRUE;
+};
+
+int wxNotebook::GetSelection(void) const
+{
+ if (m_pages.Number() == 0) return -1;
+
+ GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
+
+ wxNotebookPage *page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ page = (wxNotebookPage*)node->Data();
+ if (page->m_page == g_page) break;
+ node = node->Next();
+ };
+
+ if (!node) wxFatalError( "Notebook error." );
+
+ return page->m_id;
+};
+
+wxImageList* wxNotebook::GetImageList(void) const
+{
+ return m_imageList;
+};
+
+int wxNotebook::GetPageCount(void) const
+{
+ return m_pages.Number();
+};
+
+int wxNotebook::GetRowCount(void) const
+{
+ return 1;
+};
+
+wxString wxNotebook::GetPageText( const int page ) const
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return "";
+
+ return nb_page->m_text;
+};
+
+int wxNotebook::GetPageImage( const int page ) const
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return -1;
+
+ return nb_page->m_image;
+};
+
+void* wxNotebook::GetPageData( const int page ) const
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return NULL;
+
+ return nb_page->m_clientData;
+};
+
+int wxNotebook::SetSelection( const int page )
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return -1;
+
+ int page_num = 0;
+ GList *child = GTK_NOTEBOOK(m_widget)->children;
+ while (child)
+ {
+ if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
+ page_num++;
+ child = child->next;
+ };
+
+ if (!child) return -1;
+
+ gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );
+
+ return page;
+};
+
+void wxNotebook::SetImageList( wxImageList* imageList )
+{
+ m_imageList = imageList;
+};
+
+bool wxNotebook::SetPageText( const int page, const wxString &text )
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return FALSE;
+
+ nb_page->m_text = text;
+
+ // recreate
+
+ return TRUE;
+};
+
+bool wxNotebook::SetPageImage( const int page, const int image )
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return FALSE;
+
+ nb_page->m_image = image;
+
+ // recreate
+
+ return TRUE;
+};
+
+bool wxNotebook::SetPageData( const int page, void* data )
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return FALSE;
+
+ nb_page->m_clientData = data;
+
+ return TRUE;
+};
+
+void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
+{
+};
+
+void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
+{
+ // what's this ?
+};
+
+bool wxNotebook::DeleteAllPages(void)
+{
+ wxNode *page_node = m_pages.First();
+ while (page_node)
+ {
+ wxNotebookPage *page = (wxNotebookPage*)page_node->Data();
+
+ DeletePage( page->m_id );
+
+ page_node = m_pages.First();
+ };
+
+ return TRUE;
+};
+
+bool wxNotebook::DeletePage( const int page )
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return FALSE;
+
+ int page_num = 0;
+ GList *child = GTK_NOTEBOOK(m_widget)->children;
+ while (child)
+ {
+ if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
+ page_num++;
+ child = child->next;
+ };
+
+ if (!child) wxFatalError( "Notebook delete error" );;
+
+ gtk_notebook_remove_page( GTK_NOTEBOOK(m_widget), page_num );
+
+ m_pages.DeleteObject( nb_page );
+
+ return TRUE;
+};
+
+wxPanel *wxNotebook::CreatePage( const int item, const wxString &text, const int imageId, void* data )
+{
+ wxNotebookPage *page = new wxNotebookPage;
+
+ page->m_text = text;
+ if (page->m_text.IsNull()) page->m_text = "";
+ page->m_id = item;
+ page->m_image = imageId;
+ page->m_clientData = data;
+
+ m_frame = gtk_label_new( page->m_text );
+ gtk_misc_set_alignment( GTK_MISC(m_frame), 0.0, 0.5 );
+
+ page->m_clientPanel = new wxPanel( this, -1, wxPoint(0,0), wxSize(100,100) );
+
+ m_frame = NULL;
+
+ page->m_page = GTK_NOTEBOOK(m_widget)->cur_page;
+
+ m_pages.Append( page );
+
+ return page->m_clientPanel;
+};
+
+wxPanel *wxNotebook::GetPanel( const int page )
+{
+ wxNotebookPage *nb_page = NULL;
+
+ wxNode *node = m_pages.First();
+ while (node)
+ {
+ nb_page = (wxNotebookPage*)node->Data();
+ if (nb_page->m_id == page) break;
+ node = node->Next();
+ };
+ if (!node) return NULL;
+
+ return nb_page->m_clientPanel;
+};
+
+void wxNotebook::AddChild( wxWindow *win )
+{
+ if (!m_frame) wxFatalError( "Notebook::Addchild() must not be called directly." );
+
+ gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, m_frame );
+};
+
+//-----------------------------------------------------------------------------
+// wxTabEvent
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxCommandEvent)
+
+wxTabEvent::wxTabEvent( WXTYPE commandType, int id ) :
+ wxCommandEvent(commandType, id)
+{
+};
+
+++ /dev/null
-# Makefile for Autoconf.
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
-
-# 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, 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.
-
-#### Start of system configuration section. ####
-
-GLOBAL_LIB_DIR = $(WXBASEDIR)/lib/$(OS)
-GLOBAL_BIN_DIR = $(WXBASEDIR)/bin/$(OS)
-
-# define toolkit to use
-TOOLKIT_DEF = -D__GTK__
-
-# general compiler stuff
-OPTIMISE = -O2
-PROFILE =
-DEBUG =
-
-# c-compiler stuff
-CC = gcc
-CFLAGS = -Wall $(OPTIMISE) $(PROFILE) $(DEBUG)
-CPP = gcc -E
-
-# c++-compiler stuff
-CXX = c++
-CXXFLAGS = -Wall $(OPTIMISE) $(PROFILE) $(DEBUG)
-CXXCPP = c++ -E
-
-# shared compile stuff
-PICFLAGS =
-CREATE_SHARED =
-
-# other stuff
-RM = rm -f
-LEX = flex
-LEXLIB = -lfl
-YACC = bison -y
-RANLIB = ranlib
-INSTALL = /usr/bin/install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA = ${INSTALL} -m 644
-AWK = mawk
-LN_S = ln -s
-CJPEG_PROG =
-CONVERT_PATH = /usr/bin/X11
-CONVERT_PROG = /usr/bin/X11/convert
-DJPEG_PROG =
-GIFTOPNM_PROG =
-NETPBM_PATH =
-
-prefix = /usr/local
-exec_prefix = ${prefix}
-
-# Directory in which to install scripts.
-#bindir = ${exec_prefix}/bin
-
-# Directory in which to install library files.
-datadir = ${prefix}/share
-acdatadir = $(datadir)/autoconf
-
-# Directory in which to install documentation info files.
-infodir = ${prefix}/info
-
-X_CFLAGS = -I/usr/X11R6/include
-X_LIBS = -L/usr/X11R6/lib
-X_EXTRA_LIBS =
-X_PRE_LIBS = -lSM -lICE
-
-GUI_TK_INCLUDE = -I/usr/local/lib/glib/include -I/usr/local/include -I/usr/X11R6/include
-GUI_TK_LIBRARY = -L/usr/local/lib -L/usr/X11R6/lib -lgtk -lgdk -lglib -lXext -lX11 -lm
-GUI_TK_LINK =
-
-OPENGL_INCLUDE =
-OPENGL_LIBRARY =
-OPENGL_LINK =
-
-THREADS_LINK =
-
-# INCLUDES
-WX_INCLUDES = \
-$(TOOLKIT_DEF) \
--I. \
--I.. \
--I$(WXBASEDIR)/include \
--I$(WXBASEDIR)/src/png \
--I$(WXBASEDIR)/src/zlib \
--I$(WXBASEDIR)/src/gdk_imlib \
-$(GUI_TK_INCLUDE) \
-$(OPENGL_INCLUDE) \
-$(X_CFLAGS)
-
-WX_LIBS = -L$(GLOBAL_LIB_DIR) -lwx_gtk
-
-OPENGL_LIBS = $(OPENGL_LIBRARY) $(OPENGL_LINK)
-
-GUI_TK_LIBS = $(GUI_TK_LIBRARY) $(GUI_TK_LINK)
-
-LINK = $(CXX) -o $@
-LINK_LIBS= \
- $(WX_LIBS) \
- $(GUI_TK_LIBS) \
- $(X_EXTRA_LIBS) \
- $(X_PRE_LIBS)
-
-# $(X_LIBS) -lX11 -lXext -lm gtk-config does this for me
-
-# Don't include $(OPENGL_LIBS) or $(THREADS_LINK) in LINK_LIBS; they
-# can be conveniently added to BIN_LINK in Makefile.in.
-
-#### End of system configuration section. ####
+++ /dev/null
-s|@OS@|linux|g
-s|@WXBASEDIR@|/home/karl/cvs/wxWindows|g
-s|@PROFILE@||g
-s|@DEBUG@||g
-s|@OPTIMISE@|-O2 |g
-s|@CC@|gcc|g
-s|@CFLAGS@| -Wall|g
-s|@CPP@|gcc -E|g
-s|@CXX@|c++|g
-s|@CXXFLAGS@| -Wall|g
-s|@CXXCPP@|c++ -E|g
-s|@PICFLAGS@||g
-s|@CREATE_SHARED@||g
-s|@LEX@|flex|g
-s|@LEXLIB@|-lfl|g
-s|@YACC@|bison -y|g
-s|@RANLIB@|ranlib|g
-s|@INSTALL@|/usr/bin/install -c|g
-s|@INSTALL_PROGRAM@|${INSTALL}|g
-s|@INSTALL_DATA@|${INSTALL} -m 644|g
-s|@AWK@|mawk|g
-s|@LN_S@|ln -s|g
-s|@prefix@|/usr/local|g
-s|@exec_prefix@|${prefix}|g
-s|@bindir@|${exec_prefix}/bin|g
-s|@datadir@|${prefix}/share|g
-s|@infodir@|${prefix}/info|g
-s|@X_CFLAGS@| -I/usr/X11R6/include|g
-s|@X_LIBS@| -L/usr/X11R6/lib|g
-s|@X_EXTRA_LIBS@||g
-s|@X_PRE_LIBS@| -lSM -lICE|g
-s|@GUI_TK_INCLUDE@|-I/usr/local/lib/glib/include -I/usr/local/include -I/usr/X11R6/include|g
-s|@GUI_TK_LIBRARY@|-L/usr/local/lib -L/usr/X11R6/lib -lgtk -lgdk -lglib -lXext -lX11 -lm|g
-s|@GUI_TK_LINK@||g
-s|@OPENGL_INCLUDE@||g
-s|@OPENGL_LIBRARY@||g
-s|@OPENGL_LINK@||g
-s|@TOOLKIT@|GTK|g
-s|@TOOLKIT_DEF@|__GTK__|g
-s|@THREADS@|NONE|g
-s|@THREADS_LINK@||g
-s|@WXSTRING@|@WXSTRING@|g
-s|@TYPETREE@|NONE|g
-s|@METAFILE@|NONE|g
-s|@POSTSCRIPTDC@|POSTSCRIPTDC|g
-s|@WXGRAPH@|NONE|g
-s|@WXTREE@|NONE|g
-s|@DOCVIEW@|DOCVIEW|g
-s|@FORM@|NONE|g
-s|@PRINTPREVIEW@|PRINTPREVIEW|g
-s|@IPC@|IPC|g
-s|@HELP@|NONE|g
-s|@CLIPBOARD@|NONE|g
-s|@TIMEDATE@|TIMEDATE|g
-s|@FRACTION@|FRACTION|g
-s|@PROLOGIO@|NONE|g
-s|@PROLOGIOSRC@|NONE|g
-s|@ENHDIALOGBOX@|NONE|g
-s|@GAUGE@|GAUGE|g
-s|@GLCANVAS@|NONE|g
-s|@LAYOUT@|@LAYOUT@|g
-s|@WXRESOURCES@|WXRESOURCES|g
-s|@XRESOURCES@|XRESOURCES|g
-s|@SCROLLBAR@|SCROLLBAR|g
-s|@STATICITEMS@|@STATICITEMS@|g
-s|@TOOLBAR@|TOOLBAR|g
-s|@CONSTRAINTS@|CONSTRAINTS|g
-s|@RPC@|NONE|g
-s|@VIRLISTBOX@|NONE|g
-
* Use PostScript device context
*/
#undef USE_POSTSCRIPT
+/*
+ * Use wxConfig system
+ */
+#undef USE_WXCONFIG
/*
* Use the print/preview architecture
*/
+++ /dev/null
-/////////////////////////////////////////////////////////////////////////////
-// Name: tabctrl.cpp
-// Purpose:
-// Author: Robert Roebling
-// Created: 01/02/97
-// Id:
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "tabctrl.h"
-#endif
-
-#include "wx/tabctrl.h"
-#include "wx/utils.h"
-#include "wx/imaglist.h"
-
-#include "wx/gtk/win_gtk.h"
-
-//-----------------------------------------------------------------------------
-// wxTabPage
-//-----------------------------------------------------------------------------
-
-class wxTabPage: public wxObject
-{
- public:
-
- int m_id;
- wxString m_text;
- int m_image;
- void *m_clientData;
- GtkNotebookPage *m_page;
- GtkWidget *m_wxwindow;
- wxList m_children;
-
- wxTabPage(void)
- {
- m_id = -1;
- m_text = "";
- m_image = -1;
- m_clientData = NULL;
- m_page = NULL;
- m_wxwindow = NULL;
- };
-
-};
-
-//-----------------------------------------------------------------------------
-// wxTabCtrl
-//-----------------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
-END_EVENT_TABLE()
-
-IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl,wxControl)
-
-wxTabCtrl::wxTabCtrl(void)
-{
- m_imageList = NULL;
- m_pages.DeleteContents( TRUE );
-};
-
-wxTabCtrl::wxTabCtrl( wxWindow *parent, const wxWindowID id,
- const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
-{
- m_imageList = NULL;
- m_pages.DeleteContents( TRUE );
- Create( parent, id, pos, size, style, name );
-};
-
-wxTabCtrl::~wxTabCtrl(void)
-{
- if (m_imageList) delete m_imageList;
- DeleteAllItems();
-};
-
-bool wxTabCtrl::Create(wxWindow *parent, const wxWindowID id,
- const wxPoint& pos, const wxSize& size,
- const long style, const wxString& name )
-{
- m_needParent = TRUE;
-
- PreCreation( parent, id, pos, size, style, name );
-
- m_widget = gtk_notebook_new();
-
- PostCreation();
-
- Show( TRUE );
-
- return TRUE;
-};
-
-int wxTabCtrl::GetSelection(void) const
-{
- return gtk_notebook_current_page( GTK_NOTEBOOK(m_widget) );
-};
-
-wxImageList* wxTabCtrl::GetImageList(void) const
-{
- return m_imageList;
-};
-
-int wxTabCtrl::GetItemCount(void) const
-{
- return m_pages.Number();
-};
-
-bool wxTabCtrl::GetItemRect( const int WXUNUSED(item), wxRect& WXUNUSED(rect) ) const
-{
- return FALSE;
-};
-
-int wxTabCtrl::GetRowCount(void) const
-{
- return 1;
-};
-
-wxString wxTabCtrl::GetItemText( const int item ) const
-{
- wxNode *node = m_pages.Nth( item );
- if (node)
- {
- wxTabPage *page = (wxTabPage*)node->Data();
- return page->m_text;
- };
- return "";
-};
-
-int wxTabCtrl::GetItemImage( const int item ) const
-{
- wxNode *node = m_pages.Nth( item );
- if (node)
- {
- wxTabPage *page = (wxTabPage*)node->Data();
- return page->m_image;
- };
- return -1;
-};
-
-void* wxTabCtrl::GetItemData( const int item ) const
-{
- wxNode *node = m_pages.Nth( item );
- if (node)
- {
- wxTabPage *page = (wxTabPage*)node->Data();
- return page->m_clientData;
- };
- return NULL;
-};
-
-int wxTabCtrl::SetSelection( const int item )
-{
- wxTabPage *page = NULL;
-
- wxNode *node = m_pages.First();
- while (node)
- {
- page = (wxTabPage*)node->Data();
- if (page->m_id == item) break;
- page = NULL;
- node = node->Next();
- };
- if (!page) return -1;
-
- int page_num = 0;
- GList *child = GTK_NOTEBOOK(m_widget)->children;
- while (child)
- {
- if (page->m_page == (GtkNotebookPage*)child->data) break;
- page_num++;
- child = child->next;
- };
-
- if (!child) return -1;
-
- gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );
-
- return item;
-};
-
-void wxTabCtrl::SetImageList( wxImageList* imageList )
-{
- m_imageList = imageList;
-};
-
-bool wxTabCtrl::SetItemText( const int WXUNUSED(item), const wxString& WXUNUSED(text) )
-{
- return TRUE;
-};
-
-bool wxTabCtrl::SetItemImage( const int WXUNUSED(item), const int WXUNUSED(image) )
-{
- return TRUE;
-};
-
-bool wxTabCtrl::SetItemData( const int WXUNUSED(item), void* WXUNUSED(data) )
-{
- return TRUE;
-};
-
-void wxTabCtrl::SetItemSize( const wxSize &WXUNUSED(size) )
-{
-};
-
-void wxTabCtrl::SetPadding( const wxSize &WXUNUSED(padding) )
-{
-};
-
-bool wxTabCtrl::DeleteAllItems(void)
-{
- wxNode *page_node = m_pages.First();
- while (page_node)
- {
- wxTabPage *page = (wxTabPage*)page_node->Data();
-
- wxNode *node = page->m_children.First();
- while (node)
- {
- wxWindow *child = (wxWindow*)node->Data();
- delete child;
-
- node = node->Next();
- };
-
- gtk_widget_destroy( page->m_wxwindow );
-
- m_pages.DeleteObject( page );
-
- page_node = m_pages.First();
- };
-
- return TRUE;
-};
-
-bool wxTabCtrl::DeleteItem( const int item )
-{
- wxTabPage *page = NULL;
-
- wxNode *node = m_pages.First();
- while (node)
- {
- page = (wxTabPage*)node->Data();
- if (page->m_id == item) break;
- node = node->Next();
- };
- if (!node) return FALSE;
-
- node = page->m_children.First();
- while (node)
- {
- wxWindow *child = (wxWindow*)node->Data();
- delete child;
-
- node = node->Next();
- };
-
- gtk_widget_destroy( page->m_wxwindow );
-
- m_pages.DeleteObject( page );
-
- return TRUE;
-};
-
-int wxTabCtrl::HitTest( const wxPoint &WXUNUSED(pt), long &WXUNUSED(flags) )
-{
- return wxTAB_HITTEST_NOWHERE;
-};
-
-int wxTabCtrl::InsertItem( const int item, const wxString &text, const int imageId, void* data )
-{
- wxTabPage *page = new wxTabPage;
-
- page->m_text = text;
- if (page->m_text.IsNull()) page->m_text = "";
- page->m_id = item;
- page->m_image = imageId;
- page->m_clientData = data;
-
- GtkWidget *label_widget = gtk_label_new( page->m_text );
- gtk_misc_set_alignment( GTK_MISC(label_widget), 0.0, 0.5 );
-
- page->m_wxwindow = gtk_myfixed_new();
- gtk_widget_show( page->m_wxwindow );
- gtk_widget_set_usize( page->m_wxwindow, 100, 100 );
-
- gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), page->m_wxwindow, label_widget );
-
- page->m_page = GTK_NOTEBOOK(m_widget)->cur_page;
-
- m_pages.Append( page );
-
- return item;
-};
-
-void wxTabCtrl::AddChild( wxWindow *win )
-{
- GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
-
- wxTabPage *page = NULL;
-
- wxNode *node = m_pages.First();
- while (node)
- {
- page = (wxTabPage*)node->Data();
- if (page->m_page == g_page) break;
- node = node->Next();
- };
-
- if (!page) wxFatalError( "wxTabCtrl error" );
-
- gtk_myfixed_put( GTK_MYFIXED(page->m_wxwindow), win->m_widget, win->m_x, win->m_y );
- gtk_widget_set_usize( win->m_widget, win->m_width, win->m_height );
-
- page->m_children.Append( win );
-};
-
-//-----------------------------------------------------------------------------
-// wxTabEvent
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxCommandEvent)
-
-wxTabEvent::wxTabEvent( WXTYPE commandType, int id ) :
- wxCommandEvent(commandType, id)
-{
-};
\ No newline at end of file
#include "wx/dcclient.h"
#include "wx/dnd.h"
#include "wx/mdi.h"
-#include "wx/tabctrl.h"
+#include "wx/notebook.h"
#include "gdk/gdkkeysyms.h"
#include <math.h>
#include "wx/gtk/win_gtk.h"
};
};
- if (IsKindOf(CLASSINFO(wxTabCtrl)))
+ if (IsKindOf(CLASSINFO(wxNotebook)))
{
- wxTabCtrl *tab = (wxTabCtrl*)this;
+ wxNotebook *tab = (wxNotebook*)this;
tab->AddChild( child );
return;
};
projects / wxWidgets.git / commitdiff
