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

USE_xxx constants renamed to wxUSE_xxx. This is an incompatible change, you

Browse Source 
must recompile everything after upgrading!


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-09-25 13:28:52 +00:00
parent d069d02e1e
commit 47d67540a0
166 changed files with 1374 additions and 1314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/confbase.h
View File

@@ -23,9 +23,9 @@
// ----------------------------------------------------------------------------
// it won't compile without it anyhow
#ifndef USE_CONFIG
#error "Please define USE_CONFIG or remove config.cpp from your makefile"
#endif // USE_CONFIG
#ifndef wxUSE_CONFIG
#error "Please define wxUSE_CONFIG or remove config.cpp from your makefile"
#endif // wxUSE_CONFIG
// ----------------------------------------------------------------------------
// constants

2
include/wx/date.h
View File

@@ -20,7 +20,7 @@
#include "wx/object.h"
#include "wx/string.h"
#if USE_TIMEDATE
#if wxUSE_TIMEDATE
enum wxdate_format_type {wxMDY, wxDAY, wxMONTH, wxFULL, wxEUROPEAN};

6
include/wx/docview.h
View File

@@ -21,7 +21,7 @@
#include "wx/cmndata.h"
#include "wx/string.h"
#if USE_PRINTING_ARCHITECTURE
#if wxUSE_PRINTING_ARCHITECTURE
#include "wx/print.h"
#endif
@@ -189,7 +189,7 @@ class WXDLLEXPORT wxView: public wxEvtHandler
inline wxDocManager *GetDocumentManager(void) const { return m_viewDocument->GetDocumentManager(); }
#if USE_PRINTING_ARCHITECTURE
#if wxUSE_PRINTING_ARCHITECTURE
virtual wxPrintout *OnCreatePrintout(void);
#endif
@@ -415,7 +415,7 @@ DECLARE_EVENT_TABLE()
* Provide simple default printing facilities
*/
#if USE_PRINTING_ARCHITECTURE
#if wxUSE_PRINTING_ARCHITECTURE
class WXDLLEXPORT wxDocPrintout: public wxPrintout
{
DECLARE_DYNAMIC_CLASS(wxDocPrintout)

6
include/wx/fileconf.h
View File

@@ -26,9 +26,9 @@
// ----------------------------------------------------------------------------
// it won't compile without it anyhow
#ifndef USE_CONFIG
#error "Please define USE_CONFIG or remove fileconf.cpp from your makefile"
#endif // USE_CONFIG
#ifndef wxUSE_CONFIG
#error "Please define wxUSE_CONFIG or remove fileconf.cpp from your makefile"
#endif // wxUSE_CONFIG
// ----------------------------------------------------------------------------
// wxFileConfig

4
include/wx/generic/helpxlp.h
View File

@@ -21,7 +21,7 @@
#include <stdio.h>
#include "wx/wx.h"
#if USE_HELP
#if wxUSE_HELP
#include "wx/helpbase.h"
@@ -122,6 +122,6 @@ class WXDLLEXPORT wxXLPHelpController: public wxHelpControllerBase
wxXLPHelpClient helpClient;
};
#endif // USE_HELP
#endif // wxUSE_HELP
#endif
// __HELPXLPH__

6
include/wx/gtk/menuitem.h
View File

