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

Consistent naming of e.g. wxUSE_CTRL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-02-02 12:37:14 +00:00
parent 0e1399b392
commit 1f11220943
38 changed files with 202 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/defs.h
View File

@@ -140,7 +140,7 @@
typedef unsigned char bool;
#endif // Sun CC version
#else
#error "Unknown compiler: only Sun's CC and gcc are currently reckognized."
#error "Unknown compiler: only Sun's CC and gcc are currently recognised."
#endif // Sun CC
#endif
@@ -894,6 +894,8 @@ enum
#endif
/* Standard menu identifiers */
#define wxID_LOWEST 4999
#define wxID_OPEN 5000
#define wxID_CLOSE 5001
#define wxID_NEW 5002

4
include/wx/event.h
View File

@@ -1225,8 +1225,8 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
{ wxEVT_LEAVE_WINDOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, (wxObject *) NULL },
// EVT_COMMAND
#define EVT_COMMAND(id, cmd, fn) { cmd, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_COMMAND_RANGE(id1, id2, cmd, fn) { cmd, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_COMMAND(id, event, fn) { event, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_COMMAND_RANGE(id1, id2, event, fn) { eventId, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
// Scrolling
#define EVT_SCROLL(func) \

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

@@ -244,6 +244,18 @@ public:
// Accept files for dragging
virtual void DragAcceptFiles(bool accept);
// tooltips
// create a tooltip with this text
void SetToolTip(const wxString& tip);
// TODO
#if 0
// pointer may be NULL to remove the tooltip
void SetToolTip(wxToolTip *tooltip);
// get the current tooltip (may return NULL if none)
wxToolTip* GetToolTip() const { return m_tooltip; }
#endif
// Update region access
virtual wxRegion& GetUpdateRegion() const;
virtual bool IsExposed(int x, int y, int w, int h) const;

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

@@ -111,7 +111,7 @@ VOID WINAPI ibAdjustWindowRect( HWND hWnd, LPRECT lprc ) ;
*
*/
#if CTL3D
#if wxUSE_CTL3D
#include <wx/msw/ctl3d/ctl3d.h>
#endif

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

@@ -19,26 +19,20 @@
#define wxUSE_CONFIG 1
// Use wxConfig, with CreateConfig in wxApp
#define _WX_GOODCOMPILER__
// gcc can have problems, but Windows compilers
// are generally OK.
#define WXWIN_COMPATIBILITY 1
#define WXWIN_COMPATIBILITY 0
// Compatibility with 1.68 API.
// Level 0: no backward compatibility, all new features
// Level 1: Some compatibility. In fact
// the compatibility code is now very minimal so there
// is little advantage to setting it to 1.
#define wxUSE_AUTOTRANS 1
// Define wxTString
#define wxUSE_POSTSCRIPT 0
// 0 for no PostScript device context
#define wxUSE_AFM_FOR_POSTSCRIPT 0
// 1 to use font metric files in GetTextExtent
#define wxUSE_METAFILE 1
// 0 for no Metafile and metafile device context
#define wxUSE_FORM 0
// 0 for no wxForm
#define wxUSE_IPC 1
// 0 for no interprocess comms
// Note: wxHELP uses IPC under X so these are interdependent!
@@ -54,11 +48,9 @@
#define wxUSE_CLIPBOARD 1
// 0 for no clipboard functions
#define wxUSE_SPLINES 1
// 0 for no splines
#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 wxUSE_DRAG_AND_DROP 1
// 0 for no drag and drop
@@ -95,8 +87,6 @@
#define wxUSE_WX_RESOURCES 0
#endif
#define HAVE_SOCKET 1
// Use WinSock if 1
#define wxUSE_DOC_VIEW_ARCHITECTURE 1
// Set to 0 to disable document/view architecture
#define wxUSE_PRINTING_ARCHITECTURE 1
@@ -164,6 +154,9 @@
// Use standard C++ streams if 1. If 0, use wxWin
// streams implementation.
#define wxUSE_TOOLTIPS 1
// Define to use wxToolTip class and
// wxWindow::SetToolTip() method
/*
* Finer detail
*
@@ -180,9 +173,9 @@
*/
#if defined(__WIN95__)
#define CTL3D 0
#define wxUSE_CTL3D 0
#else
#define CTL3D 1
#define wxUSE_CTL3D 1
// Define 1 to use Microsoft CTL3D library.
// See note above about using FAFA and CTL3D.
#endif
@@ -202,7 +195,7 @@
#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 wxFONT_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.
@@ -288,53 +281,5 @@
#endif
// Minimal setup e.g. for compiling small utilities
#define MINIMAL_WXWINDOWS_SETUP 0
#if MINIMAL_WXWINDOWS_SETUP
#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 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
// _WX_SETUP_H_

