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

wxChoiceDialog fix.

Browse Source 
Distribution and build things.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-06-29 23:16:45 +00:00
parent 7b8bd8182c
commit a533f5c122
37 changed files with 1693 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
BuildCVS.txt
View File

@@ -11,8 +11,16 @@ No idea, never did it.
II) Unix using plain makefiles. II) Unix using plain makefiles.
---------------------------------------- ----------------------------------------
No idea, never did it. Set WXWIN environment variable to the base directory such
as ~/wxWindows
-> type: export WXWIN=~/wxWindows
Edit ~/wxWindows/src/make.env as you wish.
-> type: cd ~/wxWindows/src/gtk
-> type: cp ./setup0.h setup.h
-> type: make -f makefile.unx gtk
-> pray
III) Windows using configure III) Windows using configure
---------------------------------------- ----------------------------------------
@@ -27,7 +35,7 @@ a) You have all the newest and greatest GNU tools installed on your system
and in the same directory hierachy (e.g. either all tools in /usr or all and in the same directory hierachy (e.g. either all tools in /usr or all
in /usr/local), these tools are: in /usr/local), these tools are:
- GNU libtool 1.2e (1.3 doesn't work here) - GNU libtool 1.2e (1.3 doesn't work here)
- GNU autoconf 2.14 (including autoheader 2.14) - GNU autoconf 2.13 (including autoheader 2.13)
- GNU automake 1.4 (including aclocal 1.4) - GNU automake 1.4 (including aclocal 1.4)
and possibly but not forcibly and possibly but not forcibly
- GNU make 3.76.1 - GNU make 3.76.1

13
include/wx/docview.h
View File

@@ -36,7 +36,11 @@ class WXDLLEXPORT wxCommandProcessor;
class WXDLLEXPORT wxFileHistory; class WXDLLEXPORT wxFileHistory;
class WXDLLEXPORT wxConfigBase; class WXDLLEXPORT wxConfigBase;
#include "wx/ioswrap.h" #if wxUSE_STD_IOSTREAM
#include "wx/ioswrap.h"
#else
#include "wx/stream.h"
#endif
// Document manager flags // Document manager flags
enum enum
@@ -84,8 +88,13 @@ public:
virtual bool SaveAs(); virtual bool SaveAs();
virtual bool Revert(); virtual bool Revert();
#if wxUSE_STD_IOSTREAM
virtual ostream& SaveObject(ostream& stream); virtual ostream& SaveObject(ostream& stream);
virtual istream& LoadObject(istream& stream); virtual istream& LoadObject(istream& stream);
#else
virtual bool SaveObject(wxOutputStream& stream);
virtual bool LoadObject(wxInputStream& stream);
#endif
// Called by wxWindows // Called by wxWindows
virtual bool OnSaveDocument(const wxString& filename); virtual bool OnSaveDocument(const wxString& filename);
@@ -573,9 +582,11 @@ protected:
int m_fileMaxFiles; int m_fileMaxFiles;
}; };
#if wxUSE_STD_IOSTREAM
// For compatibility with existing file formats: // For compatibility with existing file formats:
// converts from/to a stream to/from a temporary file. // converts from/to a stream to/from a temporary file.
bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, ostream& stream); bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, ostream& stream);
bool WXDLLEXPORT wxTransferStreamToFile(istream& stream, const wxString& filename); bool WXDLLEXPORT wxTransferStreamToFile(istream& stream, const wxString& filename);
#endif
#endif // _WX_DOCH__ #endif // _WX_DOCH__

142
include/wx/gtk/dcps.h
View File