@@ -25,7 +25,7 @@
// an exception to the general rule that a normal header doesn't include other
// headers - only because ownerdrw.h is not always included and I don't want
// to write #ifdef's everywhere...
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
#include "wx/ownerdrw.h"
#endif
@@ -40,7 +40,7 @@
// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMenuItem: public wxObject
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
, public wxOwnerDrawn
#endif
{
@@ -79,7 +79,7 @@ private:
bool m_bEnabled, // enabled or greyed?
m_bChecked; // checked? (only if checkable)
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
// wxOwnerDrawn base class already has these variables - nothing to do
#else //!owner drawn

2
include/wx/gtk/textctrl.h
View File

@@ -21,7 +21,7 @@
#include "wx/string.h"
#include "wx/control.h"
#if USE_IOSTREAMH
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>

6
include/wx/gtk1/menuitem.h
View File

@@ -25,7 +25,7 @@
// an exception to the general rule that a normal header doesn't include other
// headers - only because ownerdrw.h is not always included and I don't want
// to write #ifdef's everywhere...
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
#include "wx/ownerdrw.h"
#endif
@@ -40,7 +40,7 @@
// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMenuItem: public wxObject
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
, public wxOwnerDrawn
#endif
{
@@ -79,7 +79,7 @@ private:
bool m_bEnabled, // enabled or greyed?
m_bChecked; // checked? (only if checkable)
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
// wxOwnerDrawn base class already has these variables - nothing to do
#else //!owner drawn

2
include/wx/gtk1/textctrl.h
View File

@@ -21,7 +21,7 @@
#include "wx/string.h"
#include "wx/control.h"
#if USE_IOSTREAMH
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>

4
include/wx/helpbase.h
View File

@@ -18,7 +18,7 @@
#include "wx/wx.h"
#if USE_HELP
#if wxUSE_HELP
// Defines the API for help controllers
class WXDLLEXPORT wxHelpControllerBase: public wxObject
@@ -46,6 +46,6 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
virtual void OnQuit(void) {};
};
#endif // USE_HELP
#endif // wxUSE_HELP
#endif
// _WX_HELPBASEH__

6
include/wx/memory.h
View File

@@ -23,11 +23,11 @@
info, or to be a straight call to the new operator.
*/
#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
#include <stddef.h>
#if USE_IOSTREAMH
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>
@@ -48,7 +48,7 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
// Currently, these merely call malloc and free; only the wxObject
// operators do something interesting. But this allows WXDEBUG_NEW to
// work for all 'new's in a file.
#if USE_GLOBAL_MEMORY_OPERATORS
#if wxUSE_GLOBAL_MEMORY_OPERATORS
#ifdef new
#undef new

6
include/wx/motif/menuitem.h
View File

@@ -25,7 +25,7 @@
// an exception to the general rule that a normal header doesn't include other
// headers - only because ownerdrw.h is not always included and I don't want
// to write #ifdef's everywhere...
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
#include "wx/ownerdrw.h"
#endif
@@ -40,7 +40,7 @@
// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMenuItem: public wxObject
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
, public wxOwnerDrawn
#endif
{
@@ -99,7 +99,7 @@ private:
wxMenuBar* m_menuBar;
wxMenu* m_topMenu; // Top-level menu e.g. popup-menu
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
// wxOwnerDrawn base class already has these variables - nothing to do
#else //!owner drawn

52
include/wx/motif/setup.h
View File

@@ -17,9 +17,9 @@
*
*/
#define USE_CONSTRAINTS 1
#define wxUSE_CONSTRAINTS 1
// Use constraints mechanism
#define USE_CONFIG 1
#define wxUSE_CONFIG 1
// Use wxConfig, with CreateConfig in wxApp
#define _WX_GOODCOMPILER__
// gcc can have problems, but Windows compilers
@@ -30,51 +30,51 @@
// Level 1: wxDC, OnSize (etc.) compatibility, but
// some new features such as event tables
#define USE_POSTSCRIPT 1
#define wxUSE_POSTSCRIPT 1
// 0 for no PostScript device context
#define USE_AFM_FOR_POSTSCRIPT 0
#define wxUSE_AFM_FOR_POSTSCRIPT 0
// 1 to use font metric files in GetTextExtent
#define USE_METAFILE 1
#define wxUSE_METAFILE 1
// 0 for no Metafile and metafile device context
#define USE_IPC 1
#define wxUSE_IPC 1
// 0 for no interprocess comms
#define USE_HELP 1
#define wxUSE_HELP 1
// 0 for no help facility
#define USE_RESOURCES 1
#define wxUSE_RESOURCES 1
// 0 for no wxGetResource/wxWriteResource
#define USE_CLIPBOARD 1
#define wxUSE_CLIPBOARD 1
// 0 for no clipboard functions
#define USE_SPLINES 1
#define wxUSE_SPLINES 1
// 0 for no splines
#define USE_XFIG_SPLINE_CODE 1
#define wxUSE_XFIG_SPLINE_CODE 1
// 1 for XFIG spline code, 0 for AIAI spline code.
// AIAI spline code is slower, but freer of copyright issues.
// 0 for no splines
#define USE_TOOLBAR 1
#define wxUSE_TOOLBAR 1
// Use toolbars
#define USE_DRAG_AND_DROP 1
#define wxUSE_DRAG_AND_DROP 1
// 0 for no drag and drop
#define USE_WX_RESOURCES 1
#define wxUSE_WX_RESOURCES 1
// Use .wxr resource mechanism (requires PrologIO library)
#define USE_DOC_VIEW_ARCHITECTURE 1
#define wxUSE_DOC_VIEW_ARCHITECTURE 1
// Set to 0 to disable document/view architecture
#define USE_PRINTING_ARCHITECTURE 1
#define wxUSE_PRINTING_ARCHITECTURE 1
// Set to 0 to disable print/preview architecture code
#define USE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
// Set to 0 to disable PostScript print/preview architecture code
// under Windows (just use Windows printing).
#define USE_DYNAMIC_CLASSES 1
#define wxUSE_DYNAMIC_CLASSES 1
// If 1, enables provision of run-time type information.
// NOW MANDATORY: don't change.
#define USE_MEMORY_TRACING 1
#define wxUSE_MEMORY_TRACING 1
// If 1, enables debugging versions of wxObject::new and
// wxObject::delete *IF* WXDEBUG is also defined.
// WARNING: this code may not work with all architectures, especially
// if alignment is an issue.
#define USE_DEBUG_CONTEXT 1
#define wxUSE_DEBUG_CONTEXT 1
// If 1, enables wxDebugContext, for
// writing error messages to file, etc.
// If WXDEBUG is not defined, will still use
@@ -83,7 +83,7 @@
// since you may well need to output
// an error log in a production
// version (or non-debugging beta)
#define USE_GLOBAL_MEMORY_OPERATORS 0
#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
// In debug mode, cause new and delete to be redefined globally.
// If this causes problems (e.g. link errors), set this to 0.
@@ -91,18 +91,18 @@
// Set this to 0 if your compiler can't cope
// with omission of prototype parameters.
#define USE_C_MAIN 0
#define wxUSE_C_MAIN 0
// Set to 1 to use main.c instead of main.cpp (UNIX only)
#define USE_ODBC 0
#define wxUSE_ODBC 0
// Define 1 to use ODBC classes
#define USE_IOSTREAMH 1
#define wxUSE_IOSTREAMH 1
// VC++ 4.2 and above allows <iostream> and <iostream.h>
// but you can't mix them. Set to 1 for <iostream.h>,
// 0 for <iostream>
#define USE_WXCONFIG 1
#define wxUSE_WXCONFIG 1
// if enabled, compiles built-in OS independent wxConfig
// class and it's file (any platform) and registry (Win)
// based implementations
@@ -111,7 +111,7 @@
*
*/
#define USE_APPLE_IEEE 1
#define wxUSE_APPLE_IEEE 1
// if enabled, the float codec written by Apple
// will be used to write, in a portable way,
// float on the disk

2
include/wx/motif/textctrl.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h"
#if USE_IOSTREAMH
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>

10
include/wx/motif/window.h
View File

@@ -67,11 +67,11 @@ class WXDLLEXPORT wxIcon;
class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxValidator;
#if USE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
class WXDLLEXPORT wxDropTarget;
#endif
#if USE_WX_RESOURCES
#if wxUSE_WX_RESOURCES
class WXDLLEXPORT wxResourceTable;
class WXDLLEXPORT wxItemResource;
#endif
@@ -193,7 +193,7 @@ public:
// Enable or disable the window
virtual void Enable(bool enable);
#if USE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
// Associate a drop target with this window (if the window already had a drop
// target, it's deleted!) and return the current drop target (may be NULL).
void SetDropTarget(wxDropTarget *pDropTarget);
@@ -336,7 +336,7 @@ public:
virtual void OnDefaultAction(wxControl *initiatingItem);
// Resource loading
#if USE_WX_RESOURCES
#if wxUSE_WX_RESOURCES
virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = NULL);
virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = NULL);
#endif
@@ -532,7 +532,7 @@ protected:
wxColour m_defaultForegroundColour;
wxAcceleratorTable m_acceleratorTable;
#if USE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
wxDropTarget *m_pDropTarget; // the current drop target or NULL
#endif //USE_DRAG_AND_DROP

2
include/wx/msw/bitmap.h
View File

@@ -130,7 +130,7 @@ public:
// Initialize with raw data
wxBitmap(const char bits[], int width, int height, int depth = 1);
#if USE_XPM_IN_MSW
#if wxUSE_XPM_IN_MSW
class wxItem;
// Initialize with XPM data
wxBitmap(const char **data, wxItem *anItem = NULL);

