X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4e76e0d7e4c1be878e125df31dc9370bb0fa99e..e74bfc5d1a4b64f4d4f569a8f7d9a86a35f0e06d:/include/wx/app.h?ds=sidebyside

diff --git a/include/wx/app.h b/include/wx/app.h
index 6a92d6e28e..d454acf6fa 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -9,31 +9,34 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __APPH_BASE__
-#define __APPH_BASE__
+#ifndef _WX_APP_H_BASE_
+#define _WX_APP_H_BASE_
 
-#ifndef __WXGTK__
+#ifdef __WXMSW__
 class WXDLLEXPORT wxApp;
 typedef wxApp* (*wxAppInitializerFunction) (void);
 #endif
 
 #include "wx/object.h"
 
-#ifdef __WXGTK__
+#ifndef __WXMSW__
 typedef wxObject* (*wxAppInitializerFunction) (void);  // returning wxApp* won't work with gcc
 #endif
 
 #if defined(__WXMSW__)
 #include "wx/msw/app.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/app.h"
+#include "wx/motif/app.h"
 #elif defined(__WXQT__)
 #include "wx/qt/app.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/app.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/app.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/app.h"
 #endif
 
-
 // Having a global instance of this class allows
 // wxApp to be aware of the app creator function.
 // wxApp can then call this function to create a new
@@ -72,4 +75,4 @@ int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
 
 
 #endif
-    // __APPH_BASE__
+    // _WX_APP_H_BASE_