destroyed global classes; view hierarchy instead

[chaz/yoink] / src / Moof / ModalDialog.hh

diff --git a/src/Moof/ModalDialog.hh b/src/Moof/ModalDialog.hh
index 8bb6741f80148dfbf5b9d3d8c3d1d11348d91a24..d56d8ea08f7dc217611bf17453574116975d9110 100644 (file)
--- a/src/Moof/ModalDialog.hh
+++ b/src/Moof/ModalDialog.hh
@@ -18,7 +18,7 @@
 #include "../config.h"
 #endif
 
-#if defined(_WIN32) || defined(__WIN32__)
+#if defined(_WIN32)
 #include <windows.h>
 #elif defined(__APPLE__) && defined(__MACH__)
 #include <Carbon/Carbon.h>
@@ -57,6 +57,17 @@ struct ModalDialog
        std::string text2;
 
 
+
+       ModalDialog(Type pType = INFO,
+                               const std::string& pTitle = "",
+                               const std::string& pText1 = "",
+                               const std::string& pText2 = "") :
+               title(pTitle),
+               type(pType),
+               text1(pText1),
+               text2(pText2) {}
+
+
        void run() const
        {
                switch (type)
@@ -75,7 +86,7 @@ struct ModalDialog
                                break;
                }
 
-#if defined(_WIN32) || defined(__WIN32__)
+#if defined(_WIN32)
 
                int iconType;
                switch (type)