4
include/wx/msw/clipbrd.h
View File

@@ -19,7 +19,7 @@
#include "wx/defs.h"
#include "wx/setup.h"
#if USE_CLIPBOARD
#if wxUSE_CLIPBOARD
#include "wx/list.h"
@@ -106,6 +106,6 @@ void WXDLLEXPORT wxInitClipboard(void);
/* The clipboard */
WXDLLEXPORT_DATA(extern wxClipboard*) wxTheClipboard;
#endif // USE_CLIPBOARD
#endif // wxUSE_CLIPBOARD
#endif
// _WX_CLIPBRD_H_

4
include/wx/msw/combobox.h
View File

@@ -18,7 +18,7 @@
#include "wx/choice.h"
#if USE_COMBOBOX
#if wxUSE_COMBOBOX
WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
@@ -78,6 +78,6 @@ class WXDLLEXPORT wxComboBox: public wxChoice
virtual bool MSWCommand(WXUINT param, WXWORD id);
};
#endif // USE_COMBOBOX
#endif // wxUSE_COMBOBOX
#endif
// _WX_COMBOBOX_H_

2
include/wx/msw/dc.h
View File

@@ -133,7 +133,7 @@ public:
return Blit(destPt.x, destPt.y, sz.x, sz.y, source, srcPt.x, srcPt.y, rop, useMask);
}
#if USE_SPLINES
#if wxUSE_SPLINES
// Splines
// 3-point spline
virtual void DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3);

4
include/wx/msw/helpwin.h
View File

@@ -18,7 +18,7 @@
#include "wx/wx.h"
#if USE_HELP
#if wxUSE_HELP
#include "wx/helpbase.h"
@@ -49,6 +49,6 @@ protected:
wxString m_helpFile;
};
#endif // USE_HELP
#endif // wxUSE_HELP
#endif
// _WX_HELPWIN_H_

6
include/wx/msw/listbox.h
View File

@@ -20,7 +20,7 @@
WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
class WXDLLEXPORT wxOwnerDrawn;
// define the array of list box items
@@ -63,7 +63,7 @@ class WXDLLEXPORT wxListBox: public wxControl
bool MSWCommand(WXUINT param, WXWORD id);
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
@@ -125,7 +125,7 @@ class WXDLLEXPORT wxListBox: public wxControl
int m_noItems;
int m_selected;
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
// control items
wxListBoxItemsArray m_aItems;
#endif

6
include/wx/msw/menuitem.h
View File

