X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/094637f6d69918150d3dfdb199ad7c92e3189f78..10769d8c47c21fe0ec5034726791a5ad4cf19475:/include/wx/msw/app.h diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h index 2f1cf96ad2..852a5b50e7 100644 --- a/include/wx/msw/app.h +++ b/include/wx/msw/app.h @@ -16,8 +16,6 @@ #pragma interface "app.h" #endif -#include "wx/defs.h" -#include "wx/object.h" #include "wx/event.h" #include "wx/icon.h" @@ -27,14 +25,6 @@ class WXDLLEXPORT wxApp ; class WXDLLEXPORT wxKeyEvent; class WXDLLEXPORT wxLog; -WXDLLEXPORT_DATA(extern wxApp*) wxTheApp; - -// Force an exit from main loop -void WXDLLEXPORT wxExit(); - -// Yield to other apps/messages -bool WXDLLEXPORT wxYield(); - // Represents the application. Derive OnInit and declare // a new App object to start application class WXDLLEXPORT wxApp : public wxAppBase @@ -49,10 +39,9 @@ public: virtual int MainLoop(); virtual void ExitMainLoop(); virtual bool Initialized(); - virtual bool Pending() ; - virtual void Dispatch() ; - - virtual wxIcon GetStdIcon(int which) const; + virtual bool Pending(); + virtual void Dispatch(); + virtual bool Yield(bool onlyIfNeeded = FALSE); virtual void SetPrintMode(int mode) { m_printMode = mode; } virtual int GetPrintMode() const { return m_printMode; } @@ -74,9 +63,9 @@ public: bool GetAuto3D() const { return m_auto3D; } protected: - bool m_showOnInit; - int m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT - bool m_auto3D ; // Always use 3D controls, except where overriden + bool m_showOnInit; + int m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT + bool m_auto3D ; // Always use 3D controls, except where overriden /* Windows-specific wxApp definitions */ @@ -87,29 +76,51 @@ public: static void CleanUp(); static bool RegisterWindowClasses(); + static bool UnregisterWindowClasses(); + // Convert Windows to argc, argv style - void ConvertToStandardCommandArgs(char* p); + void ConvertToStandardCommandArgs(const 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_THREADS - void ProcessPendingEvents(); -#endif - int GetComCtl32Version() const; + +#if wxUSE_RICHEDIT + // 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 + + // returns 400, 470, 471 for comctl32.dll 4.00, 4.70, 4.71 or 0 if it + // wasn't found at all + static int GetComCtl32Version(); public: int m_nCmdShow; protected: - bool m_keepGoing ; + bool m_keepGoing; DECLARE_EVENT_TABLE() }; #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL)) -int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance, WXHINSTANCE hPrevInstance, char *lpszCmdLine, - int nCmdShow, bool enterLoop = TRUE); +int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance, WXHINSTANCE hPrevInstance, + char *lpszCmdLine, int nCmdShow, bool enterLoop = TRUE); #else int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance); #endif