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
This commit is contained in:
@@ -28,7 +28,7 @@
|
||||
#include "wx/log.h"
|
||||
#include "wx/module.h"
|
||||
|
||||
#if USE_WX_RESOURCES
|
||||
#if wxUSE_WX_RESOURCES
|
||||
#include "wx/resource.h"
|
||||
#endif
|
||||
|
||||
@@ -63,12 +63,12 @@ void wxApp::CommonInit()
|
||||
wxTheColourDatabase->Initialize();
|
||||
wxInitializeStockObjects();
|
||||
|
||||
#if USE_WX_RESOURCES
|
||||
#if wxUSE_WX_RESOURCES
|
||||
wxInitializeResourceSystem();
|
||||
#endif
|
||||
|
||||
// For PostScript printing
|
||||
#if USE_POSTSCRIPT
|
||||
#if wxUSE_POSTSCRIPT
|
||||
wxInitializePrintSetupData();
|
||||
wxThePrintPaperDatabase = new wxPrintPaperDatabase;
|
||||
wxThePrintPaperDatabase->CreateDatabase();
|
||||
@@ -84,7 +84,7 @@ void wxApp::CommonCleanUp()
|
||||
{
|
||||
wxModule::CleanUpModules();
|
||||
|
||||
#if USE_WX_RESOURCES
|
||||
#if wxUSE_WX_RESOURCES
|
||||
wxCleanUpResourceSystem();
|
||||
#endif
|
||||
|
||||
@@ -106,7 +106,7 @@ void wxApp::CommonCleanUp()
|
||||
delete wxTheColourDatabase;
|
||||
wxTheColourDatabase = NULL;
|
||||
|
||||
#if USE_POSTSCRIPT
|
||||
#if wxUSE_POSTSCRIPT
|
||||
wxInitializePrintSetupData(FALSE);
|
||||
delete wxThePrintPaperDatabase;
|
||||
wxThePrintPaperDatabase = NULL;
|
||||
@@ -125,7 +125,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
|
||||
|
||||
#if !defined(_WINDLL)
|
||||
streambuf* sBuf = new wxDebugStreamBuf;
|
||||
@@ -182,7 +182,7 @@ int wxEntry( int argc, char *argv[] )
|
||||
|
||||
wxApp::CommonCleanUp();
|
||||
|
||||
#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
|
||||
#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
|
||||
// At this point we want to check if there are any memory
|
||||
// blocks that aren't part of the wxDebugContext itself,
|
||||
// as a special case. Then when dumping we need to ignore
|
||||
|
||||
@@ -127,7 +127,7 @@ const char *wxFatalErrorStr = "wxWindows Fatal Error";
|
||||
const char *wxFloatToStringStr = "%.2f";
|
||||
const char *wxDoubleToStringStr = "%.2f";
|
||||
|
||||
#if USE_POSTSCRIPT
|
||||
#if wxUSE_POSTSCRIPT
|
||||
wxPrintPaperDatabase* wxThePrintPaperDatabase = NULL;
|
||||
#endif
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ END_EVENT_TABLE()
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
|
||||
#endif
|
||||
|
||||
#if USE_NATIVE_STATUSBAR
|
||||
#if wxUSE_NATIVE_STATUSBAR
|
||||
bool wxFrame::m_useNativeStatusBar = TRUE;
|
||||
#else
|
||||
bool wxFrame::m_useNativeStatusBar = FALSE;
|
||||
@@ -312,7 +312,7 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
|
||||
void wxFrame::OnSize(wxSizeEvent& event)
|
||||
{
|
||||
// if we're using constraints - do use them
|
||||
#if USE_CONSTRAINTS
|
||||
#if wxUSE_CONSTRAINTS
|
||||
if ( GetAutoLayout() ) {
|
||||
Layout();
|
||||
return;
|
||||
|
||||
@@ -95,7 +95,7 @@ void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
|
||||
|
||||
void wxMDIParentFrame::OnSize(wxSizeEvent& event)
|
||||
{
|
||||
#if USE_CONSTRAINTS
|
||||
#if wxUSE_CONSTRAINTS
|
||||
if (GetAutoLayout())
|
||||
Layout();
|
||||
#endif
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "wx/menuitem.h"
|
||||
#include "wx/log.h"
|
||||
|
||||
#if USE_DRAG_AND_DROP
|
||||
#if wxUSE_DRAG_AND_DROP
|
||||
#include "wx/dnd.h"
|
||||
#endif
|
||||
|
||||
@@ -79,7 +79,7 @@ wxWindow::wxWindow()
|
||||
m_defaultForegroundColour = *wxBLACK ;
|
||||
m_defaultBackgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ;
|
||||
|
||||
#if USE_DRAG_AND_DROP
|
||||
#if wxUSE_DRAG_AND_DROP
|
||||
m_pDropTarget = NULL;
|
||||
#endif
|
||||
}
|
||||
@@ -90,7 +90,7 @@ wxWindow::~wxWindow()
|
||||
// Have to delete constraints/sizer FIRST otherwise
|
||||
// sizers may try to look at deleted windows as they
|
||||
// delete themselves.
|
||||
#if USE_CONSTRAINTS
|
||||
#if wxUSE_CONSTRAINTS
|
||||
DeleteRelatedConstraints();
|
||||
if (m_constraints)
|
||||
{
|
||||
@@ -157,7 +157,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id,
|
||||
m_autoLayout = FALSE;
|
||||
m_windowValidator = NULL;
|
||||
|
||||
#if USE_DRAG_AND_DROP
|
||||
#if wxUSE_DRAG_AND_DROP
|
||||
m_pDropTarget = NULL;
|
||||
#endif
|
||||
|
||||
@@ -249,7 +249,7 @@ wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#if USE_DRAG_AND_DROP
|
||||
#if wxUSE_DRAG_AND_DROP
|
||||
|
||||
void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user