@@ -25,7 +25,7 @@
// an exception to the general rule that a normal header doesn't include other
// headers - only because ownerdrw.h is not always included and I don't want
// to write #ifdef's everywhere...
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
#include "wx/ownerdrw.h"
#endif
@@ -40,7 +40,7 @@
// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMenuItem: public wxObject
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
, public wxOwnerDrawn
#endif
{
@@ -79,7 +79,7 @@ private:
bool m_bEnabled, // enabled or greyed?
m_bChecked; // checked? (only if checkable)
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
// wxOwnerDrawn base class already has these variables - nothing to do
#else //!owner drawn

4
include/wx/msw/metafile.h
View File

@@ -19,7 +19,7 @@
#include "wx/setup.h"
#if USE_METAFILE
#if wxUSE_METAFILE
#include "wx/dc.h"
/*
@@ -99,6 +99,6 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, float scale =
// Optional origin and extent
bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE);
#endif // USE_METAFILE
#endif // wxUSE_METAFILE
#endif
// _WX_METAFIILE_H_

2
include/wx/msw/ole/dropsrc.h
View File

@@ -17,7 +17,7 @@
#endif
#if !USE_DRAG_AND_DROP
#error "You should #define USE_DRAG_AND_DROP to 1 to compile this file!"
#error "You should #define wxUSE_DRAG_AND_DROP to 1 to compile this file!"
#endif //WX_DRAG_DROP
// ----------------------------------------------------------------------------

2
include/wx/msw/ole/droptgt.h
View File

@@ -20,7 +20,7 @@
#endif
#if !USE_DRAG_AND_DROP
#error "You should #define USE_DRAG_AND_DROP to 1 to compile this file!"
#error "You should #define wxUSE_DRAG_AND_DROP to 1 to compile this file!"
#endif //WX_DRAG_DROP
// ----------------------------------------------------------------------------

4
include/wx/msw/private.h
View File

@@ -67,13 +67,13 @@ typedef signed short int SHORT ;
#define DLGPROC FARPROC
#endif
#if USE_PENWIN
#if wxUSE_PENWIN
void WXDLLEXPORT wxRegisterPenWin(void);
void WXDLLEXPORT wxCleanUpPenWin(void);
void WXDLLEXPORT wxEnablePenAppHooks (bool hook);
#endif
#if USE_ITSY_BITSY
#if wxUSE_ITSY_BITSY
#define IBS_HORZCAPTION 0x4000L
#define IBS_VERTCAPTION 0x8000L

2
include/wx/msw/registry.h
View File

@@ -19,7 +19,7 @@
// ----------------------------------------------------------------------------
// mutable hack (see also registry.cpp)
// ----------------------------------------------------------------------------
#if USE_MUTABLE
#if wxUSE_MUTABLE
#define MUTABLE mutable
#else
#define MUTABLE

188
include/wx/msw/setup.h
View File

@@ -17,7 +17,7 @@
*
*/
#define USE_CONFIG 1
#define wxUSE_CONFIG 1
// Use wxConfig, with CreateConfig in wxApp
#define _WX_GOODCOMPILER__
// gcc can have problems, but Windows compilers
@@ -28,75 +28,75 @@
// Level 1: wxDC, OnSize (etc.) compatibility, but
// some new features such as event tables
#define USE_AUTOTRANS 1
#define wxUSE_AUTOTRANS 1
// Define wxTString
#define USE_POSTSCRIPT 1
#define wxUSE_POSTSCRIPT 1
// 0 for no PostScript device context
#define USE_AFM_FOR_POSTSCRIPT 0
#define wxUSE_AFM_FOR_POSTSCRIPT 0
// 1 to use font metric files in GetTextExtent
#define USE_METAFILE 1
#define wxUSE_METAFILE 1
// 0 for no Metafile and metafile device context
#define USE_FORM 0
#define wxUSE_FORM 0
// 0 for no wxForm
#define USE_IPC 1
#define wxUSE_IPC 1
// 0 for no interprocess comms
// Note: wxHELP uses IPC under X so these are interdependent!
#define USE_HELP 1
#define wxUSE_HELP 1
// 0 for no help facility
#define USE_RESOURCES 1
#define wxUSE_RESOURCES 1
// 0 for no wxGetResource/wxWriteResource
#define USE_CONSTRAINTS 1
#define wxUSE_CONSTRAINTS 1
// 0 for no window layout constraint system
#define USE_TIMEDATE 1
#define wxUSE_TIMEDATE 1
// 0 for no wxTime/wxDate classes
#define USE_CLIPBOARD 1
#define wxUSE_CLIPBOARD 1
// 0 for no clipboard functions
#define USE_SPLINES 1
#define wxUSE_SPLINES 1
// 0 for no splines
#define USE_XFIG_SPLINE_CODE 1
#define wxUSE_XFIG_SPLINE_CODE 1
// 1 for XFIG spline code, 0 for AIAI spline code.
// AIAI spline code is slower, but freer of copyright issues.
#define USE_DRAG_AND_DROP 1
#define wxUSE_DRAG_AND_DROP 1
// 0 for no drag and drop
#define USE_TOOLBAR 1
#define wxUSE_TOOLBAR 1
// Define 1 to use toolbar classes
#define USE_BUTTONBAR 1
#define wxUSE_BUTTONBAR 1
// Define 1 to use buttonbar classes (enhanced toolbar
// for MS Windows)
#define USE_GAUGE 1
#define wxUSE_GAUGE 1
// Define 1 to use Microsoft's gauge (Windows)
// or Bull's gauge (Motif) library (both in contrib).
#define USE_COMBOBOX 1
#define wxUSE_COMBOBOX 1
// Define 1 to use COMBOXBOX control (Windows)
// or FWW's ComboBox widget (Motif).
#define USE_RADIOBUTTON 1
#define wxUSE_RADIOBUTTON 1
// Define 1 to use radio button control
#define USE_SCROLLBAR 1
#define wxUSE_SCROLLBAR 1
// Define 1 to compile contributed wxScrollBar class
#define USE_XPM_IN_X 1
#define USE_XPM_IN_MSW 0
#define wxUSE_XPM_IN_X 1
#define wxUSE_XPM_IN_MSW 0
// Define 1 to support the XPM package in wxBitmap,
// separated by platform. If 1, you must link in
// the XPM library to your applications.
#define USE_IMAGE_LOADING_IN_X 1
#define wxUSE_IMAGE_LOADING_IN_X 1
// Use dynamic icon/bitmap loading/saving code in utils/image under X.
// If this is 1, you will need to link your applications
// with image_X.lib. where X is motif, ol, or hp.
#define USE_IMAGE_LOADING_IN_MSW 1
#define wxUSE_IMAGE_LOADING_IN_MSW 1
// Use dynamic DIB loading/saving code in utils/dib under MSW.
#define USE_RESOURCE_LOADING_IN_MSW 0
#define wxUSE_RESOURCE_LOADING_IN_MSW 0
// Use dynamic icon/cursor loading/saving code
// under MSW.
#define USE_WX_RESOURCES 1
#define wxUSE_WX_RESOURCES 1
// Use .wxr resource mechanism (requires PrologIO library)
#define USE_GNU_WXSTRING 0
#define wxUSE_GNU_WXSTRING 0
// Define 1 to use modified GNU wxString class
// from (stefan.hammes@urz.uni-heidelberg.de) in contrib\string
// TODO: why does this give an unresolved 'wxRegex::Search'
@@ -104,22 +104,22 @@
#define HAVE_SOCKET 1
// Use WinSock if 1
#define USE_DOC_VIEW_ARCHITECTURE 1
#define wxUSE_DOC_VIEW_ARCHITECTURE 1
// Set to 0 to disable document/view architecture
#define USE_PRINTING_ARCHITECTURE 1
#define wxUSE_PRINTING_ARCHITECTURE 1
// Set to 0 to disable print/preview architecture code
#define USE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
// Set to 0 to disable PostScript print/preview architecture code
// under Windows (just use Windows printing).
#define USE_DYNAMIC_CLASSES 1
#define wxUSE_DYNAMIC_CLASSES 1
// If 1, enables provision of run-time type information.
// NOW MANDATORY: don't change.
#define USE_MEMORY_TRACING 1
#define wxUSE_MEMORY_TRACING 1
// If 1, enables debugging versions of wxObject::new and
// wxObject::delete *IF* WXDEBUG is also defined.
// WARNING: this code may not work with all architectures, especially
// if alignment is an issue.
#define USE_DEBUG_CONTEXT 1
#define wxUSE_DEBUG_CONTEXT 1
// If 1, enables wxDebugContext, for
// writing error messages to file, etc.
// If WXDEBUG is not defined, will still use
@@ -128,7 +128,7 @@
// since you may well need to output
// an error log in a production
// version (or non-debugging beta)
#define USE_GLOBAL_MEMORY_OPERATORS 1
#define wxUSE_GLOBAL_MEMORY_OPERATORS 1
// In debug mode, cause new and delete to be redefined globally.
// If this causes problems (e.g. link errors), set this to 0.
@@ -136,18 +136,18 @@
// Set this to 0 if your compiler can't cope
// with omission of prototype parameters.
#define USE_C_MAIN 0
#define wxUSE_C_MAIN 0
// Set to 1 to use main.c instead of main.cpp (UNIX only)
#define USE_ODBC 1
#define wxUSE_ODBC 1
// Define 1 to use ODBC classes
#define USE_IOSTREAMH 1
#define wxUSE_IOSTREAMH 1
// VC++ 4.2 and above allows <iostream> and <iostream.h>
// but you can't mix them. Set to 1 for <iostream.h>,
// 0 for <iostream>
#define USE_WXCONFIG 1
#define wxUSE_WXCONFIG 1
// if enabled, compiles built-in OS independent wxConfig
// class and it's file (any platform) and registry (Win)
// based implementations
@@ -156,7 +156,7 @@
*
*/
#define USE_APPLE_IEEE 1
#define wxUSE_APPLE_IEEE 1
// if enabled, the float codec written by Apple
// will be used to write, in a portable way,
// float on the disk
@@ -174,35 +174,35 @@
// See note above about using FAFA and CTL3D.
#endif
#define USE_COMMON_DIALOGS 1
#define wxUSE_COMMON_DIALOGS 1
// On rare occasions (e.g. using DJGPP) may want
// to omit common dialogs
// (e.g. file selector, printer dialog).
// Switching this off also switches off
// the printing architecture and interactive
// wxPrinterDC.
#define USE_ITSY_BITSY 1
#define wxUSE_ITSY_BITSY 1
// Define 1 to use Microsoft's ItsyBitsy
// small title bar library, for wxMiniFrame
#define USE_BITMAP_MESSAGE 1
#define wxUSE_BITMAP_MESSAGE 1
// Define 1 to use bitmap messages.
#define USE_PORTABLE_FONTS_IN_MSW 0
#define wxUSE_PORTABLE_FONTS_IN_MSW 0
// Define 1 to use new portable font scheme in Windows
// (used by default under X)
#define FONT_SIZE_COMPATIBILITY 0
// Define 1 for font size to be backward compatible
// to 1.63 and earlier. 1.64 and later define point
// sizes to be compatible with Windows.
#define USE_GENERIC_DIALOGS_IN_MSW 1
#define wxUSE_GENERIC_DIALOGS_IN_MSW 1
// Define 1 to use generic dialogs in Windows, even though
// they duplicate native common dialog (e.g. wxColourDialog)
#define USE_PENWINDOWS 0
#define wxUSE_PENWINDOWS 0
// Set to 1 to use PenWindows
#define USE_OWNER_DRAWN 0
#define wxUSE_OWNER_DRAWN 0
// Owner-drawn menus and listboxes
#define USE_NATIVE_STATUSBAR 1
#define wxUSE_NATIVE_STATUSBAR 1
// Set to 0 to use cross-platform wxStatusBar
/*
@@ -210,7 +210,7 @@
*
*/
#define USE_TYPEDEFS 0
#define wxUSE_TYPEDEFS 0
// Use typedefs not classes for wxPoint
// and others, to reduce overhead and avoid
// MS C7 memory bug. Bounds checker
@@ -221,62 +221,62 @@
// Can't use OLE drag and drop in Windows 3.1 because we don't know how
// to implement UUIDs
// GnuWin32 doesn't have appropriate headers for e.g. IUnknown.
#undef USE_DRAG_AND_DROP
#define USE_DRAG_AND_DROP 0
#undef wxUSE_DRAG_AND_DROP
#define wxUSE_DRAG_AND_DROP 0
#endif
// Only WIN32 supports wxStatusBar95
#if !defined(__WIN32__) && USE_NATIVE_STATUSBAR
#undef USE_NATIVE_STATUSBAR
#define USE_NATIVE_STATUSBAR 0
#if !defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
#undef wxUSE_NATIVE_STATUSBAR
#define wxUSE_NATIVE_STATUSBAR 0
#endif
// Minimal setup e.g. for compiling small utilities
#define MINIMAL_WXWINDOWS_SETUP 0
#if MINIMAL_WXWINDOWS_SETUP
#undef USE_POSTSCRIPT
# define USE_POSTSCRIPT 0
#undef USE_PRINTING_ARCHITECTURE
# define USE_PRINTING_ARCHITECTURE 0
#undef USE_POSTSCRIPT_ARCHITECTURE_IN_MSW
# define USE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
#undef USE_METAFILE
# define USE_METAFILE 0
#undef USE_FORM
# define USE_FORM 0
#undef USE_SPLINES
# define USE_SPLINES 0
#undef USE_SCROLLBAR
# define USE_SCROLLBAR 0
#undef USE_COMBOBOX
# define USE_COMBOBOX 0
#undef USE_RADIOBUTTON
# define USE_RADIOBUTTON 0
#undef USE_XPM_IN_MSW
# define USE_XPM_IN_MSW 0
#undef USE_WX_RESOURCES
# define USE_WX_RESOURCES 0
#undef USE_DOC_VIEW_ARCHITECTURE
# define USE_DOC_VIEW_ARCHITECTURE 0
#undef USE_GNU_WXSTRING
# define USE_GNU_WXSTRING 0
#undef USE_ODBC
# define USE_ODBC 0
#undef USE_TIMEDATE
# define USE_TIMEDATE 0
#undef wxUSE_POSTSCRIPT
# define wxUSE_POSTSCRIPT 0
#undef wxUSE_PRINTING_ARCHITECTURE
# define wxUSE_PRINTING_ARCHITECTURE 0
#undef wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW
# define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
#undef wxUSE_METAFILE
# define wxUSE_METAFILE 0
#undef wxUSE_FORM
# define wxUSE_FORM 0
#undef wxUSE_SPLINES
# define wxUSE_SPLINES 0
#undef wxUSE_SCROLLBAR
# define wxUSE_SCROLLBAR 0
#undef wxUSE_COMBOBOX
# define wxUSE_COMBOBOX 0
#undef wxUSE_RADIOBUTTON
# define wxUSE_RADIOBUTTON 0
#undef wxUSE_XPM_IN_MSW
# define wxUSE_XPM_IN_MSW 0
#undef wxUSE_WX_RESOURCES
# define wxUSE_WX_RESOURCES 0
#undef wxUSE_DOC_VIEW_ARCHITECTURE
# define wxUSE_DOC_VIEW_ARCHITECTURE 0
#undef wxUSE_GNU_WXSTRING
# define wxUSE_GNU_WXSTRING 0
#undef wxUSE_ODBC
# define wxUSE_ODBC 0
#undef wxUSE_TIMEDATE
# define wxUSE_TIMEDATE 0
#undef CTL3D
# define CTL3D 0
#undef USE_ITSY_BITSY
# define USE_ITSY_BITSY 0
#undef USE_IMAGE_LOADING_IN_MSW
# define USE_IMAGE_LOADING_IN_MSW 0
#undef USE_GAUGE
# define USE_GAUGE 0
#undef USE_RESOURCE_LOADING_IN_MSW
# define USE_RESOURCE_LOADING_IN_MSW 0
#undef USE_DRAG_AND_DROP
# define USE_DRAG_AND_DROP 0
#undef wxUSE_ITSY_BITSY
# define wxUSE_ITSY_BITSY 0
#undef wxUSE_IMAGE_LOADING_IN_MSW
# define wxUSE_IMAGE_LOADING_IN_MSW 0
#undef wxUSE_GAUGE
# define wxUSE_GAUGE 0
#undef wxUSE_RESOURCE_LOADING_IN_MSW
# define wxUSE_RESOURCE_LOADING_IN_MSW 0
#undef wxUSE_DRAG_AND_DROP
# define wxUSE_DRAG_AND_DROP 0
#endif
#endif

4
include/wx/msw/statbr95.h
View File

@@ -16,7 +16,7 @@
#pragma interface "statbr95.h"
#endif
#if USE_NATIVE_STATUSBAR
#if wxUSE_NATIVE_STATUSBAR
class WXDLLEXPORT wxStatusBar95 : public wxStatusBar
{
@@ -50,6 +50,6 @@ protected:
void SetFieldsWidth();
};
#endif // USE_NATIVE_STATUSBAR
#endif // wxUSE_NATIVE_STATUSBAR
#endif //_STATBR95_H

4
include/wx/msw/tbar95.h
View File

@@ -16,7 +16,7 @@
#pragma interface "tbar95.h"
#endif
#if USE_BUTTONBAR && USE_TOOLBAR
#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
#include "wx/tbarbase.h"
WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
@@ -93,6 +93,6 @@ protected:
DECLARE_EVENT_TABLE()
};
#endif // USE_TOOL/BUTTONBAR
#endif // wxUSE_TOOL/BUTTONBAR
#endif
// _WX_TBAR95_H_

