wxTextFile::Type changed to ::wxTextFileType (portability)

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

diff --git a/include/wx/app.h b/include/wx/app.h
index e4fd1864864b9a5ae810d91a47cf6c0a11bacbf9..d454acf6fa39371bbc875ecffc828899b6c09620 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -9,29 +9,34 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __APPH_BASE__
-#define __APPH_BASE__
+#ifndef _WX_APP_H_BASE_
+#define _WX_APP_H_BASE_

 
 

-#ifndef __GTK__
+#ifdef __WXMSW__

 class WXDLLEXPORT wxApp;
 typedef wxApp* (*wxAppInitializerFunction) (void);
 #endif
 
 #include "wx/object.h"
 
 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
 
 typedef wxObject* (*wxAppInitializerFunction) (void);  // returning wxApp* won't work with gcc
 #endif
 

-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)

 #include "wx/msw/app.h"
 #include "wx/msw/app.h"

-#elif defined(__MOTIF__)
-#include "wx/xt/app.h"
-#elif defined(__GTK__)
+#elif defined(__WXMOTIF__)
+#include "wx/motif/app.h"
+#elif defined(__WXQT__)
+#include "wx/qt/app.h"
+#elif defined(__WXGTK__)

 #include "wx/gtk/app.h"
 #include "wx/gtk/app.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/app.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/app.h"

 #endif
 
 #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
 // 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


@@ -70,4 +75,4 @@ int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
 
 
 #endif
 
 
 #endif

-    // __APPH_BASE__
+    // _WX_APP_H_BASE_