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

diff --git a/interface/wx/log.h b/interface/wx/log.h
index e0d162ed4406a16cafa0ab9cd44d39abfa287080..fb684e769f2672906da5dbbe8b692264a809d3dd 100644 (file)
--- 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
 
     // 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}
     @endcode
 
     @library{wxbase}

diff --git a/interface/wx/module.h b/interface/wx/module.h
index c8f1ff78c474218c74a99e07bd5273d89f0df0e2..4257e35be638c8493fd689e4518ab9963529be4a 100644 (file)
--- a/interface/wx/module.h
+++ b/interface/wx/module.h
@@ -33,7 +33,7 @@
       {
       public:
           wxDDEModule() { }
       {
       public:
           wxDDEModule() { }

-          virtual bool OnInit() { wxDDEInitialize(); return @true; };
+          virtual bool OnInit() { wxDDEInitialize(); return true; };

           virtual void OnExit() { wxDDECleanUp(); };
 
       private:
           virtual void OnExit() { wxDDECleanUp(); };
 
       private:

diff --git a/interface/wx/propdlg.h b/interface/wx/propdlg.h
index 80589541a8124bf159257533ea769ec8ccec79fa..b2a45243c1ab2b2515cc9988c367eb443268a5d9 100644 (file)
--- a/interface/wx/propdlg.h
+++ b/interface/wx/propdlg.h
@@ -74,7 +74,7 @@ enum wxPropertySheetDialogFlags
     bool MyPropertySheetDialog::Create(...)
     {
         if (!wxPropertySheetDialog::Create(...))
     bool MyPropertySheetDialog::Create(...)
     {
         if (!wxPropertySheetDialog::Create(...))

-            return @false;
+            return false;

 
         CreateButtons(wxOK|wxCANCEL|wxHELP);
 
 
         CreateButtons(wxOK|wxCANCEL|wxHELP);
 


@@ -83,7 +83,7 @@ enum wxPropertySheetDialogFlags
         GetBookCtrl()->AddPage(panel, wxT("General"));
 
         LayoutDialog();
         GetBookCtrl()->AddPage(panel, wxT("General"));
 
         LayoutDialog();

-        return @true;
+        return true;

     }
     @endcode
 
     }
     @endcode
 

diff --git a/interface/wx/snglinst.h b/interface/wx/snglinst.h
index 9093f08a02144803b60f881cff017cf8343d0064..41e539fde20910ed07d0f75194d28207ac936563 100644 (file)
--- a/interface/wx/snglinst.h
+++ b/interface/wx/snglinst.h
@@ -28,15 +28,15 @@
         {
             wxLogError(_("Another program instance is already running, aborting."));
 
         {
             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 ...
 
         }
 
         ... more initializations ...
 

-        return @true;
+        return true;

     }
 
     int MyApp::OnExit()
     }
 
     int MyApp::OnExit()

diff --git a/interface/wx/splash.h b/interface/wx/splash.h
index 698f910a39789a28dd25100e0a3b18cb3c4dcad7..8f1b0b51fdd4e5c7f539ace3992548f27851d1fb 100644 (file)
--- 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,
       {
           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();
               wxBORDER_SIMPLE|wxSTAY_ON_TOP);
       }
       wxYield();