4
include/wx/msw/tbarmsw.h
View File

@@ -16,7 +16,7 @@
#pragma interface "tbarmsw.h"
#endif
#if USE_BUTTONBAR && USE_TOOLBAR
#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
#include "wx/tbarbase.h"
WXDLLEXPORT_DATA(extern const char*) wxButtonBarNameStr;
@@ -118,6 +118,6 @@ DECLARE_EVENT_TABLE()
#define wxTBSTATE_HIDDEN 0x08 // button is hidden
#define wxTBSTATE_INDETERMINATE 0x10 // button is indeterminate
#endif // USE_TOOL/BUTTONBAR
#endif // wxUSE_TOOL/BUTTONBAR
#endif
// _WX_TBARMSW_H_

2
include/wx/msw/textctrl.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h"
#if USE_IOSTREAMH
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>

12
include/wx/msw/window.h
View File

@@ -67,11 +67,11 @@ class WXDLLEXPORT wxIcon;
class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxValidator;
#if USE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
class WXDLLEXPORT wxDropTarget;
#endif
#if USE_WX_RESOURCES
#if wxUSE_WX_RESOURCES
class WXDLLEXPORT wxResourceTable;
class WXDLLEXPORT wxItemResource;
#endif
@@ -193,7 +193,7 @@ public:
// Enable or disable the window
virtual void Enable(bool enable);
#if USE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
// Associate a drop target with this window (if the window already had a drop
// target, it's deleted!) and return the current drop target (may be NULL).
void SetDropTarget(wxDropTarget *pDropTarget);
@@ -357,7 +357,7 @@ public:
virtual void OnDefaultAction(wxControl *initiatingItem);
// Resource loading
#if USE_WX_RESOURCES
#if wxUSE_WX_RESOURCES
virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = NULL);
virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = NULL);
#endif
@@ -633,7 +633,7 @@ protected:
bool m_winCaptured;
wxString m_windowName; // Window name
#if USE_EXTENDED_STATICS
#if wxUSE_EXTENDED_STATICS
wxList m_staticItems;
#endif
@@ -656,7 +656,7 @@ protected:
bool m_mouseInWindow;
#if USE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
wxDropTarget *m_pDropTarget; // the current drop target or NULL
#endif //USE_DRAG_AND_DROP

