Rename wxWebHistoryItem to wxWebViewHistoryItem.

[wxWidgets.git] / src / generic / notifmsgg.cpp

diff --git a/src/generic/notifmsgg.cpp b/src/generic/notifmsgg.cpp
index 364cab307ea63640649b2a2cb58b5146fabf6055..fe90a69f450a0ff95b04bb1b4811478800b476d5 100644 (file)
--- a/src/generic/notifmsgg.cpp
+++ b/src/generic/notifmsgg.cpp
@@ -27,7 +27,11 @@
     #define wxUSE_LIBHILDON 0
 #endif
 
     #define wxUSE_LIBHILDON 0
 #endif
 

-#if wxUSE_NOTIFICATION_MESSAGE && !wxUSE_LIBHILDON
+#ifndef wxUSE_LIBHILDON2
+    #define wxUSE_LIBHILDON2 0
+#endif
+
+#if wxUSE_NOTIFICATION_MESSAGE && (!wxUSE_LIBHILDON || !wxUSE_LIBHILDON2)

 
 #ifndef WX_PRECOMP
     #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dialog.h"


@@ -81,7 +85,7 @@ private:
 
 
     DECLARE_EVENT_TABLE()
 
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxNotificationMessageDialog)
+    wxDECLARE_NO_COPY_CLASS(wxNotificationMessageDialog);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -238,4 +242,4 @@ bool wxGenericNotificationMessage::Close()
     return true;
 }
 
     return true;
 }
 

-#endif // wxUSE_NOTIFICATION_MESSAGE && !wxUSE_LIBHILDON
+#endif // wxUSE_NOTIFICATION_MESSAGE && (!wxUSE_LIBHILDON || !wxUSE_LIBHILDON2)