moved SetBestSize() to .cpp file; set min size from it

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 85ba83f552b1e382f6436d237fc80cd499301b4b..b2e7a337b9e668897faa84ff4a6f515428870426 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -121,7 +121,7 @@ public:
     // event loop: it may return true to continue running the event loop or
     // false to stop it (in the latter case it may rethrow the exception as
     // well)
-    virtual bool OnExceptionInMainLoop() { throw; }
+    virtual bool OnExceptionInMainLoop();
 
     // Called when an unhandled C++ exception occurs inside OnRun(): note that
     // the exception type is lost by now, so if you really want to handle the
@@ -627,20 +627,26 @@ public:
     // we need HINSTANCE declaration to define WinMain()
     #include "wx/msw/wrapwin.h"
 
-    #ifdef SW_SHOWNORMAL
-    #define wxSW_SHOWNORMAL SW_SHOWNORMAL
+    #ifndef SW_SHOWNORMAL
+        #define SW_SHOWNORMAL 1
+    #endif
+
+    // WinMain() is always ANSI, even in Unicode build, under normal Windows
+    // but is always Unicode under CE
+    #ifdef __WXWINCE__
+        typedef wchar_t *wxCmdLineArgType;
     #else
-    #define wxSW_SHOWNORMAL 0
+        typedef char *wxCmdLineArgType;
     #endif
 
     #define IMPLEMENT_WXWIN_MAIN \
         extern int wxEntry(HINSTANCE hInstance,                               \
                            HINSTANCE hPrevInstance = NULL,                    \
-                           char *pCmdLine = NULL,                             \
-                           int nCmdShow = wxSW_SHOWNORMAL);                         \
+                           wxCmdLineArgType pCmdLine = NULL,                  \
+                           int nCmdShow = SW_SHOWNORMAL);                     \
         extern "C" int WINAPI WinMain(HINSTANCE hInstance,                    \
                                       HINSTANCE hPrevInstance,                \
-                                      char *lpCmdLine,                        \
+                                      wxCmdLineArgType lpCmdLine,             \
                                       int nCmdShow)                           \
         {                                                                     \
             return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow);    \