16
include/wx/object.h
View File

@@ -21,7 +21,7 @@
class WXDLLEXPORT wxObject;
#if USE_DYNAMIC_CLASSES
#if wxUSE_DYNAMIC_CLASSES
#ifdef __GNUWIN32__
#ifdef GetClassName
@@ -89,7 +89,7 @@ public:
wxObject* WXDLLEXPORT wxCreateDynamicObject(const char *name);
#ifdef USE_SERIAL
#ifdef wxUSE_SERIAL
wxObject* WXDLLEXPORT wxCreateStoredObject( wxInputStream& stream );
#endif
@@ -155,7 +155,7 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
// Unfortunately Borland seems to need this include.
#ifdef __BORLANDC__
#if USE_IOSTREAMH
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>
@@ -178,7 +178,7 @@ class WXDLLEXPORT wxObject
bool IsKindOf(wxClassInfo *info) const;
#if WXDEBUG && USE_MEMORY_TRACING
#if WXDEBUG && wxUSE_MEMORY_TRACING
void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
void operator delete (void * buf);
@@ -195,11 +195,11 @@ class WXDLLEXPORT wxObject
#endif
#if WXDEBUG || USE_DEBUG_CONTEXT
#if WXDEBUG || wxUSE_DEBUG_CONTEXT
virtual void Dump(ostream& str);
#endif
#ifdef USE_SERIAL
#ifdef wxUSE_SERIAL
virtual void StoreObject( wxObjectOutputStream &stream );
virtual void LoadObject( wxObjectInputStream &stream );
#endif
@@ -215,7 +215,7 @@ class WXDLLEXPORT wxObject
protected:
wxObjectRefData* m_refData;
#ifdef USE_SERIAL
#ifdef wxUSE_SERIAL
wxObject_Serialize* m_serialObj;
#endif
};
@@ -237,7 +237,7 @@ private:
int m_count;
};
#if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS
#if WXDEBUG && wxUSE_GLOBAL_MEMORY_OPERATORS
//#ifndef WXDEBUG_NEW
//#define WXDEBUG_NEW new(__FILE__,__LINE__)
//#endif

4
include/wx/odbc.h
View File

@@ -11,7 +11,7 @@
#include "wx/setup.h"
#if USE_ODBC
#if wxUSE_ODBC
#ifdef __GNUG__
#pragma interface "odbc.h"
@@ -331,4 +331,4 @@ class WXDLLEXPORT wxRecordSet: public wxObject
#endif
#endif // USE_ODBC
#endif // wxUSE_ODBC

4
include/wx/postscrp.h
View File

@@ -19,7 +19,7 @@
#include "wx/dc.h"
#include "wx/dialog.h"
#if USE_POSTSCRIPT
#if wxUSE_POSTSCRIPT
class WXDLLIMPORT ofstream;
class WXDLLEXPORT wxPostScriptDC: public wxDC
@@ -294,6 +294,6 @@ class WXDLLEXPORT wxPrintPaperDatabase: public wxList
WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;
#endif // USE_POSTSCRIPT
#endif // wxUSE_POSTSCRIPT
#endif
// _WX_POSTSCRPH__