@@ -1,142 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dcps.h
// Purpose: wxPostScriptDC class
// Author: Julian Smart and others
// Modified by:
// RCS-ID: $Id$
// Copyright: (c) Julian Smart, Robert Roebling and Markus Holzem
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __GTKDCPSH__
#define __GTKDCPSNH__
#ifdef __GNUG__
#pragma interface
#endif
#include "wx/dc.h"
#if wxUSE_POSTSCRIPT
#include "wx/dialog.h"
#include "wx/module.h"
#include <fstream.h>
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class wxPostScriptDC;
//-----------------------------------------------------------------------------
// wxPostScriptDC
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxPostScriptDC: public wxDC
{
DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
public:
wxPostScriptDC();
wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
~wxPostScriptDC();
bool Create(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
virtual bool Ok() const;
virtual bool PrinterDialog(wxWindow *parent = (wxWindow *) NULL);
virtual void BeginDrawing() {}
virtual void EndDrawing() {}
void FloodFill(long x1, long y1, const wxColour &col, int style=wxFLOOD_SURFACE) ;
bool GetPixel(long x1, long y1, wxColour *col) const;
void DrawLine(long x1, long y1, long x2, long y2);
void CrossHair(long x, long y) ;
void DrawArc(long x1,long y1,long x2,long y2,long xc,long yc);
void DrawEllipticArc(long x,long y,long w,long h,double sa,double ea);
void DrawPoint(long x, long y);
// Avoid compiler warning
void DrawPoint(wxPoint& point) { wxDC::DrawPoint(point); }
void DrawLines(int n, wxPoint points[], long xoffset = 0, long yoffset = 0);
// Avoid compiler warning
void DrawLines(wxList *lines, long xoffset = 0, long yoffset = 0)
{ wxDC::DrawLines(lines, xoffset, yoffset); }
void DrawPolygon(int n, wxPoint points[], long xoffset = 0, long yoffset = 0, int fillStyle=wxODDEVEN_RULE);
// Avoid compiler warning
void DrawPolygon(wxList *lines, long xoffset = 0, long yoffset = 0, int fillStyle=wxODDEVEN_RULE)
{ wxDC::DrawPolygon(lines, xoffset, yoffset, fillStyle); }
void DrawRectangle(long x, long y, long width, long height);
void DrawRoundedRectangle(long x, long y, long width, long height, double radius = 20);
void DrawEllipse(long x, long y, long width, long height);
void DrawSpline(wxList *points);
bool Blit(long xdest, long ydest, long width, long height,
wxDC *source, long xsrc, long ysrc, int rop = wxCOPY, bool useMask = FALSE);
inline bool CanDrawBitmap(void) const { return TRUE; }
void DrawIcon( const wxIcon& icon, long x, long y );
void DrawBitmap( const wxBitmap& bitmap, long x, long y, bool useMask=FALSE );
void DrawText(const wxString& text, long x, long y, bool use16 = FALSE);
void Clear();
void SetFont( const wxFont& font );
void SetPen( const wxPen& pen );
void SetBrush( const wxBrush& brush );
void SetLogicalFunction( int function );
void SetBackground( const wxBrush& brush );
void SetClippingRegion(long x, long y, long width, long height);
void SetClippingRegion( const wxRegion &region );
void DestroyClippingRegion();
bool StartDoc(const wxString& message);
void EndDoc();
void StartPage();
void EndPage();
long GetCharHeight();
long GetCharWidth();
inline bool CanGetTextExtent(void) const { return FALSE; }
void GetTextExtent(const wxString& string, long *x, long *y,
long *descent = (long *) NULL,
long *externalLeading = (long *) NULL,
wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE);
void GetSize(int* width, int* height) const;
void GetSizeMM(long *width, long *height) const;
void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
void SetDeviceOrigin( long x, long y );
inline void SetBackgroundMode(int WXUNUSED(mode)) {}
inline void SetPalette(const wxPalette& WXUNUSED(palette)) {}
inline ofstream *GetStream(void) const { return m_pstream; }
protected:
ofstream * m_pstream; // PostScript output stream
wxString m_title;
unsigned char m_currentRed;
unsigned char m_currentGreen;
unsigned char m_currentBlue;
int m_pageNumber;
bool m_clipping;
double m_underlinePosition;
double m_underlineThickness;
};
#endif
// wxUSE_POSTSCRIPT
#endif
// __GTKDCPSH__

642
include/wx/gtk/setup0.h Normal file
View File

@@ -0,0 +1,642 @@
/* setup.h. Generated automatically by configure. */
/* setup.h.in. Generated automatically from configure.in by autoheader. */
/* Generate setup.h.in from this file using autoheader. */
/* */
/* Version: $Id$ */
#ifndef __GTKSETUPH__
#define __GTKSETUPH__
#ifdef __GNUG__
#pragma interface
#endif
/* Define to empty if the keyword does not work. */
/* #undef const */
/* Define to `int' if <sys/types.h> doesn't define. */
/* #undef gid_t */
/* Define if you don't have vprintf but do have _doprnt. */
/* #undef HAVE_DOPRNT */
/* Define if you have the vprintf function. */
#define HAVE_VPRINTF 1
/* Define as __inline if that's what the C compiler calls it. */
/* #undef inline */
/* Define to `int' if <sys/types.h> doesn't define. */
/* #undef mode_t */
/* 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 to `unsigned' if <sys/types.h> doesn't define. */
/* #undef size_t */
/* Define if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Define to `int' if <sys/types.h> doesn't define. */
/* #undef uid_t */
/* 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 the X Window System is missing or not being used. */
/* #undef X_DISPLAY_MISSING */
/* Define if lex declares yytext as a char * by default, not a char[]. */
#define YYTEXT_POINTER 1
#define __WXGTK12__ 1
/*
* Define to 1 for Unix[-like] system
*/
#define wxUSE_UNIX 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__ */
/* #undef __EMX__ */
/* #undef __WINDOWS__ */
/* #undef __WIN95__ */
/* #undef __WIN32__ */
/* #undef __GNUWIN32__ */
/*
* Supports bool type
*/
#define HAVE_BOOL 1
/*
* Use zlib
*/
#define wxUSE_ZLIB 1
/*
* Use libpng
*/
#define wxUSE_LIBPNG 1
/*
* Use libjpeg
*/
#define wxUSE_LIBJPEG 1
/*
* Use libgif
*/
#define wxUSE_LIBGIF 1
/*
* Use iODBC
*/
#define wxUSE_ODBC 0
/*
* Use Threads
*/
#define wxUSE_THREADS 1
/*
* Have glibc2
*/
#define wxHAVE_GLIBC2 1
/*
* Use libXpm
*/
#define wxHAVE_LIB_XPM 0
/*
* Use OpenGL
*/
#define wxUSE_OPENGL 0
/*
* Use GUI
*/
#define wxUSE_GUI 1
/*
* Defined if !wxUSE_GUI
*/
/* #undef wxUSE_NOGUI */
/*
* Use constraints mechanism
*/
#define wxUSE_CONSTRAINTS 1
/*
* Use validators
*/
#define wxUSE_VALIDATORS 1
/*
* Use accelerators
*/
#define wxUSE_ACCEL 1
/*
* Use wxTextEntryDialog
*/
#define wxUSE_TEXTDLG 1
/*
* Use startup tips
*/
#define wxUSE_STARTUP_TIPS 1
/*
* Use progress dialog
*/
#define wxUSE_PROGRESSDLG 1
/*
* Use directory chooser dialog
*/
#define wxUSE_DIRDLG 1
/*
* Joystick support (Linux/GTK only)
*/
#define wxUSE_JOYSTICK 0
/*
* Use this control
*/
#define wxUSE_CARET 1
/*
* Use this control
*/
#define wxUSE_BMPBUTTON 1
/*
* Use this control
*/
#define wxUSE_CHECKBOX 1
/*
* Use this control
*/
#define wxUSE_CHECKLISTBOX 1
/*
* Use this control
*/
#define wxUSE_COMBOBOX 1
/*
* Use this control
*/
#define wxUSE_CHOICE 1
/*
* Use this control
*/
#define wxUSE_GAUGE 1
/*
* Use this control
*/
#define wxUSE_GRID 1
/*
* Use this control
*/
#define wxUSE_IMAGLIST 1
/*
* Use this control
*/
#define wxUSE_LISTBOX 1
/*
* Use this control
*/
#define wxUSE_LISTCTRL 1
/*
* Use this control
*/
#define wxUSE_NOTEBOOK 1
/*
* Use this control
*/
#define wxUSE_RADIOBOX 1
/*
* Use this control
*/
#define wxUSE_RADIOBTN 1
/*
* Use this control
*/
#define wxUSE_SASH 1
/*
* Use this control
*/
#define wxUSE_SCROLLBAR 1
/*
* Use this control
*/
#define wxUSE_SLIDER 1
/*
* Use this control
*/
#define wxUSE_SPINBTN 1
/*
* Use this control
*/
#define wxUSE_SPLITTER 1
/*
* Use this control
*/
#define wxUSE_STATBMP 1
/*
* Use this control
*/
#define wxUSE_STATBOX 1
/*
* Use this control
*/
#define wxUSE_STATLINE 1
/*
* Use this control
*/
#define wxUSE_STATUSBAR 1
/*
* Use Tab dialog class - obsolete, use wxNotebook instead
*/
#define wxUSE_TAB_DIALOG 0
/* compatibility */
#define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
/*
* Use this control
*/
#define wxUSE_TOOLBAR 1
#ifdef __WXWINE__
#if wxUSE_TOOLBAR
#define wxUSE_BUTTONBAR 1
#endif
#endif
/*
* Use this control
*/
#define wxUSE_TREECTRL 1
/*
* Use wxLongLong (a.k.a. int64) class
*/
#define wxUSE_LONGLONG 0
/*
* Use wxFile class
*/
#define wxUSE_FILE 1
/*
* Use wxTextFile class
*/
#define wxUSE_TEXTFILE 1
/*
* Use log classes and logging functions
*/
#define wxUSE_LOG 1
/*
* Use time and date classes
*/
#define wxUSE_TIMEDATE 1
/*
* Use wave class
*/
#define wxUSE_WAVE 0
/*
* Use config system
*/
#define wxUSE_CONFIG 1
/*
* Use intl system
*/
#define wxUSE_INTL 1
/*
* Use streams
*/
#define wxUSE_STREAMS 1
/*
* Use class serialization
*/
#define wxUSE_SERIAL 1
/*
* Use sockets
*/
#define wxUSE_SOCKETS 1
/*
* Use standard C++ streams if 1. If 0, use wxWin
* streams implementation.
*/
#define wxUSE_STD_IOSTREAM 0
/*
* wxLibrary class
*/
#define wxUSE_DYNLIB_CLASS 1
/*
* Use font metric files in GetTextExtent for wxPostScriptDC
* Use consistent PostScript fonts for AFM and printing (!)
*/
#define wxUSE_AFM_FOR_POSTSCRIPT 1
#define wxUSE_NORMALIZED_PS_FONTS 1
/* compatibility */
#define WX_NORMALIZED_PS_FONTS wxUSE_NORMALIZED_PS_FONTS
/*
* Use PostScript device context
*/
#define wxUSE_POSTSCRIPT 1
/*
* Compile wxString with wide character (Unicode) support?
*/
#define wxUSE_UNICODE 0
/*
* Work around a bug in GNU libc 5.x wcstombs() implementation.
*
* Note that you must link your programs with libc.a if you enable this and you
* have libc 5 (you should enable this for libc6 where wcsrtombs() is
* thread-safe version of wcstombs()).
*/
#define wxUSE_WCSRTOMBS 0
/*
* On some platforms overloading on size_t/int doesn't work, yet we'd like
* to define both size_t and int version of wxString::operator[] because it
* should really be size_t, but a lot of old, broken code uses int indices.
*/
#define wxUSE_SIZE_T_STRING_OPERATOR 0
/*
* Use the new experimental implementation of wxString::Printf()?
*
* Warning: enabling this may cause internal compiler errors with gcc!
*/
#define wxUSE_EXPERIMENTAL_PRINTF 0
/*
* Use Interprocess communication
*/
#define wxUSE_IPC 1
/*
* Use wxGetResource & wxWriteResource (change .Xdefaults)
*/
#define wxUSE_X_RESOURCES 0
/*
* Use clipboard
*/
#define wxUSE_CLIPBOARD 1
/*
* Use tooltips
*/
#define wxUSE_TOOLTIPS 1
/*
* Use dnd
*/
#define wxUSE_DRAG_AND_DROP 1
/*
* Use spline
*/
#define wxUSE_SPLINES 1
/*
* Use wxLibrary class
*/
#define wxUSE_DYNLIB_CLASS 1
/*
* Use the mdi architecture
*/
#define wxUSE_MDI_ARCHITECTURE 1
/*
* Use the document/view architecture
*/
#define wxUSE_DOC_VIEW_ARCHITECTURE 1
/*
* Use the print/preview architecture
*/
#define wxUSE_PRINTING_ARCHITECTURE 1
/*
* Use Prolog IO
*/
#define wxUSE_PROLOGIO 1
/*
* Use wxWindows resource loading (.wxr-files) (Needs wxUSE_PROLOGIO 1)
*/
#define wxUSE_RESOURCES 1
/* for compatibility */
#define wxUSE_WX_RESOURCES wxUSE_RESOURCES
/*
* Use wxWindows help facility (needs wxUSE_IPC 1)
*/
#define wxUSE_HELP 1
/*
* Use iostream.h rather than iostream
*/
#define wxUSE_IOSTREAMH 1
/*
* Use Apple Ieee-double converter
*/
#define wxUSE_APPLE_IEEE 1
/*
* 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 0
/*
* Compatibility with 2.0 API.
*/
#define WXWIN_COMPATIBILITY_2 1
/*
* Enables debugging: memory tracing, assert, etc., contains debug level
*/
#define WXDEBUG 0
/*
* Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG)
* WARNING: this code may not work with all architectures, especially
* if alignment is an issue.
*/
#define wxUSE_MEMORY_TRACING 0
/*
* Enable debugging version of global memory operators new and delete
* Disable it, If this causes problems (e.g. link errors)
*/
#define wxUSE_DEBUG_NEW_ALWAYS 0
/*
* VZ: What does this one do? (FIXME)
*/
#define wxUSE_DEBUG_CONTEXT 0
/*
* In debug mode, causes new to be defined to
* be WXDEBUG_NEW (see object.h). If this causes
* problems (e.g. link errors), set this to 0.
*/
#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
/*
* Matthews garbage collection (used for MrEd?)
*/
#define WXGARBAGE_COLLECTION_ON 0
/*
* Use splines
*/
#define wxUSE_SPLINES 1
/*
* wxUSE_DYNAMIC_CLASSES is TRUE for the Xt port
*/
#define wxUSE_DYNAMIC_CLASSES 1
/*
* Support for metafiles
*/
#define wxUSE_METAFILE 0
/*
* wxMiniFrame
*/
#define wxUSE_MINIFRAME 1
/*
* 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
/* The type of 3rd argument to getsockname() - usually size_t or int */
#define SOCKLEN_T socklen_t
/* Define if you have dlopen() */
#define HAVE_DLOPEN 1
/* Define if you have nanosleep() */
#define HAVE_NANOSLEEP 1
/* Define if you have sched_yield */
#define HAVE_SCHED_YIELD 1
/* Define if you have pthread_cancel */
#define HAVE_PTHREAD_CANCEL 1
/* Define if you have all functions to set thread priority */
#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
/* Define if you can specify exit functions to a thread */
/* #undef HAVE_THREAD_CLEANUP_FUNCTIONS */
/* Define if you have shl_load() */
/* #undef HAVE_SHL_LOAD */
/* Define if you have vsnprintf() */
#define HAVE_VSNPRINTF 1
/* Define if you have usleep() */
/* #undef HAVE_USLEEP */
/* Define if you have wcslen function */
#define HAVE_WCSLEN 1
/* The number of bytes in a char. */
#define SIZEOF_CHAR 1
/* The number of bytes in a int. */
#define SIZEOF_INT 4
/* The number of bytes in a int *. */
#define SIZEOF_INT_P 4
/* The number of bytes in a long. */
#define SIZEOF_LONG 4
/* The number of bytes in a long long. */
#define SIZEOF_LONG_LONG 8
/* The number of bytes in a short. */
#define SIZEOF_SHORT 2
/* Define if you have the dlopen function. */
#define HAVE_DLOPEN 1
/* Define if you have the gethostname function. */
/* #undef HAVE_GETHOSTNAME */
/* Define if you have the nanosleep function. */
#define HAVE_NANOSLEEP 1
/* Define if you have the shl_load function. */
/* #undef HAVE_SHL_LOAD */
/* Define if you have the uname function. */
#define HAVE_UNAME 1
/* Define if you have the usleep function. */
/* #undef HAVE_USLEEP */
/* Define if you have the vfork function. */
#define HAVE_VFORK 1
/* Define if you have the vsnprintf function. */
#define HAVE_VSNPRINTF 1
/* Define if you have the <X11/XKBlib.h> header file. */
#define HAVE_X11_XKBLIB_H 1
/* Define if you have the <fnmatch.h> header file. */
#define HAVE_FNMATCH_H 1
/* Define if you have the <iostream> header file. */
#define HAVE_IOSTREAM 1
/* Define if you have the <linux/joystick.h> header file. */
/* #undef HAVE_LINUX_JOYSTICK_H */
/* Define if you have the <sched.h> header file. */
#define HAVE_SCHED_H 1
/* Define if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define if you have the <wchar.h> header file. */
#define HAVE_WCHAR_H 1
/* Define if you have the <wcstr.h> header file. */
/* #undef HAVE_WCSTR_H */
/* Name of package */
#define PACKAGE "wxWindows"
/* Version number of package */
#define VERSION "2.1.0"
#endif /* __GTKSETUPH__ */

142
include/wx/gtk1/dcps.h
View File

@@ -1,142 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dcps.h
// Purpose: wxPostScriptDC class
// Author: Julian Smart and others
// Modified by:
// RCS-ID: $Id$
// Copyright: (c) Julian Smart, Robert Roebling and Markus Holzem
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __GTKDCPSH__
#define __GTKDCPSNH__
#ifdef __GNUG__
#pragma interface
#endif
#include "wx/dc.h"
#if wxUSE_POSTSCRIPT
#include "wx/dialog.h"
#include "wx/module.h"
#include <fstream.h>
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
class wxPostScriptDC;
//-----------------------------------------------------------------------------
// wxPostScriptDC
//-----------------------------------------------------------------------------
class WXDLLEXPORT wxPostScriptDC: public wxDC
{
DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
public:
wxPostScriptDC();
wxPostScriptDC(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
~wxPostScriptDC();
bool Create(const wxString& output, bool interactive = TRUE, wxWindow *parent = (wxWindow *) NULL);
virtual bool Ok() const;
virtual bool PrinterDialog(wxWindow *parent = (wxWindow *) NULL);
virtual void BeginDrawing() {}
virtual void EndDrawing() {}
void FloodFill(long x1, long y1, const wxColour &col, int style=wxFLOOD_SURFACE) ;
bool GetPixel(long x1, long y1, wxColour *col) const;
void DrawLine(long x1, long y1, long x2, long y2);
void CrossHair(long x, long y) ;
void DrawArc(long x1,long y1,long x2,long y2,long xc,long yc);
void DrawEllipticArc(long x,long y,long w,long h,double sa,double ea);
void DrawPoint(long x, long y);
// Avoid compiler warning
void DrawPoint(wxPoint& point) { wxDC::DrawPoint(point); }
void DrawLines(int n, wxPoint points[], long xoffset = 0, long yoffset = 0);
// Avoid compiler warning
void DrawLines(wxList *lines, long xoffset = 0, long yoffset = 0)
{ wxDC::DrawLines(lines, xoffset, yoffset); }
void DrawPolygon(int n, wxPoint points[], long xoffset = 0, long yoffset = 0, int fillStyle=wxODDEVEN_RULE);
// Avoid compiler warning
void DrawPolygon(wxList *lines, long xoffset = 0, long yoffset = 0, int fillStyle=wxODDEVEN_RULE)
{ wxDC::DrawPolygon(lines, xoffset, yoffset, fillStyle); }
void DrawRectangle(long x, long y, long width, long height);
void DrawRoundedRectangle(long x, long y, long width, long height, double radius = 20);
void DrawEllipse(long x, long y, long width, long height);
void DrawSpline(wxList *points);
bool Blit(long xdest, long ydest, long width, long height,
wxDC *source, long xsrc, long ysrc, int rop = wxCOPY, bool useMask = FALSE);
inline bool CanDrawBitmap(void) const { return TRUE; }
void DrawIcon( const wxIcon& icon, long x, long y );
void DrawBitmap( const wxBitmap& bitmap, long x, long y, bool useMask=FALSE );
void DrawText(const wxString& text, long x, long y, bool use16 = FALSE);
void Clear();
void SetFont( const wxFont& font );
void SetPen( const wxPen& pen );
void SetBrush( const wxBrush& brush );
void SetLogicalFunction( int function );
void SetBackground( const wxBrush& brush );
void SetClippingRegion(long x, long y, long width, long height);
void SetClippingRegion( const wxRegion &region );
void DestroyClippingRegion();
bool StartDoc(const wxString& message);
void EndDoc();
void StartPage();
void EndPage();
long GetCharHeight();
long GetCharWidth();
inline bool CanGetTextExtent(void) const { return FALSE; }
void GetTextExtent(const wxString& string, long *x, long *y,
long *descent = (long *) NULL,
long *externalLeading = (long *) NULL,
wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE);
void GetSize(int* width, int* height) const;
void GetSizeMM(long *width, long *height) const;
void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
void SetDeviceOrigin( long x, long y );
inline void SetBackgroundMode(int WXUNUSED(mode)) {}
inline void SetPalette(const wxPalette& WXUNUSED(palette)) {}
inline ofstream *GetStream(void) const { return m_pstream; }
protected:
ofstream * m_pstream; // PostScript output stream
wxString m_title;
unsigned char m_currentRed;
unsigned char m_currentGreen;
unsigned char m_currentBlue;
int m_pageNumber;
bool m_clipping;
double m_underlinePosition;
double m_underlineThickness;
};
#endif
// wxUSE_POSTSCRIPT
#endif
// __GTKDCPSH__

642
include/wx/gtk1/setup0.h Normal file
View File

@@ -0,0 +1,642 @@
/* setup.h. Generated automatically by configure. */
/* setup.h.in. Generated automatically from configure.in by autoheader. */
/* Generate setup.h.in from this file using autoheader. */
/* */
/* Version: $Id$ */
#ifndef __GTKSETUPH__
#define __GTKSETUPH__
#ifdef __GNUG__
#pragma interface
#endif
/* Define to empty if the keyword does not work. */
/* #undef const */
/* Define to `int' if <sys/types.h> doesn't define. */
/* #undef gid_t */
/* Define if you don't have vprintf but do have _doprnt. */
/* #undef HAVE_DOPRNT */
/* Define if you have the vprintf function. */
#define HAVE_VPRINTF 1
/* Define as __inline if that's what the C compiler calls it. */
/* #undef inline */
/* Define to `int' if <sys/types.h> doesn't define. */
/* #undef mode_t */
/* 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 to `unsigned' if <sys/types.h> doesn't define. */
/* #undef size_t */
/* Define if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Define to `int' if <sys/types.h> doesn't define. */
/* #undef uid_t */
/* 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 the X Window System is missing or not being used. */
/* #undef X_DISPLAY_MISSING */
/* Define if lex declares yytext as a char * by default, not a char[]. */
#define YYTEXT_POINTER 1
#define __WXGTK12__ 1
/*
* Define to 1 for Unix[-like] system
*/
#define wxUSE_UNIX 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__ */
/* #undef __EMX__ */
/* #undef __WINDOWS__ */
/* #undef __WIN95__ */
/* #undef __WIN32__ */
/* #undef __GNUWIN32__ */
/*
* Supports bool type
*/
#define HAVE_BOOL 1
/*
* Use zlib
*/
#define wxUSE_ZLIB 1
/*
* Use libpng
*/
#define wxUSE_LIBPNG 1
/*
* Use libjpeg
*/
#define wxUSE_LIBJPEG 1
/*
* Use libgif
*/
#define wxUSE_LIBGIF 1
/*
* Use iODBC
*/
#define wxUSE_ODBC 0
/*
* Use Threads
*/
#define wxUSE_THREADS 1
/*
* Have glibc2
*/
#define wxHAVE_GLIBC2 1
/*
* Use libXpm
*/
#define wxHAVE_LIB_XPM 0
/*
* Use OpenGL
*/
#define wxUSE_OPENGL 0
/*
* Use GUI
*/
#define wxUSE_GUI 1
/*
* Defined if !wxUSE_GUI
*/
/* #undef wxUSE_NOGUI */
/*
* Use constraints mechanism
*/
#define wxUSE_CONSTRAINTS 1
/*
* Use validators
*/
#define wxUSE_VALIDATORS 1
/*
* Use accelerators
*/
#define wxUSE_ACCEL 1
/*
* Use wxTextEntryDialog
*/
#define wxUSE_TEXTDLG 1
/*
* Use startup tips
*/
#define wxUSE_STARTUP_TIPS 1
/*
* Use progress dialog
*/
#define wxUSE_PROGRESSDLG 1
/*
* Use directory chooser dialog
*/
#define wxUSE_DIRDLG 1
/*
* Joystick support (Linux/GTK only)
*/
#define wxUSE_JOYSTICK 0
/*
* Use this control
*/
#define wxUSE_CARET 1
/*
* Use this control
*/
#define wxUSE_BMPBUTTON 1
/*
* Use this control
*/
#define wxUSE_CHECKBOX 1
/*
* Use this control
*/
#define wxUSE_CHECKLISTBOX 1
/*
* Use this control
*/
#define wxUSE_COMBOBOX 1
/*
* Use this control
*/
#define wxUSE_CHOICE 1
/*
* Use this control
*/
#define wxUSE_GAUGE 1
/*
* Use this control
*/
#define wxUSE_GRID 1
/*
* Use this control
*/
#define wxUSE_IMAGLIST 1
/*
* Use this control
*/
#define wxUSE_LISTBOX 1
/*
* Use this control
*/
#define wxUSE_LISTCTRL 1
/*
* Use this control
*/
#define wxUSE_NOTEBOOK 1
/*
* Use this control
*/
#define wxUSE_RADIOBOX 1
/*
* Use this control
*/
#define wxUSE_RADIOBTN 1
/*
* Use this control
*/
#define wxUSE_SASH 1
/*
* Use this control
*/
#define wxUSE_SCROLLBAR 1
/*
* Use this control
*/
#define wxUSE_SLIDER 1
/*
* Use this control
*/
#define wxUSE_SPINBTN 1
/*
* Use this control
*/
#define wxUSE_SPLITTER 1
/*
* Use this control
*/
#define wxUSE_STATBMP 1
/*
* Use this control
*/
#define wxUSE_STATBOX 1
/*
* Use this control
*/
#define wxUSE_STATLINE 1
/*
* Use this control
*/
#define wxUSE_STATUSBAR 1
/*
* Use Tab dialog class - obsolete, use wxNotebook instead
*/
#define wxUSE_TAB_DIALOG 0
/* compatibility */
#define wxUSE_TABDIALOG wxUSE_TAB_DIALOG
/*
* Use this control
*/
#define wxUSE_TOOLBAR 1
#ifdef __WXWINE__
#if wxUSE_TOOLBAR
#define wxUSE_BUTTONBAR 1
#endif
#endif
/*
* Use this control
*/
#define wxUSE_TREECTRL 1
/*
* Use wxLongLong (a.k.a. int64) class
*/
#define wxUSE_LONGLONG 0
/*
* Use wxFile class
*/
#define wxUSE_FILE 1
/*
* Use wxTextFile class
*/
#define wxUSE_TEXTFILE 1
/*
* Use log classes and logging functions
*/
#define wxUSE_LOG 1
/*
* Use time and date classes
*/
#define wxUSE_TIMEDATE 1
/*
* Use wave class
*/
#define wxUSE_WAVE 0
/*
* Use config system
*/
#define wxUSE_CONFIG 1
/*
* Use intl system
*/
#define wxUSE_INTL 1
/*
* Use streams
*/
#define wxUSE_STREAMS 1
/*
* Use class serialization
*/
#define wxUSE_SERIAL 1
/*
* Use sockets
*/
#define wxUSE_SOCKETS 1
/*
* Use standard C++ streams if 1. If 0, use wxWin
* streams implementation.
*/
#define wxUSE_STD_IOSTREAM 0
/*
* wxLibrary class
*/
#define wxUSE_DYNLIB_CLASS 1
/*
* Use font metric files in GetTextExtent for wxPostScriptDC
* Use consistent PostScript fonts for AFM and printing (!)
*/
#define wxUSE_AFM_FOR_POSTSCRIPT 1
#define wxUSE_NORMALIZED_PS_FONTS 1
/* compatibility */
#define WX_NORMALIZED_PS_FONTS wxUSE_NORMALIZED_PS_FONTS
/*
* Use PostScript device context
*/
#define wxUSE_POSTSCRIPT 1
/*
* Compile wxString with wide character (Unicode) support?
*/
#define wxUSE_UNICODE 0
/*
* Work around a bug in GNU libc 5.x wcstombs() implementation.
*
* Note that you must link your programs with libc.a if you enable this and you
* have libc 5 (you should enable this for libc6 where wcsrtombs() is
* thread-safe version of wcstombs()).
*/
#define wxUSE_WCSRTOMBS 0
/*
* On some platforms overloading on size_t/int doesn't work, yet we'd like
* to define both size_t and int version of wxString::operator[] because it
* should really be size_t, but a lot of old, broken code uses int indices.
*/
#define wxUSE_SIZE_T_STRING_OPERATOR 0
/*
* Use the new experimental implementation of wxString::Printf()?
*
* Warning: enabling this may cause internal compiler errors with gcc!
*/
#define wxUSE_EXPERIMENTAL_PRINTF 0
/*
* Use Interprocess communication
*/
#define wxUSE_IPC 1
/*
* Use wxGetResource & wxWriteResource (change .Xdefaults)
*/
#define wxUSE_X_RESOURCES 0
/*
* Use clipboard
*/
#define wxUSE_CLIPBOARD 1
/*
* Use tooltips
*/
#define wxUSE_TOOLTIPS 1
/*
* Use dnd
*/
#define wxUSE_DRAG_AND_DROP 1
/*
* Use spline
*/
#define wxUSE_SPLINES 1
/*
* Use wxLibrary class
*/
#define wxUSE_DYNLIB_CLASS 1
/*
* Use the mdi architecture
*/
#define wxUSE_MDI_ARCHITECTURE 1
/*
* Use the document/view architecture
*/
#define wxUSE_DOC_VIEW_ARCHITECTURE 1
/*
* Use the print/preview architecture
*/
#define wxUSE_PRINTING_ARCHITECTURE 1
/*
* Use Prolog IO
*/
#define wxUSE_PROLOGIO 1
/*
* Use wxWindows resource loading (.wxr-files) (Needs wxUSE_PROLOGIO 1)
*/
#define wxUSE_RESOURCES 1
/* for compatibility */
#define wxUSE_WX_RESOURCES wxUSE_RESOURCES
/*
* Use wxWindows help facility (needs wxUSE_IPC 1)
*/
#define wxUSE_HELP 1
/*
* Use iostream.h rather than iostream
*/
#define wxUSE_IOSTREAMH 1
/*
* Use Apple Ieee-double converter
*/
#define wxUSE_APPLE_IEEE 1
/*
* 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 0
/*
* Compatibility with 2.0 API.
*/
#define WXWIN_COMPATIBILITY_2 1
/*
* Enables debugging: memory tracing, assert, etc., contains debug level
*/
#define WXDEBUG 0
/*
* Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG)
* WARNING: this code may not work with all architectures, especially
* if alignment is an issue.
*/
#define wxUSE_MEMORY_TRACING 0
/*
* Enable debugging version of global memory operators new and delete
* Disable it, If this causes problems (e.g. link errors)
*/
#define wxUSE_DEBUG_NEW_ALWAYS 0
/*
* VZ: What does this one do? (FIXME)
*/
#define wxUSE_DEBUG_CONTEXT 0
/*
* In debug mode, causes new to be defined to
* be WXDEBUG_NEW (see object.h). If this causes
* problems (e.g. link errors), set this to 0.
*/
#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
/*
* Matthews garbage collection (used for MrEd?)
*/
#define WXGARBAGE_COLLECTION_ON 0
/*
* Use splines
*/
#define wxUSE_SPLINES 1
/*
* wxUSE_DYNAMIC_CLASSES is TRUE for the Xt port
*/
#define wxUSE_DYNAMIC_CLASSES 1
/*
* Support for metafiles
*/
#define wxUSE_METAFILE 0
/*
* wxMiniFrame
*/
#define wxUSE_MINIFRAME 1
/*
* 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
/* The type of 3rd argument to getsockname() - usually size_t or int */
#define SOCKLEN_T socklen_t
/* Define if you have dlopen() */
#define HAVE_DLOPEN 1
/* Define if you have nanosleep() */
#define HAVE_NANOSLEEP 1
/* Define if you have sched_yield */
#define HAVE_SCHED_YIELD 1
/* Define if you have pthread_cancel */
#define HAVE_PTHREAD_CANCEL 1
/* Define if you have all functions to set thread priority */
#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
/* Define if you can specify exit functions to a thread */
/* #undef HAVE_THREAD_CLEANUP_FUNCTIONS */
/* Define if you have shl_load() */
/* #undef HAVE_SHL_LOAD */
/* Define if you have vsnprintf() */
#define HAVE_VSNPRINTF 1
/* Define if you have usleep() */
/* #undef HAVE_USLEEP */
/* Define if you have wcslen function */
#define HAVE_WCSLEN 1
/* The number of bytes in a char. */
#define SIZEOF_CHAR 1
/* The number of bytes in a int. */
#define SIZEOF_INT 4
/* The number of bytes in a int *. */
#define SIZEOF_INT_P 4
/* The number of bytes in a long. */
#define SIZEOF_LONG 4
/* The number of bytes in a long long. */
#define SIZEOF_LONG_LONG 8
/* The number of bytes in a short. */
#define SIZEOF_SHORT 2
/* Define if you have the dlopen function. */
#define HAVE_DLOPEN 1
/* Define if you have the gethostname function. */
/* #undef HAVE_GETHOSTNAME */
/* Define if you have the nanosleep function. */
#define HAVE_NANOSLEEP 1
/* Define if you have the shl_load function. */
/* #undef HAVE_SHL_LOAD */
/* Define if you have the uname function. */
#define HAVE_UNAME 1
/* Define if you have the usleep function. */
/* #undef HAVE_USLEEP */
/* Define if you have the vfork function. */
#define HAVE_VFORK 1
/* Define if you have the vsnprintf function. */
#define HAVE_VSNPRINTF 1
/* Define if you have the <X11/XKBlib.h> header file. */
#define HAVE_X11_XKBLIB_H 1
/* Define if you have the <fnmatch.h> header file. */
#define HAVE_FNMATCH_H 1
/* Define if you have the <iostream> header file. */
#define HAVE_IOSTREAM 1
/* Define if you have the <linux/joystick.h> header file. */
/* #undef HAVE_LINUX_JOYSTICK_H */
/* Define if you have the <sched.h> header file. */
#define HAVE_SCHED_H 1
/* Define if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define if you have the <wchar.h> header file. */
#define HAVE_WCHAR_H 1
/* Define if you have the <wcstr.h> header file. */
/* #undef HAVE_WCSTR_H */
/* Name of package */
#define PACKAGE "wxWindows"
/* Version number of package */
#define VERSION "2.1.0"
#endif /* __GTKSETUPH__ */

5
include/wx/stream.h
View File

@@ -117,6 +117,11 @@ class WXDLLEXPORT wxStreamBuffer {
// wxStream: base classes // wxStream: base classes
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#define wxStream_NOERROR wxSTR_NOERROR
#define wxStream_EOF wxSTR_EOF
#define wxStream_WRITE_ERR wxSTR_WRITE_ERROR
#define wxStream_READ_ERR wxSTR_READ_ERROR
typedef enum { typedef enum {
wxStream_NOERROR = 0, wxStream_NOERROR = 0,
wxStream_EOF, wxStream_EOF,

2
samples/bombs/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/caret/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/checklst/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/config/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/controls/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/db/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/dialogs/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/dnd/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/docview/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/docvwmdi/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/drawing/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/dynamic/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/forty/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/fractal/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/grid/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/help/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/image/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

2
samples/minimal/Makefile.am
View File

@@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = 1.3 no-dependencies
SUFFIXES = .cpp SUFFIXES = .cpp
DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE) DEFS = @DEFS@ $(TOOLKIT_DEF) $(WXDEBUG_DEFINE)

39
src/common/docview.cpp
View File

@@ -59,12 +59,15 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "wx/ioswrap.h" #if wxUSE_STD_IOSTREAM
#include "wx/ioswrap.h"
#if wxUSE_IOSTREAMH #if wxUSE_IOSTREAMH
#include <fstream.h> #include <fstream.h>
#else #else
#include <fstream> #include <fstream>
#endif
#else
#include "wx/wfstream.h"
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -277,8 +280,13 @@ bool wxDocument::OnSaveDocument(const wxString& file)
else else
msgTitle = wxString(_("File error")); msgTitle = wxString(_("File error"));
#if wxUSE_STD_IOSTREAM
ofstream store(file.fn_str()); ofstream store(file.fn_str());
if (store.fail() || store.bad()) if (store.fail() || store.bad())
#else
wxFileOutputStream store(file.fn_str());
if (store.LastError() == 0)
#endif
{ {
(void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION, (void)wxMessageBox(_("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,
GetDocumentWindow()); GetDocumentWindow());
@@ -308,8 +316,13 @@ bool wxDocument::OnOpenDocument(const wxString& file)
else else
msgTitle = wxString(_("File error")); msgTitle = wxString(_("File error"));
#if wxUSE_STD_IOSTREAM
ifstream store(file.fn_str()); ifstream store(file.fn_str());
if (store.fail() || store.bad()) if (store.fail() || store.bad())
#else
wxFileInputStream store(file.fn_str());
if (store.LastError() == 0)
#endif
{ {
(void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION, (void)wxMessageBox(_("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,
GetDocumentWindow()); GetDocumentWindow());
@@ -330,19 +343,27 @@ bool wxDocument::OnOpenDocument(const wxString& file)
return TRUE; return TRUE;
} }
#if wxUSE_STD_IOSTREAM
istream& wxDocument::LoadObject(istream& stream) istream& wxDocument::LoadObject(istream& stream)
{ {
// wxObject::LoadObject(stream);
return stream; return stream;
} }
ostream& wxDocument::SaveObject(ostream& stream) ostream& wxDocument::SaveObject(ostream& stream)
{ {
// wxObject::SaveObject(stream);
return stream; return stream;
} }
#else
bool wxDocument::LoadObject(wxInputStream& stream)
{
return TRUE;
}
bool wxDocument::SaveObject(wxOutputStream& stream)
{
return TRUE;
}
#endif
bool wxDocument::Revert() bool wxDocument::Revert()
{ {
@@ -1943,6 +1964,7 @@ void wxFileHistory::AddFilesToMenu(wxMenu* menu)
// manipulate files directly // manipulate files directly
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxUSE_STD_IOSTREAM
bool wxTransferFileToStream(const wxString& filename, ostream& stream) bool wxTransferFileToStream(const wxString& filename, ostream& stream)
{ {
FILE *fd1; FILE *fd1;
@@ -1977,6 +1999,7 @@ bool wxTransferStreamToFile(istream& stream, const wxString& filename)
fclose (fd1); fclose (fd1);
return TRUE; return TRUE;
} }
#endif
#endif // wxUSE_DOC_VIEW_ARCHITECTURE #endif // wxUSE_DOC_VIEW_ARCHITECTURE

2
src/common/string.cpp
View File

@@ -138,7 +138,7 @@ extern const wxChar WXDLLEXPORT *g_szNul = &g_strEmpty.dummy;
// global functions // global functions
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifdef wxSTD_STRING_COMPATIBILITY #if defined(wxSTD_STRING_COMPATIBILITY) && wxUSE_STD_IOSTREAM
// MS Visual C++ version 5.0 provides the new STL headers as well as the old // MS Visual C++ version 5.0 provides the new STL headers as well as the old
// iostream ones. // iostream ones.

4
src/gtk/Makefile.am
View File

@@ -88,9 +88,9 @@ libwx_gtk_la_SOURCES = \
textfile.cpp \ textfile.cpp \
time.cpp \ time.cpp \
timercmn.cpp \ timercmn.cpp \
utilscmn.cpp \
tokenzr.cpp \ tokenzr.cpp \
url.cpp \ url.cpp \
utilscmn.cpp \
valgen.cpp \ valgen.cpp \
validate.cpp \ validate.cpp \
valtext.cpp \ valtext.cpp \
@@ -127,6 +127,7 @@ libwx_gtk_la_SOURCES = \
splitter.cpp \ splitter.cpp \
statusbr.cpp \ statusbr.cpp \
tabg.cpp \ tabg.cpp \
tipdlg.cpp \
treectrl.cpp \ treectrl.cpp \
\ \
threadpsx.cpp \ threadpsx.cpp \
@@ -185,7 +186,6 @@ libwx_gtk_la_SOURCES = \
textctrl.cpp \ textctrl.cpp \
textdlg.cpp \ textdlg.cpp \
timer.cpp \ timer.cpp \
tipdlg.cpp \
tooltip.cpp \ tooltip.cpp \
utilsgtk.cpp \ utilsgtk.cpp \
utilsres.cpp \ utilsres.cpp \

2
src/gtk/choicdlg.cpp
View File

@@ -248,7 +248,7 @@ bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent), const wxString& m
int y = message_size.y + 15; int y = message_size.y + 15;
int listbox_height = wxMin( 160, n*20 ); int listbox_height = 100;
wxListBox *listBox = new wxListBox( this, wxID_LISTBOX, wxPoint(10, y), wxSize(240, listbox_height), wxListBox *listBox = new wxListBox( this, wxID_LISTBOX, wxPoint(10, y), wxSize(240, listbox_height),
n, choices, wxLB_ALWAYS_SB ); n, choices, wxLB_ALWAYS_SB );

214
src/gtk/makefile.unx
View File

@@ -3,74 +3,17 @@
# Author: Robert Roebling # Author: Robert Roebling
# Created: 1998 # Created: 1998
# Updated: # Updated:
# Copyright: (c) 1998 # Copyright: (c) 1998, 1999
# #
# #
# Makefile for wxGtk library, Unix # Makefile for wxWindows library, GTK 1.2, Unix
#
EXTRACFLAGS=-DLEX_SCANNER EXTRACFLAGS=-DLEX_SCANNER
include ../make.env include ../make.env
LIB_CPP_SRC=\ LIB_CPP_SRC=\
\
../common/cmndata.cpp \
../common/config.cpp \
../common/date.cpp \
../common/docmdi.cpp \
../common/docview.cpp \
../common/dynarray.cpp \
../common/dynlib.cpp \
../common/event.cpp \
../common/file.cpp \
../common/fileconf.cpp \
../common/filefn.cpp \
../common/gdicmn.cpp \
../common/hash.cpp \
../common/helpbase.cpp \
../common/intl.cpp \
../common/image.cpp \
../common/imagjpeg.cpp \
../common/imagpng.cpp \
../common/ipcbase.cpp \
../common/layout.cpp \
../common/list.cpp \
../common/log.cpp \
../common/matrix.cpp \
../common/memory.cpp \
../common/module.cpp \
../common/object.cpp \
../common/odbc.cpp \
../common/postscrp.cpp \
../common/prntbase.cpp \
../common/resource.cpp \
../common/serbase.cpp \
../common/string.cpp \
../common/textfile.cpp \
../common/time.cpp \
../common/timercmn.cpp \
../common/utilscmn.cpp \
../common/wincmn.cpp \
../common/framecmn.cpp \
../common/stream.cpp \
../common/datstrm.cpp \
../common/wfstream.cpp \
../common/mstream.cpp \
../common/zstream.cpp \
../common/objstrm.cpp \
../common/sckstrm.cpp \
../common/validate.cpp \
../common/valtext.cpp \
../common/variant.cpp \
../common/wxexpr.cpp \
../common/socket.cpp \
../common/sckaddr.cpp \
../common/sckipc.cpp \
../common/protocol.cpp \
../common/ftp.cpp \
../common/http.cpp \
../common/url.cpp \
../common/tokenzr.cpp \
\ \
accel.cpp \ accel.cpp \
app.cpp \ app.cpp \
@@ -81,10 +24,11 @@ LIB_CPP_SRC=\
checkbox.cpp \ checkbox.cpp \
checklst.cpp \ checklst.cpp \
choice.cpp \ choice.cpp \
choicdlg.cpp \
clipbrd.cpp \ clipbrd.cpp \
colour.cpp \ colour.cpp \
control.cpp \
combobox.cpp \ combobox.cpp \
control.cpp \
cursor.cpp \ cursor.cpp \
data.cpp \ data.cpp \
dataobj.cpp \ dataobj.cpp \
@@ -92,7 +36,6 @@ LIB_CPP_SRC=\
dcclient.cpp \ dcclient.cpp \
dcmemory.cpp \ dcmemory.cpp \
dcscreen.cpp \ dcscreen.cpp \
dcps.cpp \
dialog.cpp \ dialog.cpp \
dnd.cpp \ dnd.cpp \
filedlg.cpp \ filedlg.cpp \
@@ -106,6 +49,7 @@ LIB_CPP_SRC=\
mdi.cpp \ mdi.cpp \
menu.cpp \ menu.cpp \
minifram.cpp \ minifram.cpp \
msgdlg.cpp \
notebook.cpp \ notebook.cpp \
palette.cpp \ palette.cpp \
pen.cpp \ pen.cpp \
@@ -116,37 +60,121 @@ LIB_CPP_SRC=\
settings.cpp \ settings.cpp \
slider.cpp \ slider.cpp \
spinbutt.cpp \ spinbutt.cpp \
statbox.cpp \
statbmp.cpp \ statbmp.cpp \
statbox.cpp \
statline.cpp \
stattext.cpp \ stattext.cpp \
tbargtk.cpp \ tbargtk.cpp \
threadpsx.cpp \
textctrl.cpp \ textctrl.cpp \
textdlg.cpp \
timer.cpp \ timer.cpp \
tooltip.cpp \
utilsgtk.cpp \ utilsgtk.cpp \
utilsres.cpp \ utilsres.cpp \
wave.cpp \ wave.cpp \
window.cpp \ window.cpp \
\ \
../generic/choicdgg.cpp \ ../common/cmndata.cpp \
../common/config.cpp \
../common/date.cpp \
../common/datstrm.cpp \
../common/dcbase.cpp \
../common/dlgcmn.cpp \
../common/docmdi.cpp \
../common/docview.cpp \
../common/dynarray.cpp \
../common/dynlib.cpp \
../common/event.cpp \
../common/file.cpp \
../common/fileconf.cpp \
../common/filefn.cpp \
../common/framecmn.cpp \
../common/ftp.cpp \
../common/gdicmn.cpp \
../common/hash.cpp \
../common/helpbase.cpp \
../common/http.cpp \
../common/image.cpp \
../common/imagjpeg.cpp \
../common/imagbmp.cpp \
../common/imaggif.cpp \
../common/imagpng.cpp \
../common/intl.cpp \
../common/ipcbase.cpp \
../common/layout.cpp \
../common/list.cpp \
../common/log.cpp \
../common/longlong.cpp \
../common/matrix.cpp \
../common/memory.cpp \
../common/mimetype.cpp \
../common/module.cpp \
../common/mstream.cpp \
../common/object.cpp \
../common/objstrm.cpp \
../common/odbc.cpp \
../common/paper.cpp \
../common/prntbase.cpp \
../common/process.cpp \
../common/protocol.cpp \
../common/resource.cpp \
../common/sckaddr.cpp \
../common/sckfile.cpp \
../common/sckint.cpp \
../common/sckipc.cpp \
../common/sckstrm.cpp \
../common/serbase.cpp \
../common/socket.cpp \
../common/stream.cpp \
../common/string.cpp \
../common/tbarbase.cpp \
../common/tbarsmpl.cpp \
../common/textfile.cpp \
../common/time.cpp \
../common/timercmn.cpp \
../common/tokenzr.cpp \
../common/url.cpp \
../common/utilscmn.cpp \
../common/valgen.cpp \
../common/validate.cpp \
../common/valtext.cpp \
../common/variant.cpp \
../common/wfstream.cpp \
../common/wincmn.cpp \
../common/wxchar.cpp \
../common/wxexpr.cpp \
../common/zstream.cpp \
\
../common/db.cpp \
../common/dbtable.cpp \
\
../unix/threadpsx.cpp \
../unix/utilsunx.cpp \
\
../generic/caret.cpp \
../generic/colrdlgg.cpp \ ../generic/colrdlgg.cpp \
../generic/dcpsg.cpp \
../generic/dirdlgg.cpp \ ../generic/dirdlgg.cpp \
../generic/fontdlgg.cpp \ ../generic/fontdlgg.cpp \
../generic/gridg.cpp \ ../generic/gridg.cpp \
../generic/helpext.cpp \ ../generic/helpext.cpp \
../generic/helphtml.cpp \
../generic/imaglist.cpp \ ../generic/imaglist.cpp \
../generic/listctrl.cpp \
../generic/laywin.cpp \ ../generic/laywin.cpp \
../generic/msgdlgg.cpp \ ../generic/listctrl.cpp \
../generic/panelg.cpp \ ../generic/panelg.cpp \
../generic/printps.cpp \ ../generic/printps.cpp \
../generic/prntdlgg.cpp \ ../generic/prntdlgg.cpp \
../generic/progdlgg.cpp \
../generic/prop.cpp \
../generic/propform.cpp \
../generic/proplist.cpp \
../generic/sashwin.cpp \ ../generic/sashwin.cpp \
../generic/scrolwin.cpp \ ../generic/scrolwin.cpp \
../generic/splitter.cpp \ ../generic/splitter.cpp \
../generic/statusbr.cpp \ ../generic/statusbr.cpp \
../generic/tabg.cpp \ ../generic/tabg.cpp \
../generic/textdlgg.cpp \ ../generic/tipdlg.cpp \
../generic/treectrl.cpp ../generic/treectrl.cpp
@@ -173,6 +201,54 @@ PNG_SRC=\
../png/pngmem.c \ ../png/pngmem.c \
../png/pngerror.c \ ../png/pngerror.c \
../png/pngpread.c ../png/pngpread.c
JPEG_SRC=\
../jpeg/jcomapi.c \
../jpeg/jutils.c \
../jpeg/jerror.c \
../jpeg/jmemmgr.c \
../jpeg/jmemnobs.c \
../jpeg/jcapimin.c \
../jpeg/jcapistd.c \
../jpeg/jctrans.c \
../jpeg/jcparam.c \
../jpeg/jdatadst.c \
../jpeg/jcinit.c \
../jpeg/jcmaster.c \
../jpeg/jcmarker.c \
../jpeg/jcmainct.c \
../jpeg/jcprepct.c \
../jpeg/jccoefct.c \
../jpeg/jccolor.c \
../jpeg/jcsample.c \
../jpeg/jchuff.c \
../jpeg/jcphuff.c \
../jpeg/jcdctmgr.c \
../jpeg/jfdctfst.c \
../jpeg/jfdctflt.c \
../jpeg/jfdctint.c \
../jpeg/jdapimin.c \
../jpeg/jdapistd.c \
../jpeg/jdtrans.c \
../jpeg/jdatasrc.c \
../jpeg/jdmaster.c \
../jpeg/jdinput.c \
../jpeg/jdmarker.c \
../jpeg/jdhuff.c \
../jpeg/jdphuff.c \
../jpeg/jdmainct.c \
../jpeg/jdcoefct.c \
../jpeg/jdpostct.c \
../jpeg/jddctmgr.c \
../jpeg/jidctfst.c \
../jpeg/jidctflt.c \
../jpeg/jidctint.c \
../jpeg/jidctred.c \
../jpeg/jdsample.c \
../jpeg/jdcolor.c \
../jpeg/jquant1.c \
../jpeg/jquant2.c \
../jpeg/jdmerge.c
LIB_C_SRC=\ LIB_C_SRC=\
\ \
@@ -184,7 +260,7 @@ LIB_C_SRC=\
# already have a zlib library installed on our system # already have a zlib library installed on our system
# (or we wish to statically link them for some reason) # (or we wish to statically link them for some reason)
EXTRA_C_SRC=\ EXTRA_C_SRC=\
$(ZLIB_SRC) $(PNG_SRC) $(ZLIB_SRC) $(PNG_SRC) $(JPEG_SRC)
all: $(WXLIB) all: $(WXLIB)

6
src/gtk/menu.cpp
View File

@@ -184,9 +184,11 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
{ {
m_menus.Append( menu ); m_menus.Append( menu );
const wxChar *pc;
/* GTK 1.2 wants to have "_" instead of "&" for accelerators */ /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
wxString str; wxString str;
for ( const wxChar *pc = title; *pc != _T('\0'); pc++ ) for ( pc = title; *pc != _T('\0'); pc++ )
{ {
if (*pc == _T('&')) if (*pc == _T('&'))
{ {
@@ -230,7 +232,7 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
/* in order to get the pointer to the item we need the item text _without_ underscores */ /* in order to get the pointer to the item we need the item text _without_ underscores */
wxString tmp = _T("<main>/"); wxString tmp = _T("<main>/");
for ( const wxChar *pc = str; *pc != _T('\0'); pc++ ) for ( pc = str; *pc != _T('\0'); pc++ )
{ {
if (*pc == _T('_')) pc++; /* skip it */ if (*pc == _T('_')) pc++; /* skip it */
tmp << *pc; tmp << *pc;

4
src/gtk1/Makefile.am
View File

@@ -88,9 +88,9 @@ libwx_gtk_la_SOURCES = \
textfile.cpp \ textfile.cpp \
time.cpp \ time.cpp \
timercmn.cpp \ timercmn.cpp \
utilscmn.cpp \
tokenzr.cpp \ tokenzr.cpp \
url.cpp \ url.cpp \
utilscmn.cpp \
valgen.cpp \ valgen.cpp \
validate.cpp \ validate.cpp \
valtext.cpp \ valtext.cpp \
@@ -127,6 +127,7 @@ libwx_gtk_la_SOURCES = \
splitter.cpp \ splitter.cpp \
statusbr.cpp \ statusbr.cpp \
tabg.cpp \ tabg.cpp \
tipdlg.cpp \
treectrl.cpp \ treectrl.cpp \
\ \
threadpsx.cpp \ threadpsx.cpp \
@@ -185,7 +186,6 @@ libwx_gtk_la_SOURCES = \
textctrl.cpp \ textctrl.cpp \
textdlg.cpp \ textdlg.cpp \
timer.cpp \ timer.cpp \
tipdlg.cpp \
tooltip.cpp \ tooltip.cpp \
utilsgtk.cpp \ utilsgtk.cpp \
utilsres.cpp \ utilsres.cpp \

2
src/gtk1/choicdlg.cpp
View File

@@ -248,7 +248,7 @@ bool wxSingleChoiceDialog::Create( wxWindow *WXUNUSED(parent), const wxString& m
int y = message_size.y + 15; int y = message_size.y + 15;
int listbox_height = wxMin( 160, n*20 ); int listbox_height = 100;
wxListBox *listBox = new wxListBox( this, wxID_LISTBOX, wxPoint(10, y), wxSize(240, listbox_height), wxListBox *listBox = new wxListBox( this, wxID_LISTBOX, wxPoint(10, y), wxSize(240, listbox_height),
n, choices, wxLB_ALWAYS_SB ); n, choices, wxLB_ALWAYS_SB );

214
src/gtk1/makefile.unx
View File

@@ -3,74 +3,17 @@
# Author: Robert Roebling # Author: Robert Roebling
# Created: 1998 # Created: 1998
# Updated: # Updated:
# Copyright: (c) 1998 # Copyright: (c) 1998, 1999
# #
# #
# Makefile for wxGtk library, Unix # Makefile for wxWindows library, GTK 1.2, Unix
#
EXTRACFLAGS=-DLEX_SCANNER EXTRACFLAGS=-DLEX_SCANNER
include ../make.env include ../make.env
LIB_CPP_SRC=\ LIB_CPP_SRC=\
\
../common/cmndata.cpp \
../common/config.cpp \
../common/date.cpp \
../common/docmdi.cpp \
../common/docview.cpp \
../common/dynarray.cpp \
../common/dynlib.cpp \
../common/event.cpp \
../common/file.cpp \
../common/fileconf.cpp \
../common/filefn.cpp \
../common/gdicmn.cpp \
../common/hash.cpp \
../common/helpbase.cpp \
../common/intl.cpp \
../common/image.cpp \
../common/imagjpeg.cpp \
../common/imagpng.cpp \
../common/ipcbase.cpp \
../common/layout.cpp \
../common/list.cpp \
../common/log.cpp \
../common/matrix.cpp \
../common/memory.cpp \
../common/module.cpp \
../common/object.cpp \
../common/odbc.cpp \
../common/postscrp.cpp \
../common/prntbase.cpp \
../common/resource.cpp \
../common/serbase.cpp \
../common/string.cpp \
../common/textfile.cpp \
../common/time.cpp \
../common/timercmn.cpp \
../common/utilscmn.cpp \
../common/wincmn.cpp \
../common/framecmn.cpp \
../common/stream.cpp \
../common/datstrm.cpp \
../common/wfstream.cpp \
../common/mstream.cpp \
../common/zstream.cpp \
../common/objstrm.cpp \
../common/sckstrm.cpp \
../common/validate.cpp \
../common/valtext.cpp \
../common/variant.cpp \
../common/wxexpr.cpp \
../common/socket.cpp \
../common/sckaddr.cpp \
../common/sckipc.cpp \
../common/protocol.cpp \
../common/ftp.cpp \
../common/http.cpp \
../common/url.cpp \
../common/tokenzr.cpp \
\ \
accel.cpp \ accel.cpp \
app.cpp \ app.cpp \
@@ -81,10 +24,11 @@ LIB_CPP_SRC=\
checkbox.cpp \ checkbox.cpp \
checklst.cpp \ checklst.cpp \
choice.cpp \ choice.cpp \
choicdlg.cpp \
clipbrd.cpp \ clipbrd.cpp \
colour.cpp \ colour.cpp \
control.cpp \
combobox.cpp \ combobox.cpp \
control.cpp \
cursor.cpp \ cursor.cpp \
data.cpp \ data.cpp \
dataobj.cpp \ dataobj.cpp \
@@ -92,7 +36,6 @@ LIB_CPP_SRC=\
dcclient.cpp \ dcclient.cpp \
dcmemory.cpp \ dcmemory.cpp \
dcscreen.cpp \ dcscreen.cpp \
dcps.cpp \
dialog.cpp \ dialog.cpp \
dnd.cpp \ dnd.cpp \
filedlg.cpp \ filedlg.cpp \
@@ -106,6 +49,7 @@ LIB_CPP_SRC=\
mdi.cpp \ mdi.cpp \
menu.cpp \ menu.cpp \
minifram.cpp \ minifram.cpp \
msgdlg.cpp \
notebook.cpp \ notebook.cpp \
palette.cpp \ palette.cpp \
pen.cpp \ pen.cpp \
@@ -116,37 +60,121 @@ LIB_CPP_SRC=\
settings.cpp \ settings.cpp \
slider.cpp \ slider.cpp \
spinbutt.cpp \ spinbutt.cpp \
statbox.cpp \
statbmp.cpp \ statbmp.cpp \
statbox.cpp \
statline.cpp \
stattext.cpp \ stattext.cpp \
tbargtk.cpp \ tbargtk.cpp \
threadpsx.cpp \
textctrl.cpp \ textctrl.cpp \
textdlg.cpp \
timer.cpp \ timer.cpp \
tooltip.cpp \
utilsgtk.cpp \ utilsgtk.cpp \
utilsres.cpp \ utilsres.cpp \
wave.cpp \ wave.cpp \
window.cpp \ window.cpp \
\ \
../generic/choicdgg.cpp \ ../common/cmndata.cpp \
../common/config.cpp \
../common/date.cpp \
../common/datstrm.cpp \
../common/dcbase.cpp \
../common/dlgcmn.cpp \
../common/docmdi.cpp \
../common/docview.cpp \
../common/dynarray.cpp \
../common/dynlib.cpp \
../common/event.cpp \
../common/file.cpp \
../common/fileconf.cpp \
../common/filefn.cpp \
../common/framecmn.cpp \
../common/ftp.cpp \
../common/gdicmn.cpp \
../common/hash.cpp \
../common/helpbase.cpp \
../common/http.cpp \
../common/image.cpp \
../common/imagjpeg.cpp \
../common/imagbmp.cpp \
../common/imaggif.cpp \
../common/imagpng.cpp \
../common/intl.cpp \
../common/ipcbase.cpp \
../common/layout.cpp \
../common/list.cpp \
../common/log.cpp \
../common/longlong.cpp \
../common/matrix.cpp \
../common/memory.cpp \
../common/mimetype.cpp \
../common/module.cpp \
../common/mstream.cpp \
../common/object.cpp \
../common/objstrm.cpp \
../common/odbc.cpp \
../common/paper.cpp \
../common/prntbase.cpp \
../common/process.cpp \
../common/protocol.cpp \
../common/resource.cpp \
../common/sckaddr.cpp \
../common/sckfile.cpp \
../common/sckint.cpp \
../common/sckipc.cpp \
../common/sckstrm.cpp \
../common/serbase.cpp \
../common/socket.cpp \
../common/stream.cpp \
../common/string.cpp \
../common/tbarbase.cpp \
../common/tbarsmpl.cpp \
../common/textfile.cpp \
../common/time.cpp \
../common/timercmn.cpp \
../common/tokenzr.cpp \
../common/url.cpp \
../common/utilscmn.cpp \
../common/valgen.cpp \
../common/validate.cpp \
../common/valtext.cpp \
../common/variant.cpp \
../common/wfstream.cpp \
../common/wincmn.cpp \
../common/wxchar.cpp \
../common/wxexpr.cpp \
../common/zstream.cpp \
\
../common/db.cpp \
../common/dbtable.cpp \
\
../unix/threadpsx.cpp \
../unix/utilsunx.cpp \
\
../generic/caret.cpp \
../generic/colrdlgg.cpp \ ../generic/colrdlgg.cpp \
../generic/dcpsg.cpp \
../generic/dirdlgg.cpp \ ../generic/dirdlgg.cpp \
../generic/fontdlgg.cpp \ ../generic/fontdlgg.cpp \
../generic/gridg.cpp \ ../generic/gridg.cpp \
../generic/helpext.cpp \ ../generic/helpext.cpp \
../generic/helphtml.cpp \
../generic/imaglist.cpp \ ../generic/imaglist.cpp \
../generic/listctrl.cpp \
../generic/laywin.cpp \ ../generic/laywin.cpp \
../generic/msgdlgg.cpp \ ../generic/listctrl.cpp \
../generic/panelg.cpp \ ../generic/panelg.cpp \
../generic/printps.cpp \ ../generic/printps.cpp \
../generic/prntdlgg.cpp \ ../generic/prntdlgg.cpp \
../generic/progdlgg.cpp \
../generic/prop.cpp \
../generic/propform.cpp \
../generic/proplist.cpp \
../generic/sashwin.cpp \ ../generic/sashwin.cpp \
../generic/scrolwin.cpp \ ../generic/scrolwin.cpp \
../generic/splitter.cpp \ ../generic/splitter.cpp \
../generic/statusbr.cpp \ ../generic/statusbr.cpp \
../generic/tabg.cpp \ ../generic/tabg.cpp \
../generic/textdlgg.cpp \ ../generic/tipdlg.cpp \
../generic/treectrl.cpp ../generic/treectrl.cpp
@@ -173,6 +201,54 @@ PNG_SRC=\
../png/pngmem.c \ ../png/pngmem.c \
../png/pngerror.c \ ../png/pngerror.c \
../png/pngpread.c ../png/pngpread.c
JPEG_SRC=\
../jpeg/jcomapi.c \
../jpeg/jutils.c \
../jpeg/jerror.c \
../jpeg/jmemmgr.c \
../jpeg/jmemnobs.c \
../jpeg/jcapimin.c \
../jpeg/jcapistd.c \
../jpeg/jctrans.c \
../jpeg/jcparam.c \
../jpeg/jdatadst.c \
../jpeg/jcinit.c \
../jpeg/jcmaster.c \
../jpeg/jcmarker.c \
../jpeg/jcmainct.c \
../jpeg/jcprepct.c \
../jpeg/jccoefct.c \
../jpeg/jccolor.c \
../jpeg/jcsample.c \
../jpeg/jchuff.c \
../jpeg/jcphuff.c \
../jpeg/jcdctmgr.c \
../jpeg/jfdctfst.c \
../jpeg/jfdctflt.c \
../jpeg/jfdctint.c \
../jpeg/jdapimin.c \
../jpeg/jdapistd.c \
../jpeg/jdtrans.c \
../jpeg/jdatasrc.c \
../jpeg/jdmaster.c \
../jpeg/jdinput.c \
../jpeg/jdmarker.c \
../jpeg/jdhuff.c \
../jpeg/jdphuff.c \
../jpeg/jdmainct.c \
../jpeg/jdcoefct.c \
../jpeg/jdpostct.c \
../jpeg/jddctmgr.c \
../jpeg/jidctfst.c \
../jpeg/jidctflt.c \
../jpeg/jidctint.c \
../jpeg/jidctred.c \
../jpeg/jdsample.c \
../jpeg/jdcolor.c \
../jpeg/jquant1.c \
../jpeg/jquant2.c \
../jpeg/jdmerge.c
LIB_C_SRC=\ LIB_C_SRC=\
\ \
@@ -184,7 +260,7 @@ LIB_C_SRC=\
# already have a zlib library installed on our system # already have a zlib library installed on our system
# (or we wish to statically link them for some reason) # (or we wish to statically link them for some reason)
EXTRA_C_SRC=\ EXTRA_C_SRC=\
$(ZLIB_SRC) $(PNG_SRC) $(ZLIB_SRC) $(PNG_SRC) $(JPEG_SRC)
all: $(WXLIB) all: $(WXLIB)

6
src/gtk1/menu.cpp
View File

@@ -184,9 +184,11 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
{ {
m_menus.Append( menu ); m_menus.Append( menu );
const wxChar *pc;
/* GTK 1.2 wants to have "_" instead of "&" for accelerators */ /* GTK 1.2 wants to have "_" instead of "&" for accelerators */
wxString str; wxString str;
for ( const wxChar *pc = title; *pc != _T('\0'); pc++ ) for ( pc = title; *pc != _T('\0'); pc++ )
{ {
if (*pc == _T('&')) if (*pc == _T('&'))
{ {
@@ -230,7 +232,7 @@ void wxMenuBar::Append( wxMenu *menu, const wxString &title )
/* in order to get the pointer to the item we need the item text _without_ underscores */ /* in order to get the pointer to the item we need the item text _without_ underscores */
wxString tmp = _T("<main>/"); wxString tmp = _T("<main>/");
for ( const wxChar *pc = str; *pc != _T('\0'); pc++ ) for ( pc = str; *pc != _T('\0'); pc++ )
{ {
if (*pc == _T('_')) pc++; /* skip it */ if (*pc == _T('_')) pc++; /* skip it */
tmp << *pc; tmp << *pc;

11
src/make.env
View File

@@ -40,18 +40,19 @@ GUISUFFIX = _stubs
# Misc options # Misc options
OPTIONS = -D__LINUX__ -D__WXDEBUG__ OPTIONS = -D__LINUX__ -D__WXDEBUG__
COPTIONS = COPTIONS =
DEBUGFLAGS = -ggdb DEBUGFLAGS = # -ggdb
INCLUDE = INCLUDE =
WARN = -Wall -Wno-unused # -w WARN = -Wall -Wno-unused # -w
CWARN = -Wall -Wno-unused # -w CWARN = -Wall -Wno-unused # -w
OPT = # -O2 OPT = -O2
############################ Includes ################################# ############################ Includes #################################
# Compiler or system-specific include paths # Compiler or system-specific include paths
COMPPATHS = COMPPATHS =
XINCLUDE = -I/usr/openwin/include -I/usr/include/X11 -I/usr/include/Xm \ XINCLUDE = -I/usr/openwin/include -I/usr/include/X11 -I/usr/include/Xm \
-I/usr/include/X11/Xm -I/usr/include -I/usr/include/X11/Xm -I/usr/include -I/usr/local/include \
-I/usr/lib/glib/include -I/usr/local/lib/glib/include
XLIB = -L/usr/local/X11/lib -L/usr/openwin/lib -L/usr/X11/lib -L/usr/X11R6/lib XLIB = -L/usr/local/X11/lib -L/usr/openwin/lib -L/usr/X11/lib -L/usr/X11R6/lib
############################ Libraries ################################ ############################ Libraries ################################
@@ -72,7 +73,7 @@ MAINSUFF =cpp
WXINC = $(WXDIR)/include WXINC = $(WXDIR)/include
WXLIB = $(WXDIR)/lib/libwx$(GUISUFFIX).a WXLIB = $(WXDIR)/lib/libwx$(GUISUFFIX).a
INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(COMPPATHS) INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(COMPPATHS)
# Directory for object files # Directory for object files
OBJDIR = objects$(GUISUFFIX) OBJDIR = objects$(GUISUFFIX)
@@ -106,7 +107,7 @@ motif:
make -f makefile.unx all GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lpng -lzlib -lXm -lXmu -lXt -lXpm -lX11 -lm' make -f makefile.unx all GUI='-D__WXMOTIF__ -D__UNIX__' GUISUFFIX='_motif' GUILDLIBS='-lwx_motif $(COMPLIBS) -lpng -lzlib -lXm -lXmu -lXt -lXpm -lX11 -lm'
gtk: gtk:
make -f makefile.unx all GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk2 $(COMPLIBS) -ldl -lgtk -lgdk -lglib -lpng -lzlib -lX11 -lm -pthread' make -f makefile.unx all GUI='-D__WXGTK__ -D__UNIX__' GUISUFFIX='_gtk' GUILDLIBS='-lwx_gtk $(COMPLIBS) -ldl `gtk-config --libs` -lX11 -lm -pthread'
cleanstubs: cleanstubs:
make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm' make -f makefile.unx clean GUI='-D__WXSTUBS__ -D__UNIX__' GUISUFFIX='_stubs' GUILDLIBS='-lwx_stubs $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm'

5
utils/glcanvas/gtk/glcanvas.cpp
View File

@@ -217,9 +217,12 @@ bool wxGLCanvas::Create( wxWindow *parent,
int data[] = { GLX_RGBA, int data[] = { GLX_RGBA,
GLX_DOUBLEBUFFER, GLX_DOUBLEBUFFER,
GLX_DEPTH_SIZE, 1, /* use largest available depth buffer */ GLX_DEPTH_SIZE, 1, /* use largest available depth buffer */
GLX_RED_SIZE, 1,
GLX_GREEN_SIZE, 1,
GLX_BLUE_SIZE, 1,
GLX_ALPHA_SIZE, 1,
None }; None };
attribList = (int*) data; attribList = (int*) data;
printf( "using default values\n" );
} }
else else
{ {