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

must recompile everything after upgrading!


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/confbase.h

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

include/wx/date.h

@@ -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};
 

include/wx/docview.h

@@ -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)

include/wx/fileconf.h

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

include/wx/generic/helpxlp.h

@@ -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__

include/wx/gtk/menuitem.h

@@ -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

include/wx/gtk/textctrl.h

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

include/wx/gtk1/menuitem.h

@@ -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

include/wx/gtk1/textctrl.h

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

include/wx/helpbase.h

@@ -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__

include/wx/memory.h

@@ -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

include/wx/motif/menuitem.h

@@ -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

include/wx/motif/setup.h

@@ -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

include/wx/motif/textctrl.h

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

include/wx/motif/window.h

@@ -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
 

include/wx/msw/bitmap.h

@@ -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);

include/wx/msw/clipbrd.h

@@ -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_

include/wx/msw/combobox.h

@@ -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_

include/wx/msw/dc.h

@@ -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);

include/wx/msw/helpwin.h

@@ -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_

include/wx/msw/listbox.h

@@ -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

include/wx/msw/menuitem.h

@@ -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

include/wx/msw/metafile.h

@@ -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_

include/wx/msw/ole/dropsrc.h

@@ -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
 
 // ----------------------------------------------------------------------------

include/wx/msw/ole/droptgt.h

@@ -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
 
 // ----------------------------------------------------------------------------

include/wx/msw/private.h

@@ -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
 

include/wx/msw/registry.h

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

include/wx/msw/setup.h

@@ -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 wxUSE_XPM_IN_X    1
-#define USE_XPM_IN_MSW  0
+#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
+#undef wxUSE_DRAG_AND_DROP
-#define USE_DRAG_AND_DROP 0
+#define wxUSE_DRAG_AND_DROP 0
 #endif
 
 // Only WIN32 supports wxStatusBar95
-#if !defined(__WIN32__) && USE_NATIVE_STATUSBAR
+#if !defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR
-#undef  USE_NATIVE_STATUSBAR
+#undef  wxUSE_NATIVE_STATUSBAR
-#define USE_NATIVE_STATUSBAR 0
+#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
+#undef wxUSE_POSTSCRIPT
-# define USE_POSTSCRIPT 0
+# define wxUSE_POSTSCRIPT 0
-#undef USE_PRINTING_ARCHITECTURE
+#undef wxUSE_PRINTING_ARCHITECTURE
-# define USE_PRINTING_ARCHITECTURE 0
+# define wxUSE_PRINTING_ARCHITECTURE 0
-#undef USE_POSTSCRIPT_ARCHITECTURE_IN_MSW
+#undef wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW
-# define USE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
+# define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
-#undef USE_METAFILE
+#undef wxUSE_METAFILE
-# define USE_METAFILE 0
+# define wxUSE_METAFILE 0
-#undef USE_FORM
+#undef wxUSE_FORM
-# define USE_FORM 0
+# define wxUSE_FORM 0
-#undef USE_SPLINES
+#undef wxUSE_SPLINES
-# define USE_SPLINES 0
+# define wxUSE_SPLINES 0
-#undef USE_SCROLLBAR
+#undef wxUSE_SCROLLBAR
-# define USE_SCROLLBAR 0
+# define wxUSE_SCROLLBAR 0
-#undef USE_COMBOBOX
+#undef wxUSE_COMBOBOX
-# define USE_COMBOBOX 0
+# define wxUSE_COMBOBOX 0
-#undef USE_RADIOBUTTON
+#undef wxUSE_RADIOBUTTON
-# define USE_RADIOBUTTON 0
+# define wxUSE_RADIOBUTTON 0
-#undef USE_XPM_IN_MSW
+#undef wxUSE_XPM_IN_MSW
-# define USE_XPM_IN_MSW 0
+# define wxUSE_XPM_IN_MSW 0
-#undef USE_WX_RESOURCES
+#undef wxUSE_WX_RESOURCES
-# define USE_WX_RESOURCES 0
+# define wxUSE_WX_RESOURCES 0
-#undef USE_DOC_VIEW_ARCHITECTURE
+#undef wxUSE_DOC_VIEW_ARCHITECTURE
-# define USE_DOC_VIEW_ARCHITECTURE 0
+# define wxUSE_DOC_VIEW_ARCHITECTURE 0
-#undef USE_GNU_WXSTRING
+#undef wxUSE_GNU_WXSTRING
-# define USE_GNU_WXSTRING 0
+# define wxUSE_GNU_WXSTRING 0
-#undef USE_ODBC
+#undef wxUSE_ODBC
-# define USE_ODBC 0
+# define wxUSE_ODBC 0
-#undef USE_TIMEDATE
+#undef wxUSE_TIMEDATE
-# define USE_TIMEDATE 0
+# define wxUSE_TIMEDATE 0
 #undef CTL3D
 # define CTL3D 0
-#undef USE_ITSY_BITSY
+#undef wxUSE_ITSY_BITSY
-# define USE_ITSY_BITSY 0
+# define wxUSE_ITSY_BITSY 0
-#undef USE_IMAGE_LOADING_IN_MSW
+#undef wxUSE_IMAGE_LOADING_IN_MSW
-# define USE_IMAGE_LOADING_IN_MSW 0
+# define wxUSE_IMAGE_LOADING_IN_MSW 0
-#undef USE_GAUGE
+#undef wxUSE_GAUGE
-# define USE_GAUGE 0
+# define wxUSE_GAUGE 0
-#undef USE_RESOURCE_LOADING_IN_MSW
+#undef wxUSE_RESOURCE_LOADING_IN_MSW
-# define USE_RESOURCE_LOADING_IN_MSW 0
+# define wxUSE_RESOURCE_LOADING_IN_MSW 0
-#undef USE_DRAG_AND_DROP
+#undef wxUSE_DRAG_AND_DROP
-# define USE_DRAG_AND_DROP 0
+# define wxUSE_DRAG_AND_DROP 0
 #endif
 
 #endif

include/wx/msw/statbr95.h

@@ -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

include/wx/msw/tbar95.h

@@ -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_

include/wx/msw/tbarmsw.h

@@ -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_

include/wx/msw/textctrl.h

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

include/wx/msw/window.h

@@ -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
 

include/wx/object.h

@@ -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

include/wx/odbc.h

@@ -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

include/wx/postscrp.h

@@ -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__

include/wx/qt/textctrl.h

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

include/wx/qt/window.h

@@ -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
 

include/wx/resource.h

@@ -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

include/wx/stream.h

@@ -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
 

include/wx/string.h

@@ -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 );

include/wx/stubs/menuitem.h

@@ -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

include/wx/stubs/setup.h

@@ -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

include/wx/stubs/textctrl.h

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

include/wx/stubs/window.h

@@ -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
 

include/wx/tbarsmpl.h

@@ -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__
 

include/wx/time.h

@@ -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__
 

include/wx/utils.h

@@ -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);

include/wx/variant.h

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

include/wx/wx.h

@@ -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

include/wx/wxexpr.h

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

samples/dialogs/dialogs.cpp

@@ -31,7 +31,7 @@
 #include <wx/fontdlg.h>
 #include <wx/choicdlg.h>
 