2
include/wx/qt/textctrl.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h"
#if USE_IOSTREAMH
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>

10
include/wx/qt/window.h
View File

@@ -66,11 +66,11 @@ class WXDLLEXPORT wxIcon;
class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxValidator;
#if USE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
class WXDLLEXPORT wxDropTarget;
#endif
#if USE_WX_RESOURCES
#if wxUSE_WX_RESOURCES
class WXDLLEXPORT wxResourceTable;
class WXDLLEXPORT wxItemResource;
#endif
@@ -192,7 +192,7 @@ public:
// Enable or disable the window
virtual void Enable(bool enable);
#if USE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
// Associate a drop target with this window (if the window already had a drop
// target, it's deleted!) and return the current drop target (may be NULL).
void SetDropTarget(wxDropTarget *pDropTarget);
@@ -329,7 +329,7 @@ public:
virtual void OnDefaultAction(wxControl *initiatingItem);
// Resource loading
#if USE_WX_RESOURCES
#if wxUSE_WX_RESOURCES
virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = NULL);
virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = NULL);
#endif
@@ -480,7 +480,7 @@ protected:
wxColour m_defaultBackgroundColour;
wxColour m_defaultForegroundColour;
#if USE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
wxDropTarget *m_pDropTarget; // the current drop target or NULL
#endif //USE_DRAG_AND_DROP

2
include/wx/resource.h
View File

@@ -18,7 +18,7 @@
#include "wx/setup.h"
#if USE_WX_RESOURCES
#if wxUSE_WX_RESOURCES
#include <stdio.h>
// A few further types not in wx_types.h

4
include/wx/stream.h
View File

@@ -106,7 +106,7 @@ class WXDLLEXPORT wxInputStream {
wxInputStream& operator>>(int& i);
wxInputStream& operator>>(long& i);
wxInputStream& operator>>(float& i);
#if USE_SERIAL
#if wxUSE_SERIAL
wxInputStream& operator>>(wxObject *& obj);
#endif
@@ -160,7 +160,7 @@ class WXDLLEXPORT wxOutputStream {
wxOutputStream& operator<<(int i);
wxOutputStream& operator<<(long i);
wxOutputStream& operator<<(double f);
#if USE_SERIAL
#if wxUSE_SERIAL
wxOutputStream& operator<<(wxObject& obj);
#endif

4
include/wx/string.h
View File

@@ -254,13 +254,13 @@ public:
/** @name generic attributes & operations */
//@{
/// as standard strlen()
size_t Len() const { return GetStringData() ? GetStringData()->nDataLength : 0; }
size_t Len() const { return GetStringData()->nDataLength; }
/// string contains any characters?
bool IsEmpty() const { return Len() == 0; }
/// reinitialize string (and free data!)
void Empty()
{
if ( GetStringData() && GetStringData()->nDataLength != 0 )
if ( GetStringData()->nDataLength != 0 )
Reinit();
wxASSERT( GetStringData()->nDataLength == 0 );

6
include/wx/stubs/menuitem.h
View File

@@ -25,7 +25,7 @@
// an exception to the general rule that a normal header doesn't include other
// headers - only because ownerdrw.h is not always included and I don't want
// to write #ifdef's everywhere...
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
#include "wx/ownerdrw.h"
#endif
@@ -40,7 +40,7 @@
// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxMenuItem: public wxObject
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
, public wxOwnerDrawn
#endif
{
@@ -79,7 +79,7 @@ private:
bool m_bEnabled, // enabled or greyed?
m_bChecked; // checked? (only if checkable)
#if USE_OWNER_DRAWN
#if wxUSE_OWNER_DRAWN
// wxOwnerDrawn base class already has these variables - nothing to do
#else //!owner drawn

52
include/wx/stubs/setup.h
View File

@@ -17,9 +17,9 @@
*
*/
#define USE_CONSTRAINTS 1
#define wxUSE_CONSTRAINTS 1
// Use constraints mechanism
#define USE_CONFIG 1
#define wxUSE_CONFIG 1
// Use wxConfig, with CreateConfig in wxApp
#define _WX_GOODCOMPILER__
// gcc can have problems, but Windows compilers
@@ -30,51 +30,51 @@
// Level 1: wxDC, OnSize (etc.) compatibility, but
// some new features such as event tables
#define USE_POSTSCRIPT 1
#define wxUSE_POSTSCRIPT 1
// 0 for no PostScript device context
#define USE_AFM_FOR_POSTSCRIPT 0
#define wxUSE_AFM_FOR_POSTSCRIPT 0
// 1 to use font metric files in GetTextExtent
#define USE_METAFILE 1
#define wxUSE_METAFILE 1
// 0 for no Metafile and metafile device context
#define USE_IPC 1
#define wxUSE_IPC 1
// 0 for no interprocess comms
#define USE_HELP 1
#define wxUSE_HELP 1
// 0 for no help facility
#define USE_RESOURCES 1
#define wxUSE_RESOURCES 1
// 0 for no wxGetResource/wxWriteResource
#define USE_CLIPBOARD 1
#define wxUSE_CLIPBOARD 1
// 0 for no clipboard functions
#define USE_SPLINES 1
#define wxUSE_SPLINES 1
// 0 for no splines
#define USE_XFIG_SPLINE_CODE 1
#define wxUSE_XFIG_SPLINE_CODE 1
// 1 for XFIG spline code, 0 for AIAI spline code.
// AIAI spline code is slower, but freer of copyright issues.
// 0 for no splines
#define USE_TOOLBAR 1
#define wxUSE_TOOLBAR 1
// Use toolbars
#define USE_DRAG_AND_DROP 1
#define wxUSE_DRAG_AND_DROP 1
// 0 for no drag and drop
#define USE_WX_RESOURCES 1
#define wxUSE_WX_RESOURCES 1
// Use .wxr resource mechanism (requires PrologIO library)
#define USE_DOC_VIEW_ARCHITECTURE 1
#define wxUSE_DOC_VIEW_ARCHITECTURE 1
// Set to 0 to disable document/view architecture
#define USE_PRINTING_ARCHITECTURE 1
#define wxUSE_PRINTING_ARCHITECTURE 1
// Set to 0 to disable print/preview architecture code
#define USE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
// Set to 0 to disable PostScript print/preview architecture code
// under Windows (just use Windows printing).
#define USE_DYNAMIC_CLASSES 1
#define wxUSE_DYNAMIC_CLASSES 1
// If 1, enables provision of run-time type information.
// NOW MANDATORY: don't change.
#define USE_MEMORY_TRACING 1
#define wxUSE_MEMORY_TRACING 1
// If 1, enables debugging versions of wxObject::new and
// wxObject::delete *IF* WXDEBUG is also defined.
// WARNING: this code may not work with all architectures, especially
// if alignment is an issue.
#define USE_DEBUG_CONTEXT 1
#define wxUSE_DEBUG_CONTEXT 1
// If 1, enables wxDebugContext, for
// writing error messages to file, etc.
// If WXDEBUG is not defined, will still use
@@ -83,7 +83,7 @@
// since you may well need to output
// an error log in a production
// version (or non-debugging beta)
#define USE_GLOBAL_MEMORY_OPERATORS 0
#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
// In debug mode, cause new and delete to be redefined globally.
// If this causes problems (e.g. link errors), set this to 0.
@@ -91,18 +91,18 @@
// Set this to 0 if your compiler can't cope
// with omission of prototype parameters.
#define USE_C_MAIN 0
#define wxUSE_C_MAIN 0
// Set to 1 to use main.c instead of main.cpp (UNIX only)
#define USE_ODBC 0
#define wxUSE_ODBC 0
// Define 1 to use ODBC classes
#define USE_IOSTREAMH 1
#define wxUSE_IOSTREAMH 1
// VC++ 4.2 and above allows <iostream> and <iostream.h>
// but you can't mix them. Set to 1 for <iostream.h>,
// 0 for <iostream>
#define USE_WXCONFIG 1
#define wxUSE_WXCONFIG 1
// if enabled, compiles built-in OS independent wxConfig
// class and it's file (any platform) and registry (Win)
// based implementations
@@ -111,7 +111,7 @@
*
*/
#define USE_APPLE_IEEE 1
#define wxUSE_APPLE_IEEE 1
// if enabled, the float codec written by Apple
// will be used to write, in a portable way,
// float on the disk

2
include/wx/stubs/textctrl.h
View File

@@ -18,7 +18,7 @@
#include "wx/control.h"
#if USE_IOSTREAMH
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>

10
include/wx/stubs/window.h
View File

@@ -67,11 +67,11 @@ class WXDLLEXPORT wxIcon;
class WXDLLEXPORT wxDC;
class WXDLLEXPORT wxValidator;
#if USE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
class WXDLLEXPORT wxDropTarget;
#endif
#if USE_WX_RESOURCES
#if wxUSE_WX_RESOURCES
class WXDLLEXPORT wxResourceTable;
class WXDLLEXPORT wxItemResource;
#endif
@@ -193,7 +193,7 @@ public:
// Enable or disable the window
virtual void Enable(bool enable);
#if USE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
// Associate a drop target with this window (if the window already had a drop
// target, it's deleted!) and return the current drop target (may be NULL).
void SetDropTarget(wxDropTarget *pDropTarget);
@@ -336,7 +336,7 @@ public:
virtual void OnDefaultAction(wxControl *initiatingItem);
// Resource loading
#if USE_WX_RESOURCES
#if wxUSE_WX_RESOURCES
virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = NULL);
virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = NULL);
#endif
@@ -486,7 +486,7 @@ protected:
wxColour m_defaultForegroundColour;
wxAcceleratorTable m_acceleratorTable;
#if USE_DRAG_AND_DROP
#if wxUSE_DRAG_AND_DROP
wxDropTarget *m_pDropTarget; // the current drop target or NULL
#endif //USE_DRAG_AND_DROP

4
include/wx/tbarsmpl.h
View File

@@ -18,7 +18,7 @@
#include "wx/defs.h"
#if USE_TOOLBAR
#if wxUSE_TOOLBAR
#include "wx/bitmap.h"
#include "wx/list.h"
@@ -75,7 +75,7 @@ DECLARE_EVENT_TABLE()
};
#endif // USE_TOOLBAR
#endif // wxUSE_TOOLBAR
#endif
// _WX_TBARSMPLH__

4
include/wx/time.h
View File

@@ -14,7 +14,7 @@
#include "wx/object.h"
#if USE_TIMEDATE
#if wxUSE_TIMEDATE
#ifdef __GNUG__
#pragma interface "time.h"
@@ -91,7 +91,7 @@ public:
};
#endif
// USE_TIMEDATE
// wxUSE_TIMEDATE
#endif
// _WX_TIMEH__

