Remove left over conflict markers from documentation.

[wxWidgets.git] / interface / wx / notifmsg.h

diff --git a/interface/wx/notifmsg.h b/interface/wx/notifmsg.h
index 40e039bf9e99e02f41cab96ee42aba61cc1d502a..68a8d1ab73b27f054eb11228eac403d4543aa75d 100644 (file)
--- a/interface/wx/notifmsg.h
+++ b/interface/wx/notifmsg.h
@@ -24,6 +24,13 @@
 class wxNotificationMessage : public wxEvtHandler
 {
 public:
+    /// Possible values for Show() timeout.
+    enum
+    {
+        Timeout_Auto = -1,  ///< Notification will be hidden automatically.
+        Timeout_Never = 0   ///< Notification will never time out.
+    };
+
     /**
         Default constructor, use SetParent(), SetTitle() and SetMessage() to
         initialize the object before showing it.