68
include/wx/msw/setup0.h
View File

@@ -19,9 +19,7 @@
#define wxUSE_CONFIG 1
// Use wxConfig, with CreateConfig in wxApp
#define _WX_GOODCOMPILER__
// gcc can have problems, but Windows compilers
// are generally OK.
#define WXWIN_COMPATIBILITY 0
// Compatibility with 1.68 API.
// Level 0: no backward compatibility, all new features
@@ -29,16 +27,12 @@
// the compatibility code is now very minimal so there
// is little advantage to setting it to 1.
#define wxUSE_AUTOTRANS 1
// Define wxTString
#define wxUSE_POSTSCRIPT 0
// 0 for no PostScript device context
#define wxUSE_AFM_FOR_POSTSCRIPT 0
// 1 to use font metric files in GetTextExtent
#define wxUSE_METAFILE 1
// 0 for no Metafile and metafile device context
#define wxUSE_FORM 0
// 0 for no wxForm
#define wxUSE_IPC 1
// 0 for no interprocess comms
// Note: wxHELP uses IPC under X so these are interdependent!
@@ -54,11 +48,9 @@
#define wxUSE_CLIPBOARD 1
// 0 for no clipboard functions
#define wxUSE_SPLINES 1
// 0 for no splines
#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 wxUSE_DRAG_AND_DROP 1
// 0 for no drag and drop
@@ -95,8 +87,6 @@
#define wxUSE_WX_RESOURCES 0
#endif
#define HAVE_SOCKET 1
// Use WinSock if 1
#define wxUSE_DOC_VIEW_ARCHITECTURE 1
// Set to 0 to disable document/view architecture
#define wxUSE_PRINTING_ARCHITECTURE 1
@@ -184,9 +174,9 @@
*/
#if defined(__WIN95__)
#define CTL3D 0
#define wxUSE_CTL3D 0
#else
#define CTL3D 1
#define wxUSE_CTL3D 1
// Define 1 to use Microsoft CTL3D library.
// See note above about using FAFA and CTL3D.
#endif
@@ -206,7 +196,7 @@
#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 wxFONT_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.
@@ -292,53 +282,5 @@
#endif
// Minimal setup e.g. for compiling small utilities
#define MINIMAL_WXWINDOWS_SETUP 0
#if MINIMAL_WXWINDOWS_SETUP
#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 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
// _WX_SETUP_H_

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

@@ -230,6 +230,18 @@ public:
// Accept files for dragging
virtual void DragAcceptFiles(bool accept);
// tooltips
// create a tooltip with this text
void SetToolTip(const wxString& tip);
// TODO
#if 0
// pointer may be NULL to remove the tooltip
void SetToolTip(wxToolTip *tooltip);
// get the current tooltip (may return NULL if none)
wxToolTip* GetToolTip() const { return m_tooltip; }
#endif
// Update region access
virtual wxRegion GetUpdateRegion() const;
virtual bool IsExposed(int x, int y, int w, int h) const;