8
include/wx/utils.h
View File

@@ -23,7 +23,7 @@
#include "wx/filefn.h"
#include "wx/process.h"
#if USE_IOSTREAMH
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>
@@ -182,7 +182,7 @@ class WXDLLEXPORT wxDebugStreamBuf: public streambuf
int sync(void);
};
// #if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS
// #if WXDEBUG && wxUSE_GLOBAL_MEMORY_OPERATORS
// #define new WXDEBUG_NEW
// #endif
@@ -237,7 +237,7 @@ WXDLLEXPORT_DATA(extern const char*) wxFatalErrorStr;
void WXDLLEXPORT wxFatalError(const wxString& msg, const wxString& title = wxFatalErrorStr);
// Reading and writing resources (eg WIN.INI, .Xdefaults)
#if USE_RESOURCES
#if wxUSE_RESOURCES
bool WXDLLEXPORT wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file = "");
bool WXDLLEXPORT wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file = "");
bool WXDLLEXPORT wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file = "");
@@ -247,7 +247,7 @@ bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, c
bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file = "");
bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file = "");
bool WXDLLEXPORT wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file = "");
#endif // USE_RESOURCES
#endif // wxUSE_RESOURCES
// Get current Home dir and copy to dest (returns pstr->c_str())
const char* WXDLLEXPORT wxGetHomeDir(wxString *pstr);

2
include/wx/variant.h
View File

@@ -21,7 +21,7 @@
#include "wx/string.h"
#include "wx/list.h"
#if USE_IOSTREAMH
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>

2
include/wx/wx.h
View File

@@ -65,7 +65,7 @@
#include "wx/dirdlg.h"
#include "wx/cmndata.h"
#include "wx/intl.h"
#ifdef USE_SERIAL
#ifdef wxUSE_SERIAL
#include "wx/objstrm.h"
#include "wx/serbase.h"
#endif

2
include/wx/wxexpr.h
View File

@@ -21,7 +21,7 @@
#include "wx/defs.h"
#include "wx/string.h"
#if USE_IOSTREAMH
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>