From 6bfc18d01649c47eb2157f1333d8c189be83ee4d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 2 Jul 2008 14:45:57 +0000 Subject: [PATCH] don't use @true and @NULL inside of @code sections git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- interface/wx/log.h | 2 +- interface/wx/module.h | 2 +- interface/wx/propdlg.h | 4 ++-- interface/wx/snglinst.h | 8 ++++---- interface/wx/splash.h | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/interface/wx/log.h b/interface/wx/log.h index e0d162ed44..fb684e769f 100644 --- a/interface/wx/log.h +++ b/interface/wx/log.h @@ -126,7 +126,7 @@ public: // don't delete logChain directly as this would leave a dangling // pointer as active log target, use SetActiveTarget() instead - delete wxLog::SetActiveTarget(...something else or @NULL...); + delete wxLog::SetActiveTarget(...something else or NULL...); @endcode @library{wxbase} diff --git a/interface/wx/module.h b/interface/wx/module.h index c8f1ff78c4..4257e35be6 100644 --- a/interface/wx/module.h +++ b/interface/wx/module.h @@ -33,7 +33,7 @@ { public: wxDDEModule() { } - virtual bool OnInit() { wxDDEInitialize(); return @true; }; + virtual bool OnInit() { wxDDEInitialize(); return true; }; virtual void OnExit() { wxDDECleanUp(); }; private: diff --git a/interface/wx/propdlg.h b/interface/wx/propdlg.h index 80589541a8..b2a45243c1 100644 --- a/interface/wx/propdlg.h +++ b/interface/wx/propdlg.h @@ -74,7 +74,7 @@ enum wxPropertySheetDialogFlags bool MyPropertySheetDialog::Create(...) { if (!wxPropertySheetDialog::Create(...)) - return @false; + return false; CreateButtons(wxOK|wxCANCEL|wxHELP); @@ -83,7 +83,7 @@ enum wxPropertySheetDialogFlags GetBookCtrl()->AddPage(panel, wxT("General")); LayoutDialog(); - return @true; + return true; } @endcode diff --git a/interface/wx/snglinst.h b/interface/wx/snglinst.h index 9093f08a02..41e539fde2 100644 --- a/interface/wx/snglinst.h +++ b/interface/wx/snglinst.h @@ -28,15 +28,15 @@ { wxLogError(_("Another program instance is already running, aborting.")); - delete m_checker; // OnExit() won't be called if we return @false - m_checker = @NULL; + delete m_checker; // OnExit() won't be called if we return false + m_checker = NULL; - return @false; + return false; } ... more initializations ... - return @true; + return true; } int MyApp::OnExit() diff --git a/interface/wx/splash.h b/interface/wx/splash.h index 698f910a39..8f1b0b51fd 100644 --- a/interface/wx/splash.h +++ b/interface/wx/splash.h @@ -23,7 +23,7 @@ { wxSplashScreen* splash = new wxSplashScreen(bitmap, wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT, - 6000, @NULL, -1, wxDefaultPosition, wxDefaultSize, + 6000, NULL, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE|wxSTAY_ON_TOP); } wxYield(); -- 2.45.2