Changed GetSize to DoGetSize so virtual GetSize works right.

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 4b586b74ad30337576e0fd7b0db72a6e4b938c21..64b479d1f05c58c252e3e57ff43745f1301e9ceb 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


@@ -51,8 +56,30 @@ public:
 // (e.g. hello.cpp).
 // Now IMPLEMENT_APP should add this code if required.
 
 // (e.g. hello.cpp).
 // Now IMPLEMENT_APP should add this code if required.
 

-#if defined(AIX) || defined(AIX4) /* || defined(____HPUX__) */
-#define IMPLEMENT_WXWIN_MAIN int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
+#if defined(__AIX__) || defined(__HPUX__)
+#define IMPLEMENT_WXWIN_MAIN \
+extern int wxEntry( int argc, char *argv[] ); \
+int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
+
+#elif defined(__WXMSW__) && defined(WXUSINGDLL)
+
+// NT defines APIENTRY, 3.x not
+#if !defined(WXAPIENTRY)
+#  ifdef __WATCOMC__
+#    define WXAPIENTRY PASCAL
+#  else
+#    define WXAPIENTRY FAR PASCAL
+#  endif
+#endif
+
+#define IMPLEMENT_WXWIN_MAIN \
+int WXAPIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,\
+        LPSTR m_lpCmdLine, int nCmdShow )\
+{\
+    return wxEntry((WXHINSTANCE) hInstance, (WXHINSTANCE) hPrevInstance,\
+                   m_lpCmdLine, nCmdShow);\
+}
+

 #else
 #define IMPLEMENT_WXWIN_MAIN
 #endif
 #else
 #define IMPLEMENT_WXWIN_MAIN
 #endif


@@ -68,4 +95,4 @@ public:
 
 
 #endif
 
 
 #endif

-    // __APPH_BASE__
+    // _WX_APP_H_BASE_