-#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
 #include <wx/generic/colrdlgg.h>
 #include <wx/generic/fontdlgg.h>
 #endif
@@ -60,14 +60,14 @@ bool MyApp::OnInit(void)
 
   file_menu->Append(DIALOGS_CHOOSE_COLOUR, "&Choose colour");
 
-#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
   file_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, "Choose colour (&generic)");
 #endif
 
   file_menu->AppendSeparator();
   file_menu->Append(DIALOGS_CHOOSE_FONT, "Choose &font");
 
-#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
   file_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, "Choose f&ont (generic)");
 
 #endif
@@ -147,7 +147,7 @@ void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) )
       dialog->Close();
 }
 
-#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
 void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event))
 {
       wxColourData data;
@@ -292,7 +292,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 	EVT_MENU(DIALOGS_FILE_OPEN,					MyFrame::FileOpen)
 	EVT_MENU(DIALOGS_FILE_SAVE,					MyFrame::FileSave)
 	EVT_MENU(DIALOGS_DIR_CHOOSE,				MyFrame::DirChoose)
-#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
 	EVT_MENU(DIALOGS_CHOOSE_COLOUR_GENERIC,		MyFrame::ChooseColourGeneric)
 	EVT_MENU(DIALOGS_CHOOSE_FONT_GENERIC,		MyFrame::ChooseFontGeneric)
 #endif

samples/dialogs/dialogs.h

@@ -37,7 +37,7 @@ class MyFrame: public wxFrame
     void FileSave(wxCommandEvent& event);
     void DirChoose(wxCommandEvent& event);
 
-#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
 	void ChooseColourGeneric(wxCommandEvent& event);
 	void ChooseFontGeneric(wxCommandEvent& event);
 #endif

samples/docview/doc.cpp

@@ -25,7 +25,7 @@
 #endif
 
 #if !USE_DOC_VIEW_ARCHITECTURE
-#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
 #endif
 
 #include "doc.h"

samples/docview/docview.cpp

@@ -32,7 +32,7 @@
 #endif
 
 #if !USE_DOC_VIEW_ARCHITECTURE
-#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
 #endif
 
 #include "wx/docview.h"

samples/docview/view.cpp

@@ -25,7 +25,7 @@
 #endif
 
 #if !USE_DOC_VIEW_ARCHITECTURE
-#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
 #endif
 
 #include "docview.h"

samples/docvwmdi/doc.cpp

@@ -25,7 +25,7 @@
 #endif
 
 #if !USE_DOC_VIEW_ARCHITECTURE
-#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
 #endif
 
 #include "doc.h"

samples/docvwmdi/docview.cpp

@@ -30,7 +30,7 @@
 #endif
 
 #if !USE_DOC_VIEW_ARCHITECTURE
-#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
 #endif
 
 #include "docview.h"

samples/docvwmdi/view.cpp

@@ -25,7 +25,7 @@
 #endif
 
 #if !USE_DOC_VIEW_ARCHITECTURE
-#error You must set USE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
 #endif
 
 #include "docview.h"

samples/layout/layout.cpp

@@ -21,7 +21,7 @@
 #endif
 
 #if !USE_CONSTRAINTS
-#error You must set USE_CONSTRAINTS to 1 in wx_setup.h!
+#error You must set wxUSE_CONSTRAINTS to 1 in wx_setup.h!
 #endif
 
 #include <ctype.h>

samples/minimal/minimal.cpp

@@ -70,6 +70,9 @@ public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
+    void OnPopupMenu(wxCommandEvent& event);
+    void OnRightDown(wxMouseEvent& event);
+
 private:
     // any class wishing to process wxWindows events must use this macro
     DECLARE_EVENT_TABLE()
@@ -85,6 +88,8 @@ enum
     // menu items
     Minimal_Quit = 1,
     Minimal_About,
+    Minimal_Test1,
+    Minimal_Test2,
 
     // controls start here (the numbers are, of course, arbitrary)
     Minimal_Text = 1000,
@@ -100,6 +105,10 @@ enum
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
     EVT_MENU(Minimal_About, MyFrame::OnAbout)
+
+    EVT_MENU_RANGE(Minimal_Test1, Minimal_Test2, MyFrame::OnPopupMenu)
+
+    EVT_RIGHT_DOWN(MyFrame::OnRightDown)
 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWindows to create
@@ -161,17 +170,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     SetMenuBar(menuBar);
 
     // create a status bar just for fun (by default with 1 pane only)
-    CreateStatusBar();
+    CreateStatusBar(2);
     SetStatusText("Welcome to wxWindows!");
-
-    // now create some controls
-
-    // a panel first - if there were several controls, it would allow us to
-    // navigate between them from the keyboard
-    wxPanel *panel = new wxPanel(this, -1, wxPoint(0, 0), wxSize(400, 200));
-
-    // and a static control whose parent is the panel
-    (void)new wxStaticText(panel, -1, "Hello, world!", wxPoint(10, 10));
 }
 
 
@@ -188,3 +188,28 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
     wxMessageBox("This is a minimal sample\nA second line in the message box",
                  "About Minimal", wxOK | wxICON_INFORMATION, this);
 }
+
+void MyFrame::OnPopupMenu(wxCommandEvent& event)
+{
+  wxString str;
+  str.Printf("Test%d clicked.", event.GetId() == Minimal_Test1 ? 1 : 2);
+  SetStatusText(str, 1);
+}
+
+void MyFrame::OnRightDown(wxMouseEvent& event)
+{
+  class MyMenu : public wxMenu
+  {
+  public:
+    MyMenu()
+    {
+      Append(Minimal_Test1, "Test&1");
+      AppendSeparator();
+      Append(Minimal_Test2, "Test&2");
+    }
+
+    ~MyMenu() { printf("menu destroyed"); }
+  } *menu = new MyMenu;
+
+  PopupMenu(menu, event.GetX(), event.GetY());
+}

samples/printing/printing.cpp

@@ -26,7 +26,7 @@
 #endif
 
 #if !USE_PRINTING_ARCHITECTURE
-#error You must set USE_PRINTING_ARCHITECTURE to 1 in wx_setup.h to compile this demo.
+#error You must set wxUSE_PRINTING_ARCHITECTURE to 1 in wx_setup.h to compile this demo.
 #endif
 
 #include <ctype.h>

samples/toolbar/test.cpp

@@ -161,7 +161,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(wxID_HELP, MyFrame::OnAbout)
     EVT_CLOSE(MyFrame::OnCloseWindow)
     EVT_TOOL_RANGE(wxID_OPEN, wxID_PASTE, MyFrame::OnToolLeftClick)
-    EVT_TOOL_ENTER(ID_TOOLBAR, MyFrame::OnToolEnter)
+    EVT_TOOL_ENTER(wxID_OPEN, MyFrame::OnToolEnter)
 END_EVENT_TABLE()
 
 // Define my frame constructor

src/common/date.cpp

@@ -28,7 +28,7 @@
 
 #include "wx/setup.h"
 
-#if USE_TIMEDATE
+#if wxUSE_TIMEDATE
 
 #include "wx/date.h"
 #include <wx/intl.h>
