X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77c46f00b51b8476ec53691dabbc2fa8a7f6a165..76c32e7b97bbd5d0c809dd59cba2926be016f7af:/include/wx/msw/app.h?ds=inline diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h index c05d831790..601c4ab932 100644 --- a/include/wx/msw/app.h +++ b/include/wx/msw/app.h @@ -12,18 +12,14 @@ #ifndef _WX_APP_H_ #define _WX_APP_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "app.h" -#endif - #include "wx/event.h" #include "wx/icon.h" -class WXDLLIMPEXP_CORE wxFrame; -class WXDLLIMPEXP_CORE wxWindow; -class WXDLLIMPEXP_CORE wxApp; -class WXDLLIMPEXP_CORE wxKeyEvent; -class WXDLLIMPEXP_BASE wxLog; +class WXDLLIMPEXP_FWD_CORE wxFrame; +class WXDLLIMPEXP_FWD_CORE wxWindow; +class WXDLLIMPEXP_FWD_CORE wxApp; +class WXDLLIMPEXP_FWD_CORE wxKeyEvent; +class WXDLLIMPEXP_FWD_BASE wxLog; // Represents the application. Derive OnInit and declare // a new App object to start application @@ -72,6 +68,10 @@ public: // wasn't found at all static int GetComCtl32Version(); + // the same for shell32.dll: returns 400, 471, 500, 600, ... (4.70 not + // currently detected) + static int GetShell32Version(); + // the SW_XXX value to be used for the frames opened by the application // (currently seems unused which is a bug -- TODO) static int m_nCmdShow; @@ -100,6 +100,14 @@ protected: typedef char *wxCmdLineArgType; #endif +// wxMSW-only overloads of wxEntry() and wxEntryStart() which take the +// parameters passed to WinMain() instead of those passed to main() +extern bool WXDLLEXPORT +wxEntryStart(HINSTANCE hInstance, + HINSTANCE hPrevInstance = NULL, + wxCmdLineArgType pCmdLine = NULL, + int nCmdShow = SW_SHOWNORMAL); + extern int WXDLLEXPORT wxEntry(HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL,