build system enhancements

[chaz/yoink] / src / moof / modal_dialog.hh

diff --git a/src/moof/modal_dialog.hh b/src/moof/modal_dialog.hh
index c53766237df20bd20ae5153c6eea872f1de5825c..4498692c9a3a79bade1539f6f778bd71fde20fc8 100644 (file)
--- a/src/moof/modal_dialog.hh
+++ b/src/moof/modal_dialog.hh
@@ -22,11 +22,11 @@
 
 #include <string>
 
-#if defined(_WIN32)
+#if PLATFORM_WIN32
 #include <windows.h>
-#elif WITH_GTK
+#elif WITH_GUI_GTK
 #include <gtk/gtk.h>
-#elif WITH_QT4
+#elif WITH_GUI_QT4
 #include <QApplication>
 #include <QIcon>
 #include <QMessageBox>
@@ -94,7 +94,7 @@ struct modal_dialog
                                break;
                }
 
-#if defined(_WIN32)
+#if PLATFORM_WIN32
 
                int icon_type;
                switch (type)
@@ -113,7 +113,7 @@ struct modal_dialog
                MessageBox(0, (text1 + "\n" + text2).c_str(), title.c_str(),
                                   MB_OK | icon_type);
 
-#elif WITH_GTK
+#elif WITH_GUI_GTK
 
                int             argc = 0;
                char**  argv;
@@ -153,7 +153,7 @@ struct modal_dialog
                // FIXME - this doesn't seem to actually remove the window from the
                // screen when it closes
 
-#elif WITH_QT4
+#elif WITH_GUI_QT4
 
                int             argc = 0;
                char**  argv;