@@ -37,7 +37,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #include <iostream>

src/common/datstrm.cpp

@@ -74,7 +74,7 @@ extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes);
 
 double wxDataInputStream::ReadDouble()
 {
-#if USE_APPLE_IEEE
+#if wxUSE_APPLE_IEEE
   char buf[10];
 
   Read(buf, 10);
@@ -192,7 +192,7 @@ void wxDataOutputStream::WriteDouble(double d)
 {
   char buf[10];
 
-#if USE_APPLE_IEEE
+#if wxUSE_APPLE_IEEE
   ConvertToIeeeExtended(d, (unsigned char *)buf);
 #else
 #  pragma warning "wxDataStream::WriteDouble() not using IeeeExtended - will not work!"

src/common/db.cpp

@@ -43,7 +43,7 @@
   #include  <wx/wx.h>
 #endif //WX_PRECOMP
 
-#if USE_ODBC
+#if wxUSE_ODBC
 
 #include <wx/db.h>
 
@@ -1317,4 +1317,4 @@ bool GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDes
 }  // GetDataSource()
 
 #endif
-    // USE_ODBC
+    // wxUSE_ODBC

src/common/dbtable.cpp

@@ -39,7 +39,7 @@
   #include  <wx/wx.h>
 #endif //WX_PRECOMP
 
-#if USE_ODBC
+#if wxUSE_ODBC
 
 #include <wx/dbtable.h>
 
@@ -1442,4 +1442,4 @@ bool wxTable::Refresh(void)
 }  // wxTable::Refresh()
 
 #endif
-    // USE_ODBC
+    // wxUSE_ODBC

src/common/docmdi.cpp

@@ -24,7 +24,7 @@
 #include "wx/defs.h"
 #endif
 
-#if USE_DOC_VIEW_ARCHITECTURE
+#if wxUSE_DOC_VIEW_ARCHITECTURE
 
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
@@ -149,5 +149,5 @@ bool wxDocMDIChildFrame::OnClose(void)
 }
 
 #endif
-    // USE_DOC_VIEW_ARCHITECTURE
+    // wxUSE_DOC_VIEW_ARCHITECTURE
 

src/common/docview.cpp

@@ -24,7 +24,7 @@
 #include "wx/defs.h"
 #endif
 
-#if USE_DOC_VIEW_ARCHITECTURE
+#if wxUSE_DOC_VIEW_ARCHITECTURE
 
 #ifndef WX_PRECOMP
 #include "wx/string.h"
@@ -53,7 +53,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #include <iostream>
@@ -68,7 +68,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
 IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
 IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
-#if USE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE
 IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
 #endif
 IMPLEMENT_CLASS(wxCommand, wxObject)
@@ -535,7 +535,7 @@ bool wxView::OnClose(bool WXUNUSED(deleteWindow))
   return GetDocument() ? GetDocument()->Close() : TRUE;
 }
 
-#if USE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE
 wxPrintout *wxView::OnCreatePrintout(void)
 {
   return new wxDocPrintout(this);
@@ -1447,7 +1447,7 @@ bool wxDocParentFrame::OnClose(void)
   return m_docManager->Clear(FALSE);
 }
 
-#if USE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE
 
 wxDocPrintout::wxDocPrintout(wxView *view, const wxString& title):
   wxPrintout(WXSTRINGCAST title)
@@ -1940,4 +1940,4 @@ bool wxTransferStreamToFile(istream& stream, const wxString& filename)
 }
 
 #endif
-  // End USE_DOC_VIEW_ARCHITECTURE
+  // End wxUSE_DOC_VIEW_ARCHITECTURE

src/common/fileconf.cpp

@@ -28,18 +28,19 @@
 #endif  //__BORLANDC__
 
 #ifndef   WX_PRECOMP
-  #include  <wx/string.h>
+  #include  "wx/string.h"
-  #include  <wx/intl.h>
+  #include  "wx/intl.h"
 #endif  //WX_PRECOMP
 
-#include  <wx/app.h>
+#include  "wx/app.h"
-#include  <wx/dynarray.h>
+#include  "wx/dynarray.h"
-#include  <wx/file.h>
+#include  "wx/file.h"
-#include  <wx/log.h>
+#include  "wx/log.h"
-#include  <wx/textfile.h>
+#include  "wx/textfile.h"
-#include  <wx/config.h>
+#include  "wx/config.h"
-#include  <wx/fileconf.h>
+#include  "wx/fileconf.h"
-#include  <wx/utils.h>
+
+#include  "wx/utils.h"    // for wxGetHomeDir
 
 // _WINDOWS_ is defined when windows.h is included,
 // __WXMSW__ is defined for MS Windows compilation

src/common/helpbase.cpp

@@ -26,10 +26,10 @@
 
 #include "wx/helpbase.h"
 
-#if USE_HELP
+#if wxUSE_HELP
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxHelpControllerBase, wxObject)
 #endif
 
-#endif // USE_HELP
+#endif // wxUSE_HELP

src/common/layout.cpp

@@ -22,7 +22,7 @@
 
 #include "wx/defs.h"
 
-#if USE_CONSTRAINTS
+#if wxUSE_CONSTRAINTS
 
 #ifndef WX_PRECOMP
 #include "wx/window.h"

src/common/memory.cpp

@@ -24,7 +24,7 @@
 #include "wx/defs.h"
 #endif
 
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
 #ifdef __GNUG__
 // #pragma implementation
@@ -37,7 +37,7 @@
 
 #include <stdlib.h>
 
-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #include <iostream>
@@ -888,7 +888,7 @@ int wxDebugContext::CountObjectsLeft(void)
 // We'll only do malloc and free for the moment: leave the interesting
 // stuff for the wxObject versions.
 
-#if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS
+#if WXDEBUG && wxUSE_GLOBAL_MEMORY_OPERATORS
 
 #ifdef new
 #undef new
@@ -1110,7 +1110,7 @@ void wxTraceLevel(int level, const char *fmt ...)
 #endif
 }
 
-#else // USE_MEMORY_TRACING && WXDEBUG
+#else // wxUSE_MEMORY_TRACING && WXDEBUG
 void wxTrace(const char *WXUNUSED(fmt) ...)
 {
 }

src/common/object.cpp

@@ -22,7 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/hash.h"
-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL
 #include "wx/objstrm.h"
 #include "wx/serbase.h"
 #endif
@@ -31,11 +31,11 @@
 #include <string.h>
 #include <assert.h>
 
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 #include "wx/memory.h"
 #endif
 
-#if WXDEBUG || USE_DEBUG_CONTEXT
+#if WXDEBUG || wxUSE_DEBUG_CONTEXT
   // for wxObject::Dump
   #include <iostream.h>
 #endif
@@ -53,7 +53,7 @@ wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;
 wxObject::wxObject(void)
 {
   m_refData = (wxObjectRefData *) NULL;
-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL
   m_serialObj = (wxObject_Serialize *)NULL;
 #endif
 }
@@ -61,7 +61,7 @@ wxObject::wxObject(void)
 wxObject::~wxObject(void)
 {
 	UnRef();
-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL
 	if (m_serialObj)
 	  delete m_serialObj;
 #endif
@@ -83,7 +83,7 @@ bool wxObject::IsKindOf(wxClassInfo *info) const
     return FALSE;
 }
 
