Fix debug_form and trace_form

gammasoft71 · May 5, 2024 · 8b74cc0 · 8b74cc0
1 parent 3bb60dc
commit 8b74cc0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/xtd.forms/include/xtd/forms/debug_form.h b/src/xtd.forms/include/xtd/forms/debug_form.h
@@ -41,6 +41,7 @@ namespace xtd {
         xtd::diagnostics::debug::listeners().push_back(listener_);
         #if !defined(NDEBUG) || defined(DEBUG) || defined(TRACE)
         visible(true);
+        defined = true;
         #endif
       }
       /// @}
@@ -66,14 +67,12 @@ namespace xtd {
       void flush() override;
 
       void write(const xtd::ustring& debug) override {
-        #if !defined(NDEBUG) || defined(DEBUG) || defined(TRACE)
+        if (!defined) return;
         trace_form_base::write(debug);
-        #endif
       }
       void write_line(const xtd::ustring& debug) override {
-        #if !defined(NDEBUG) || defined(DEBUG) || defined(TRACE)
+        if (!defined) return;
         trace_form_base::write_line(debug);
-        #endif
       }
       /// @}
 
@@ -90,6 +89,7 @@ namespace xtd {
 
     private:
       std::shared_ptr<xtd::diagnostics::trace_listener> listener_ = xtd::forms::control_trace_listener::create(*this);
+      bool defined = false;
     };
   }
 }
diff --git a/src/xtd.forms/include/xtd/forms/trace_form.h b/src/xtd.forms/include/xtd/forms/trace_form.h
@@ -41,6 +41,7 @@ namespace xtd {
         xtd::diagnostics::trace::listeners().push_back(listener_);
         #if defined(TRACE)
         visible(true);
+        defined = true;
         #endif
       }
       /// @}
@@ -64,14 +65,12 @@ namespace xtd {
 
       /// @{
       void write(const xtd::ustring& trace) override {
-        #if defined(TRACE)
+        if (!defined) return;
         trace_form_base::write(trace);
-        #endif
       }
       void write_line(const xtd::ustring& trace) override {
-        #if defined(TRACE)
+        if (!defined) return;
         trace_form_base::write_line(trace);
-        #endif
       }
 
       void flush() override;
@@ -90,6 +89,7 @@ namespace xtd {
 
     private:
       std::shared_ptr<xtd::diagnostics::trace_listener> listener_ = xtd::forms::control_trace_listener::create(*this);
+      bool defined = false;
     };
   }
 }