Correct the wxButton::Setlabel nonsense

[wxWidgets.git] / include / wx / app.h

diff --git a/include/wx/app.h b/include/wx/app.h
index e4fd1864864b9a5ae810d91a47cf6c0a11bacbf9..5bfeb5db301e5e02c1aeab47e16f319f62145d42 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -12,22 +12,24 @@
 #ifndef __APPH_BASE__
 #define __APPH_BASE__
 
-#ifndef __GTK__
+#ifdef __WXMSW__
 class WXDLLEXPORT wxApp;
 typedef wxApp* (*wxAppInitializerFunction) (void);
 #endif
 
 #include "wx/object.h"
 
-#ifdef __GTK__
+#ifndef __WXMSW__
 typedef wxObject* (*wxAppInitializerFunction) (void);  // returning wxApp* won't work with gcc
 #endif
 
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
 #include "wx/msw/app.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
 #include "wx/xt/app.h"
-#elif defined(__GTK__)
+#elif defined(__WXQT__)
+#include "wx/qt/app.h"
+#elif defined(__WXGTK__)
 #include "wx/gtk/app.h"
 #endif