-#if WXDEBUG || USE_DEBUG_CONTEXT
+#if WXDEBUG || wxUSE_DEBUG_CONTEXT
 void wxObject::Dump(ostream& str)
 {
   if (GetClassInfo() && GetClassInfo()->GetClassName())
@@ -93,7 +93,7 @@ void wxObject::Dump(ostream& str)
 }
 #endif
 
-#if WXDEBUG && USE_MEMORY_TRACING
+#if WXDEBUG && wxUSE_MEMORY_TRACING
 
 #ifdef new
 #undef new
@@ -258,7 +258,7 @@ wxObject *wxCreateDynamicObject(const char *name)
     return (wxObject*) NULL;
 }
 
-#ifdef USE_SERIAL
+#ifdef wxUSE_SERIAL
 
 #include "wx/serbase.h"
 #include "wx/dynlib.h"

src/common/objstrm.cpp

@@ -24,7 +24,7 @@
 #include "wx/setup.h"
 #endif
 
-#if USE_SERIAL
+#if wxUSE_SERIAL
 
 #include "wx/object.h"
 #include "wx/objstrm.h"

src/common/odbc.cpp

@@ -23,7 +23,7 @@
 
 #include "wx/defs.h"
 
-#if USE_ODBC
+#if wxUSE_ODBC
 
 #ifndef WX_PRECOMP
 #include "wx/utils.h"
@@ -1827,4 +1827,4 @@ bool wxQueryField::IsDirty(void) {
   return dirty;
 }
 
-#endif // USE_ODBC
+#endif // wxUSE_ODBC

src/common/postscrp.cpp

@@ -24,7 +24,7 @@
 
 #include "wx/defs.h"
 
-#if USE_POSTSCRIPT
+#if wxUSE_POSTSCRIPT
 
 #ifndef WX_PRECOMP
 #include "wx/intl.h"
@@ -48,7 +48,7 @@
 #include "wx/msw/private.h"
 #endif
 
-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #include <iostream>
@@ -127,7 +127,7 @@ double UnderlineThickness = 0.0F;
 #define _MAXPATHLEN 500
 
 /* See "wxspline.inc" and "xfspline.inc" */
-#if USE_XFIG_SPLINE_CODE
+#if wxUSE_XFIG_SPLINE_CODE
 static const char *wxPostScriptHeaderSpline = " \
 /DrawSplineSection {\n\
 	/y3 exch def\n\
@@ -148,7 +148,7 @@ static const char *wxPostScriptHeaderSpline = " \
 // No extra PS header for this spline implementation.
 static const char *wxPostScriptHeaderSpline = (char *) NULL;
 
-#endif /* USE_XFIG_SPLINE_CODE */
+#endif /* wxUSE_XFIG_SPLINE_CODE */
 
 // steve, 05.09.94
 // VMS has a bug in the ofstream class.

src/common/resource.cpp

@@ -38,7 +38,7 @@
 #include "wx/checkbox.h"
 #include "wx/slider.h"
 #include "wx/statbox.h"
-#if USE_GAUGE
+#if wxUSE_GAUGE
 #include "wx/gauge.h"
 #endif
 #include "wx/textctrl.h"
@@ -46,11 +46,11 @@
 #include "wx/intl.h"
 #endif
 
-#if USE_SCROLLBAR
+#if wxUSE_SCROLLBAR
 #include "wx/scrolbar.h"
 #endif
 
-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX
 #include "wx/combobox.h"
 #endif
 
@@ -58,7 +58,7 @@
 
 #include "wx/log.h"
 
-#if USE_WX_RESOURCES
+#if wxUSE_WX_RESOURCES
 
 #include <ctype.h>
 #include <math.h>
@@ -389,7 +389,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
             bitmap = wxResourceCreateBitmap(childResource->GetValue4(), (wxResourceTable *)this);
             childResource->SetBitmap(bitmap);
           }
-#if USE_BITMAP_MESSAGE
+#if wxUSE_BITMAP_MESSAGE
           if (bitmap)
            control = new wxStaticBitmap(parent, id, *bitmap,
              wxPoint(childResource->GetX(), childResource->GetY()),
@@ -421,7 +421,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
 
         ((wxCheckBox *)control)->SetValue((childResource->GetValue1() != 0));
       }
-#if USE_GAUGE
+#if wxUSE_GAUGE
    else if (itemType == wxString("wxGauge"))
       {
         control = new wxGauge(parent, id, (int)childResource->GetValue2(),
@@ -432,7 +432,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
         ((wxGauge *)control)->SetValue((int)childResource->GetValue1());
       }
 #endif
-#if USE_RADIOBUTTON
+#if wxUSE_RADIOBUTTON
    else if (itemType == wxString("wxRadioButton"))
       {
         control = new wxRadioButton(parent, id, childResource->GetTitle(), // (int)childResource->GetValue1(),
@@ -441,7 +441,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       }
 #endif
-#if USE_SCROLLBAR
+#if wxUSE_SCROLLBAR
    else if (itemType == wxString("wxScrollBar"))
       {
         control = new wxScrollBar(parent, id,
@@ -521,7 +521,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
         if (strings)
           delete[] strings;
       }
-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX
    else if (itemType == wxString("wxComboBox"))
       {
         wxStringList *stringList = childResource->GetStringValues();
@@ -890,7 +890,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
         controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
     }
   }
-#if USE_RADIOBUTTON
+#if wxUSE_RADIOBUTTON
   else if (controlType == "wxRadioButton")
   {
     // Check for default value
@@ -1089,7 +1089,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
      }
    }
   }
