X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8461e4c253d4cec65e8f0320246a56d22555eb5e..3dccf96eabc68d95839782d35e6193855f007fd2:/include/wx/msw/app.h?ds=sidebyside diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h index e361fa3ca8..d43d6a20cb 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_ -#ifdef __GNUG__ -#pragma interface "app.h" -#endif - #include "wx/event.h" #include "wx/icon.h" -class WXDLLEXPORT wxFrame; -class WXDLLEXPORT wxWindow; -class WXDLLEXPORT wxApp ; -class WXDLLEXPORT wxKeyEvent; -class WXDLLEXPORT wxLog; +class WXDLLIMPEXP_CORE wxFrame; +class WXDLLIMPEXP_CORE wxWindow; +class WXDLLIMPEXP_CORE wxApp; +class WXDLLIMPEXP_CORE wxKeyEvent; +class WXDLLIMPEXP_BASE wxLog; // Represents the application. Derive OnInit and declare // a new App object to start application @@ -36,14 +32,11 @@ public: virtual ~wxApp(); // override base class (pure) virtuals - virtual int MainLoop(); - virtual void ExitMainLoop(); - virtual bool Initialized(); - virtual bool Pending(); - virtual void Dispatch(); - virtual bool Yield(bool onlyIfNeeded = FALSE); + virtual bool Initialize(int& argc, wxChar **argv); + virtual void CleanUp(); - virtual wxIcon GetStdIcon(int which) const; + virtual bool Yield(bool onlyIfNeeded = false); + virtual void WakeUpIdle(); virtual void SetPrintMode(int mode) { m_printMode = mode; } virtual int GetPrintMode() const { return m_printMode; } @@ -53,56 +46,20 @@ public: void OnEndSession(wxCloseEvent& event); void OnQueryEndSession(wxCloseEvent& event); - // Send idle event to all top-level windows. - // Returns TRUE if more idle time is requested. - bool SendIdleEvents(); - - // Send idle event to window and all subwindows - // Returns TRUE if more idle time is requested. - bool SendIdleEvents(wxWindow* win); - - void SetAuto3D(bool flag) { m_auto3D = flag; } - bool GetAuto3D() const { return m_auto3D; } +#if wxUSE_EXCEPTIONS + virtual bool OnExceptionInMainLoop(); +#endif // wxUSE_EXCEPTIONS protected: - bool m_showOnInit; int m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT - bool m_auto3D ; // Always use 3D controls, except where overriden - - /* Windows-specific wxApp definitions */ public: - // Implementation - static bool Initialize(); - static void CleanUp(); - static bool RegisterWindowClasses(); static bool UnregisterWindowClasses(); - // Convert Windows to argc, argv style - void ConvertToStandardCommandArgs(char* p); - - // message processing - // ------------------ - - // process the given message - virtual void DoMessage(WXMSG *pMsg); - - // retrieve the next message from the queue and process it - virtual bool DoMessage(); - - // preprocess the message - virtual bool ProcessMessage(WXMSG* pMsg); - - // idle processing - // --------------- - - void DeletePendingObjects(); - bool ProcessIdle(); - #if wxUSE_RICHEDIT - // initialize the richedit DLL of (at least) given version, return TRUE if + // initialize the richedit DLL of (at least) given version, return true if // ok (Win95 has version 1, Win98/NT4 has 1 and 2, W2K has 3) static bool InitRichEdit(int version = 2); #endif // wxUSE_RICHEDIT @@ -111,22 +68,48 @@ public: // wasn't found at all static int GetComCtl32Version(); -public: - int m_nCmdShow; + // 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; protected: - bool m_keepGoing; - DECLARE_EVENT_TABLE() + DECLARE_NO_COPY_CLASS(wxApp) }; -#if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL)) -int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance, WXHINSTANCE hPrevInstance, - char *lpszCmdLine, int nCmdShow, bool enterLoop = TRUE); -#else -int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance); +// ---------------------------------------------------------------------------- +// MSW-specific wxEntry() overload and IMPLEMENT_WXWIN_MAIN definition +// ---------------------------------------------------------------------------- + +// we need HINSTANCE declaration to define WinMain() +#include "wx/msw/wrapwin.h" + +#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 + typedef char *wxCmdLineArgType; #endif - // _WX_APP_H_ + +extern int WXDLLEXPORT +wxEntry(HINSTANCE hInstance, + HINSTANCE hPrevInstance = NULL, + wxCmdLineArgType pCmdLine = NULL, + int nCmdShow = SW_SHOWNORMAL); + +#define IMPLEMENT_WXWIN_MAIN \ + extern "C" int WINAPI WinMain(HINSTANCE hInstance, \ + HINSTANCE hPrevInstance, \ + wxCmdLineArgType lpCmdLine, \ + int nCmdShow) \ + { \ + return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow); \ + } + +#endif // _WX_APP_H_