-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX
   else if (controlType == "wxComboBox")
   {
     PrologExpr *textValue = expr->Nth(count);
@@ -2189,7 +2189,7 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
       }
       case wxBITMAP_TYPE_XPM_DATA:
       {
-#if (defined(__WXGTK__)) || (defined(__WXMSW__) && USE_XPM_IN_MSW)
+#if (defined(__WXGTK__)) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW)
         wxItemResource *item = table->FindResource(name);
         if (!item)
         {
@@ -2358,7 +2358,7 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
       {
       // *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
 /*
-#if (defined(__WXGTK__)) || (defined(__WXMSW__) && USE_XPM_IN_MSW)
+#if (defined(__WXGTK__)) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW)
         wxItemResource *item = table->FindResource(name);
         if (!item)
         {
@@ -2938,4 +2938,4 @@ wxControl *wxWindow::CreateItem(const wxItemResource *resource, const wxResource
   return table->CreateItem((wxWindow *)this, (wxItemResource *)resource);
 }
 
-#endif // USE_WX_RESOURCES
+#endif // wxUSE_WX_RESOURCES

src/common/stream.cpp

@@ -363,7 +363,7 @@ wxInputStream& wxInputStream::operator>>(float& f)
   return *this;
 }
 
-#if USE_SERIAL
+#if wxUSE_SERIAL
 wxInputStream& wxInputStream::operator>>(wxObject *& obj)
 {
   wxObjectInputStream obj_s(*this);
@@ -544,7 +544,7 @@ wxOutputStream& wxOutputStream::operator<<(double f)
   return Write(strfloat, strfloat.Len());
 }
 
-#if USE_SERIAL
+#if wxUSE_SERIAL
 wxOutputStream& wxOutputStream::operator<<(wxObject& obj)
 {
   wxObjectOutputStream obj_s(*this);

src/common/tbarbase.cpp

@@ -29,7 +29,7 @@
 #include <windows.h>
 #endif
 
-#if USE_TOOLBAR
+#if wxUSE_TOOLBAR
 
 #include "wx/tbarbase.h"
 
@@ -615,7 +615,7 @@ void wxToolBarBase::AdjustScrollbars(void)
 // Default OnSize resets scrollbars, if any
 void wxToolBarBase::OnSize(wxSizeEvent& event)
 {
-#if USE_CONSTRAINTS
+#if wxUSE_CONSTRAINTS
   if (GetAutoLayout())
     Layout();
 #endif

src/common/tbarsmpl.cpp

@@ -24,7 +24,7 @@
 #include "wx/wx.h"
 #endif
 
-#if USE_TOOLBAR
+#if wxUSE_TOOLBAR
 
 #include "wx/tbarsmpl.h"
 

src/common/time.cpp

@@ -27,14 +27,14 @@ seconds since January 1, 1901, GMT.
 
 #include "wx/setup.h"
 
-#if USE_TIMEDATE
+#if wxUSE_TIMEDATE
 
 #include "wx/time.h"
 #include "wx/date.h"
 #include "wx/utils.h"
 #include <wx/intl.h>
 
-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #include <iostream>

src/common/utilscmn.cpp

@@ -28,7 +28,7 @@
 #include "wx/frame.h"
 #endif
 
-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #include <iostream>

src/generic/gridg.cpp

@@ -33,9 +33,9 @@
 
 // Set to zero to use no double-buffering
 #ifdef __WXMSW__
-#define USE_DOUBLE_BUFFERING 1
+#define wxUSE_DOUBLE_BUFFERING 1
 #else
-#define USE_DOUBLE_BUFFERING 0
+#define wxUSE_DOUBLE_BUFFERING 0
 #endif
 
 #define wxGRID_DRAG_NONE       0
@@ -418,7 +418,7 @@ void wxGenericGrid::OnPaint(wxPaintEvent& WXUNUSED(event))
   int w, h;
   GetClientSize(&w, &h);
 
-  bool useDoubleBuffering = (bool) USE_DOUBLE_BUFFERING;
+  bool useDoubleBuffering = (bool) wxUSE_DOUBLE_BUFFERING;
   if (useDoubleBuffering)
   {
     // Reuse the old bitmap if possible

src/generic/helpxlp.cpp

@@ -26,7 +26,7 @@
 
 #include "wx/generic/helpxlp.h"
 
-#if USE_HELP
+#if wxUSE_HELP
 #include <time.h>
 
 #ifdef __X__
@@ -263,4 +263,4 @@ bool wxXLPHelpConnection::OnDisconnect(void)
   return TRUE;
 }
 
-#endif // USE_HELP
+#endif // wxUSE_HELP

src/generic/scrolwin.cpp

@@ -333,7 +333,7 @@ void wxScrolledWindow::AdjustScrollbars(void)
 // Default OnSize resets scrollbars, if any
 void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
 {
-#if USE_CONSTRAINTS
+#if wxUSE_CONSTRAINTS
   if (GetAutoLayout())
     Layout();
 #endif

src/gtk.inc

@@ -175,20 +175,4 @@ LIB_C_SRC=\
  gdk_imlib/misc.c \
  gdk_imlib/rend.c \
  gdk_imlib/save.c \
- gdk_imlib/utils.c \
+ gdk_imlib/utils.c
- \
-  iodbc/dlf.c \
-  iodbc/dlproc.c \
-  iodbc/herr.c \
-  iodbc/henv.c \
-  iodbc/hdbc.c \
-  iodbc/hstmt.c \
-  iodbc/connect.c \
-  iodbc/prepare.c \
-  iodbc/result.c \
-  iodbc/execute.c \
-  iodbc/fetch.c \
-  iodbc/info.c \
-  iodbc/catalog.c \
-  iodbc/misc.c \
-  iodbc/itrace.c

src/gtk/app.cpp

@@ -25,7 +25,7 @@
 
 #include "unistd.h"
 
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 #include "../gdk_imlib/gdk_imlib.h"
 #endif
 
@@ -243,7 +243,7 @@ void wxApp::CommonInit(void)
 {
 
 /*
-#if USE_RESOURCES
+#if wxUSE_RESOURCES
   (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
 #endif
 */
@@ -262,7 +262,7 @@ void wxApp::CommonInit(void)
   wxInitializeResourceSystem();
 
   // For PostScript printing
-#if USE_POSTSCRIPT
+#if wxUSE_POSTSCRIPT
   wxInitializePrintSetupData();
   wxThePrintPaperDatabase = new wxPrintPaperDatabase;
   wxThePrintPaperDatabase->CreateDatabase();
@@ -310,7 +310,7 @@ int wxEntry( int argc, char *argv[] )
 
   wxClassInfo::InitializeClasses();
 
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
   streambuf* sBuf = new wxDebugStreamBuf;
   ostream* oStr = new ostream(sBuf) ;
@@ -352,7 +352,7 @@ int wxEntry( int argc, char *argv[] )
   
   gtk_init( &argc, &argv );
 
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
   gdk_imlib_init();
 
@@ -393,7 +393,7 @@ int wxEntry( int argc, char *argv[] )
   
   delete[] wxBuffer;
   
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
   
   if (wxDebugContext::CountObjectsLeft() > 0)
   {

src/gtk/bitmap.cpp

@@ -16,7 +16,7 @@
 #include "wx/icon.h"
 #include "gdk/gdkprivate.h"
 
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
 #include "../gdk_imlib/gdk_imlib.h"
 #include "gdk/gdkx.h"        // GDK_DISPLAY
@@ -50,7 +50,7 @@ wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) )
 
 wxMask::~wxMask(void)
 {
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
   // do not delete the mask, gdk_imlib does it for you
 #else
   if (m_bitmap) gdk_bitmap_unref( m_bitmap );
@@ -80,7 +80,7 @@ class wxBitmapRefData: public wxObjectRefData
     int             m_width;
     int             m_height;
     int             m_bpp;
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
     GdkImlibImage  *m_image;
 #endif
     wxPalette      *m_palette;
@@ -95,14 +95,14 @@ wxBitmapRefData::wxBitmapRefData(void)
   m_height = 0;
   m_bpp = 0;
   m_palette = (wxPalette *) NULL;
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
   m_image = (GdkImlibImage *) NULL;
 #endif
 }
 
 wxBitmapRefData::~wxBitmapRefData(void)
 {
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
   if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );
   if (m_image) gdk_imlib_kill_image( m_image );
 #else
@@ -141,7 +141,7 @@ wxBitmap::wxBitmap( char **bits )
 {
   m_refData = new wxBitmapRefData();
 
-#ifndef USE_GDK_IMLIB
+#ifndef wxUSE_GDK_IMLIB
 
   GdkBitmap *mask = NULL;
   
@@ -323,7 +323,7 @@ void wxBitmap::Resize( int height, int width )
     return;
   }
   
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
   
   if (M_BMPDATA->m_bitmap)
   {
@@ -360,7 +360,7 @@ bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type),
     return FALSE;
   }
   
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
   if (M_BMPDATA->m_bitmap)
   {
@@ -383,7 +383,7 @@ bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type),
 
 bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )
 {
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
   UnRef();
   m_refData = new wxBitmapRefData();
@@ -465,7 +465,7 @@ void wxBitmap::RecreateImage(void)
     return;
   }
   
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
   DestroyImage();
   
@@ -520,7 +520,7 @@ void wxBitmap::Render(void)
     return;
   }
   
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
   if (!M_BMPDATA->m_image) RecreateImage();
   

src/gtk/colour.cpp

@@ -15,7 +15,7 @@
 
 #include "wx/gdicmn.h"
 
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 #include "../gdk_imlib/gdk_imlib.h"
 #endif
 
@@ -208,7 +208,7 @@ void wxColour::CalcPixel( GdkColormap *cmap )
   if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
   M_COLDATA->FreeColour();
   
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
   int r = M_COLDATA->m_color.red >> SHIFT;
   int g = M_COLDATA->m_color.green >> SHIFT;

src/gtk/data.cpp

@@ -168,7 +168,7 @@ const char *wxUserResourceStr = "TEXT";
 #endif
 
 
-#if USE_SHARED_LIBRARY
+#if wxUSE_SHARED_LIBRARY
 /*
  * For wxWindows to be made into a dynamic library (e.g. Sun),
  * all IMPLEMENT_... macros must be in one place.
@@ -192,13 +192,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 #include "wx/choice.h"
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 
-#if USE_CLIPBOARD
+#if wxUSE_CLIPBOARD
 #include "wx/clipbrd.h"
 IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxClipboardClient, wxObject)
 #endif
 
-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX
 #include "wx/combobox.h"
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 #endif
@@ -238,7 +238,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
 #include "wx/colordlg.h"
 #include "wx/fontdlg.h"
 
-#if !defined(wx_msw) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(wx_msw) || wxUSE_GENERIC_DIALOGS_IN_MSW
 #include "wx/generic/colordlg.h"
 #include "wx/generic/fontdlg.h"
 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
@@ -273,7 +273,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIntPoint, wxObject)
 #endif
 */
 
-#if defined(wx_x) || (defined(wx_msw) && USE_PORTABLE_FONTS_IN_MSW)
+#if defined(wx_x) || (defined(wx_msw) && wxUSE_PORTABLE_FONTS_IN_MSW)
 IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
 #endif
 
@@ -289,7 +289,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxNode, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxList)
 
-#if USE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE
 #include "wx/print.h"
 IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog)
 IMPLEMENT_DYNAMIC_CLASS(wxPrinterBase, wxObject)
@@ -306,7 +306,7 @@ IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
 IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
 #endif
 
-#if USE_POSTSCRIPT
+#if wxUSE_POSTSCRIPT
 #include "wx/postscrp.h"
 IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject)
@@ -315,7 +315,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList)
 #endif
 
-#if USE_WX_RESOURCES
+#if wxUSE_WX_RESOURCES
 #include "wx/resource.h"
 IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable)
@@ -352,12 +352,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxList)
 #include "wx/process.h"
 IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
 
-#if USE_TIMEDATE
+#if wxUSE_TIMEDATE
 #include "wx/date.h"
 IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
 #endif
 
-#if USE_DOC_VIEW_ARCHITECTURE
+#if wxUSE_DOC_VIEW_ARCHITECTURE
 #include "wx/docview.h"
 //IMPLEMENT_ABSTRACT_CLASS(wxDocItem, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
@@ -366,7 +366,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
 IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
 IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
-#if USE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE
 IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
 #endif
 IMPLEMENT_CLASS(wxCommand, wxObject)
@@ -374,7 +374,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
 #endif
 
-#if USE_CONSTRAINTS
+#if wxUSE_CONSTRAINTS
 #include "wx/layout.h"
 IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject)
@@ -382,7 +382,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSizer, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxRowColSizer, wxSizer)
 #endif
 
-#if USE_TOOLBAR
+#if wxUSE_TOOLBAR
 #include "wx/tbarbase.h"
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarBase, wxControl)
@@ -453,7 +453,7 @@ BEGIN_EVENT_TABLE(wxStatusBar, wxWindow)
     EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged)
 END_EVENT_TABLE()
 
-#if USE_TIMEDATE
+#if wxUSE_TIMEDATE
 #include "wx/time.h"
 IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
 #endif
@@ -491,7 +491,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxBitmapHandler)
 #include "wx/statbox.h"
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
-#if USE_IPC
+#if wxUSE_IPC
 #include "wx/dde.h"
 IMPLEMENT_ABSTRACT_CLASS(wxDDEObject, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxDDEServer, wxDDEObject)
@@ -516,7 +516,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 
-#if USE_METAFILE
+#if wxUSE_METAFILE
 #include "wx/metafile.h"
 IMPLEMENT_DYNAMIC_CLASS(wxMetaFile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetaFileDC, wxDC)
@@ -568,7 +568,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 #include "wx/dirdlg.h"
 #include "wx/choicdlg.h"
 
-#if !defined(wx_msw) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(wx_msw) || wxUSE_GENERIC_DIALOGS_IN_MSW
 #include "wx/generic/msgdlgg.h"
 IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog)
 #endif
@@ -582,7 +582,7 @@ IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 IMPLEMENT_CLASS(wxMessageDialog)
 #endif
 
-#if USE_GAUGE
+#if wxUSE_GAUGE
 #ifdef wx_motif
 #include "../../contrib/xmgauge/gauge.h"
 #endif
@@ -705,7 +705,7 @@ BEGIN_EVENT_TABLE(wxControl, wxWindow)
   EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)
 END_EVENT_TABLE()
 
-#if !defined(wx_msw) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(wx_msw) || wxUSE_GENERIC_DIALOGS_IN_MSW
 BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
   EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
   EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)

src/gtk/dcmemory.cpp

@@ -14,7 +14,7 @@
 
 #include "wx/dcmemory.h"
 
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 #include "../gdk_imlib/gdk_imlib.h"
 #endif
 
@@ -28,7 +28,7 @@ wxMemoryDC::wxMemoryDC(void)
 {
   m_ok = FALSE;
   
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
   m_cmap = gdk_imlib_get_colormap();
 #else
   m_cmap = gdk_colormap_get_system();
@@ -39,7 +39,7 @@ wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
 {
   m_ok = FALSE;
   
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
   m_cmap = gdk_imlib_get_colormap();
 #else
   m_cmap = gdk_colormap_get_system();

src/gtk/palette.cpp

@@ -94,13 +94,22 @@ bool wxPalette::Ok(void) const
 
 bool wxPalette::Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
 {
+  wxFAIL_MSG("not implemented");
+
+  return FALSE;
 };
 
 int wxPalette::GetPixel( const unsigned char red, const unsigned char green, const unsigned char blue ) const
 {
+  wxFAIL_MSG("not implemented");
+
+  return 0;
 };
 
 bool wxPalette::GetRGB( int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const
 {
+  wxFAIL_MSG("not implemented");
+
+  return 0;
 };
 

src/gtk/treectrl.cpp

@@ -16,7 +16,7 @@
 #include "wx/settings.h"
 #include "wx/log.h"
 
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 #include "../gdk_imlib/gdk_imlib.h"
 #endif
 

src/gtk/window.cpp

@@ -116,7 +116,11 @@
 extern wxList wxPendingDelete;
 extern wxList wxTopLevelWindows;
 extern bool   g_blockEventsOnDrag;
-       bool   g_capturing = FALSE;
+static bool   g_capturing = FALSE;
+
+// hack: we need something to pass to gtk_menu_popup, so we store the time of
+// the last click here
+static guint32 gs_timeLastClick = 0;
 
 //-----------------------------------------------------------------------------
 // "expose_event" (of m_wxwindow, not of m_widget)
@@ -129,7 +133,7 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
 
   win->m_updateRegion.Union( gdk_event->area.x,
                              gdk_event->area.y,
-    	                     gdk_event->area.width,
+                             gdk_event->area.width,
                              gdk_event->area.height );
 
   if (gdk_event->count > 0) return;
@@ -284,7 +288,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
       {
         wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
         ret = ancestor->GetEventHandler()->ProcessEvent( command_event );
-	break;
+    break;
       }
       ancestor = ancestor->GetParent();
     }
@@ -387,8 +391,8 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
       wxWindow *child = (wxWindow*)node->Data();
       if ((child->m_x <= event.m_x) &&
           (child->m_y <= event.m_y) &&
-	  (child->m_x+child->m_width  >= event.m_x) &&
+      (child->m_x+child->m_width  >= event.m_x) &&
-	  (child->m_y+child->m_height >= event.m_y))
+      (child->m_y+child->m_height >= event.m_y))
       {
         win = child;
         event.m_x -= child->m_x;
@@ -401,6 +405,8 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
 
   event.SetEventObject( win );
 
+  gs_timeLastClick = gdk_event->time;
+
   if (win->GetEventHandler()->ProcessEvent( event ))
     gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "button_press_event" );
 
@@ -457,8 +463,8 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
       wxWindow *child = (wxWindow*)node->Data();
       if ((child->m_x <= event.m_x) &&
           (child->m_y <= event.m_y) &&
-	  (child->m_x+child->m_width  >= event.m_x) &&
+      (child->m_x+child->m_width  >= event.m_x) &&
-	  (child->m_y+child->m_height >= event.m_y))
+      (child->m_y+child->m_height >= event.m_y))
       {
         win = child;
         event.m_x -= child->m_x;
@@ -519,8 +525,8 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
       wxWindow *child = (wxWindow*)node->Data();
       if ((child->m_x <= event.m_x) &&
           (child->m_y <= event.m_y) &&
-	  (child->m_x+child->m_width  >= event.m_x) &&
+      (child->m_x+child->m_width  >= event.m_x) &&
-	  (child->m_y+child->m_height >= event.m_y))
+      (child->m_y+child->m_height >= event.m_y))
       {
         win = child;
         event.m_x -= child->m_x;
@@ -2053,7 +2059,15 @@ bool wxWindow::PopupMenu( wxMenu *menu, int WXUNUSED(x), int WXUNUSED(y) )
   wxASSERT_MSG( (m_widget != NULL), "invalid window" );
 
   SetInvokingWindow( menu, this );
-  gtk_menu_popup( GTK_MENU(menu->m_menu), (GtkWidget *) NULL, (GtkWidget *) NULL, (GtkMenuPositionFunc) NULL, NULL, 0, 0 );
+  gtk_menu_popup(
+                  GTK_MENU(menu->m_menu),
+                  (GtkWidget *)NULL,          // parent menu shell
+                  (GtkWidget *)NULL,          // parent menu item
+                  (GtkMenuPositionFunc)NULL,
+                  NULL,                       // client data
+                  0,                          // button used to activate it
+                  0//gs_timeLastClick            // the time of activation
+                );
   return TRUE;
 }
 

src/gtk1/app.cpp

@@ -25,7 +25,7 @@
 
 #include "unistd.h"
 
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 #include "../gdk_imlib/gdk_imlib.h"
 #endif
 
@@ -243,7 +243,7 @@ void wxApp::CommonInit(void)
 {
 
 /*
-#if USE_RESOURCES
+#if wxUSE_RESOURCES
   (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
 #endif
 */
@@ -262,7 +262,7 @@ void wxApp::CommonInit(void)
   wxInitializeResourceSystem();
 
   // For PostScript printing
-#if USE_POSTSCRIPT
+#if wxUSE_POSTSCRIPT
   wxInitializePrintSetupData();
   wxThePrintPaperDatabase = new wxPrintPaperDatabase;
   wxThePrintPaperDatabase->CreateDatabase();
@@ -310,7 +310,7 @@ int wxEntry( int argc, char *argv[] )
 
   wxClassInfo::InitializeClasses();
 
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
 
   streambuf* sBuf = new wxDebugStreamBuf;
   ostream* oStr = new ostream(sBuf) ;
@@ -352,7 +352,7 @@ int wxEntry( int argc, char *argv[] )
   
   gtk_init( &argc, &argv );
 
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
   gdk_imlib_init();
 
@@ -393,7 +393,7 @@ int wxEntry( int argc, char *argv[] )
   
   delete[] wxBuffer;
   
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
   
   if (wxDebugContext::CountObjectsLeft() > 0)
   {

src/gtk1/bitmap.cpp

@@ -16,7 +16,7 @@
 #include "wx/icon.h"
 #include "gdk/gdkprivate.h"
 
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
 #include "../gdk_imlib/gdk_imlib.h"
 #include "gdk/gdkx.h"        // GDK_DISPLAY
@@ -50,7 +50,7 @@ wxMask::wxMask( const wxBitmap& WXUNUSED(bitmap) )
 
 wxMask::~wxMask(void)
 {
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
   // do not delete the mask, gdk_imlib does it for you
 #else
   if (m_bitmap) gdk_bitmap_unref( m_bitmap );
@@ -80,7 +80,7 @@ class wxBitmapRefData: public wxObjectRefData
     int             m_width;
     int             m_height;
     int             m_bpp;
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
     GdkImlibImage  *m_image;
 #endif
     wxPalette      *m_palette;
@@ -95,14 +95,14 @@ wxBitmapRefData::wxBitmapRefData(void)
   m_height = 0;
   m_bpp = 0;
   m_palette = (wxPalette *) NULL;
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
   m_image = (GdkImlibImage *) NULL;
 #endif
 }
 
 wxBitmapRefData::~wxBitmapRefData(void)
 {
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
   if (m_pixmap) gdk_imlib_free_pixmap( m_pixmap );
   if (m_image) gdk_imlib_kill_image( m_image );
 #else
@@ -141,7 +141,7 @@ wxBitmap::wxBitmap( char **bits )
 {
   m_refData = new wxBitmapRefData();
 
-#ifndef USE_GDK_IMLIB
+#ifndef wxUSE_GDK_IMLIB
 
   GdkBitmap *mask = NULL;
   
@@ -323,7 +323,7 @@ void wxBitmap::Resize( int height, int width )
     return;
   }
   
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
   
   if (M_BMPDATA->m_bitmap)
   {
@@ -360,7 +360,7 @@ bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type),
     return FALSE;
   }
   
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
   if (M_BMPDATA->m_bitmap)
   {
@@ -383,7 +383,7 @@ bool wxBitmap::SaveFile( const wxString &name, int WXUNUSED(type),
 
 bool wxBitmap::LoadFile( const wxString &name, int WXUNUSED(type) )
 {
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
   UnRef();
   m_refData = new wxBitmapRefData();
@@ -465,7 +465,7 @@ void wxBitmap::RecreateImage(void)
     return;
   }
   
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
   DestroyImage();
   
@@ -520,7 +520,7 @@ void wxBitmap::Render(void)
     return;
   }
   
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
   if (!M_BMPDATA->m_image) RecreateImage();
   

src/gtk1/colour.cpp

@@ -15,7 +15,7 @@
 
 #include "wx/gdicmn.h"
 
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 #include "../gdk_imlib/gdk_imlib.h"
 #endif
 
@@ -208,7 +208,7 @@ void wxColour::CalcPixel( GdkColormap *cmap )
   if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
   M_COLDATA->FreeColour();
   
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 
   int r = M_COLDATA->m_color.red >> SHIFT;
   int g = M_COLDATA->m_color.green >> SHIFT;

src/gtk1/data.cpp

@@ -168,7 +168,7 @@ const char *wxUserResourceStr = "TEXT";
 #endif
 
 
-#if USE_SHARED_LIBRARY
+#if wxUSE_SHARED_LIBRARY
 /*
  * For wxWindows to be made into a dynamic library (e.g. Sun),
  * all IMPLEMENT_... macros must be in one place.
@@ -192,13 +192,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 #include "wx/choice.h"
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 
-#if USE_CLIPBOARD
+#if wxUSE_CLIPBOARD
 #include "wx/clipbrd.h"
 IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxClipboardClient, wxObject)
 #endif
 
-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX
 #include "wx/combobox.h"
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 #endif
@@ -238,7 +238,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
 #include "wx/colordlg.h"
 #include "wx/fontdlg.h"
 
-#if !defined(wx_msw) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(wx_msw) || wxUSE_GENERIC_DIALOGS_IN_MSW
 #include "wx/generic/colordlg.h"
 #include "wx/generic/fontdlg.h"
 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
@@ -273,7 +273,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxIntPoint, wxObject)
 #endif
 */
 
-#if defined(wx_x) || (defined(wx_msw) && USE_PORTABLE_FONTS_IN_MSW)
+#if defined(wx_x) || (defined(wx_msw) && wxUSE_PORTABLE_FONTS_IN_MSW)
 IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
 #endif
 
@@ -289,7 +289,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxNode, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxList)
 
-#if USE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE
 #include "wx/print.h"
 IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog)
 IMPLEMENT_DYNAMIC_CLASS(wxPrinterBase, wxObject)
@@ -306,7 +306,7 @@ IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
 IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
 #endif
 
-#if USE_POSTSCRIPT
+#if wxUSE_POSTSCRIPT
 #include "wx/postscrp.h"
 IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject)
@@ -315,7 +315,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList)
 #endif
 
-#if USE_WX_RESOURCES
+#if wxUSE_WX_RESOURCES
 #include "wx/resource.h"
 IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable)
@@ -352,12 +352,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxList)
 #include "wx/process.h"
 IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
 
-#if USE_TIMEDATE
+#if wxUSE_TIMEDATE
 #include "wx/date.h"
 IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
 #endif
 
-#if USE_DOC_VIEW_ARCHITECTURE
+#if wxUSE_DOC_VIEW_ARCHITECTURE
 #include "wx/docview.h"
 //IMPLEMENT_ABSTRACT_CLASS(wxDocItem, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
@@ -366,7 +366,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
 IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
 IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
-#if USE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE
 IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
 #endif
 IMPLEMENT_CLASS(wxCommand, wxObject)
@@ -374,7 +374,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
 #endif
 
-#if USE_CONSTRAINTS
+#if wxUSE_CONSTRAINTS
 #include "wx/layout.h"
 IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject)
@@ -382,7 +382,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSizer, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxRowColSizer, wxSizer)
 #endif
 
-#if USE_TOOLBAR
+#if wxUSE_TOOLBAR
 #include "wx/tbarbase.h"
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarBase, wxControl)
@@ -453,7 +453,7 @@ BEGIN_EVENT_TABLE(wxStatusBar, wxWindow)
     EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged)
 END_EVENT_TABLE()
 
-#if USE_TIMEDATE
+#if wxUSE_TIMEDATE
 #include "wx/time.h"
 IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
 #endif
@@ -491,7 +491,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxBitmapHandler)
 #include "wx/statbox.h"
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
-#if USE_IPC
+#if wxUSE_IPC
 #include "wx/dde.h"
 IMPLEMENT_ABSTRACT_CLASS(wxDDEObject, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxDDEServer, wxDDEObject)
@@ -516,7 +516,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 
-#if USE_METAFILE
+#if wxUSE_METAFILE
 #include "wx/metafile.h"
 IMPLEMENT_DYNAMIC_CLASS(wxMetaFile, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxMetaFileDC, wxDC)
@@ -568,7 +568,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
 #include "wx/dirdlg.h"
 #include "wx/choicdlg.h"
 
-#if !defined(wx_msw) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(wx_msw) || wxUSE_GENERIC_DIALOGS_IN_MSW
 #include "wx/generic/msgdlgg.h"
 IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog)
 #endif
@@ -582,7 +582,7 @@ IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 IMPLEMENT_CLASS(wxMessageDialog)
 #endif
 
-#if USE_GAUGE
+#if wxUSE_GAUGE
 #ifdef wx_motif
 #include "../../contrib/xmgauge/gauge.h"
 #endif
@@ -705,7 +705,7 @@ BEGIN_EVENT_TABLE(wxControl, wxWindow)
   EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)
 END_EVENT_TABLE()
 
-#if !defined(wx_msw) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(wx_msw) || wxUSE_GENERIC_DIALOGS_IN_MSW
 BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
   EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
   EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)

src/gtk1/dcmemory.cpp

@@ -14,7 +14,7 @@
 
 #include "wx/dcmemory.h"
 
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
 #include "../gdk_imlib/gdk_imlib.h"
 #endif
 
@@ -28,7 +28,7 @@ wxMemoryDC::wxMemoryDC(void)
 {
   m_ok = FALSE;
   
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
   m_cmap = gdk_imlib_get_colormap();
 #else
   m_cmap = gdk_colormap_get_system();
@@ -39,7 +39,7 @@ wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
 {
   m_ok = FALSE;
   
-#ifdef USE_GDK_IMLIB
+#ifdef wxUSE_GDK_IMLIB
   m_cmap = gdk_imlib_get_colormap();
 #else
   m_cmap = gdk_colormap_get_system();