Toolbar/tooltip udates

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index f299a952ea6f0abc6da1c16d459b475f54d02be9..852a5b50e7fedc71f0bdd74383e4065b25d1847e 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -16,9 +16,8 @@
 #pragma interface "app.h"
 #endif
 
 #pragma interface "app.h"
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"

 #include "wx/event.h"
 #include "wx/event.h"

+#include "wx/icon.h"

 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;


@@ -26,139 +25,102 @@ class WXDLLEXPORT wxApp ;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 

-#define wxPRINT_WINDOWS         1
-#define wxPRINT_POSTSCRIPT      2
-
-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
 // Represents the application. Derive OnInit and declare
 // a new App object to start application

-class WXDLLEXPORT wxApp: public wxEvtHandler
+class WXDLLEXPORT wxApp : public wxAppBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxApp)
-  wxApp();
-  ~wxApp();
-
-  static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
-  static wxAppInitializerFunction GetInitializerFunction() { return m_appInitFn; }
-
-  virtual int MainLoop();
-  void ExitMainLoop();
-  bool Initialized();
-  virtual bool Pending() ;
-  virtual void Dispatch() ;
+    DECLARE_DYNAMIC_CLASS(wxApp)

 
 

-  void OnIdle(wxIdleEvent& event);
-  void OnEndSession(wxCloseEvent& event);
-  void OnQueryEndSession(wxCloseEvent& event);
+public:
+    wxApp();
+    virtual ~wxApp();

 
 

-  // Generic
-  virtual bool OnInit() { return FALSE; };
+    // 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);

 
 

-  // No specific tasks to do here.
-  virtual bool OnInitGui() { return TRUE; }
+    virtual void SetPrintMode(int mode) { m_printMode = mode; }
+    virtual int GetPrintMode() const { return m_printMode; }

 
 

-  // Called to set off the main loop
-  virtual int OnRun() { return MainLoop(); };
-  virtual int OnExit() { return 0; }
+    // implementation only
+    void OnIdle(wxIdleEvent& event);
+    void OnEndSession(wxCloseEvent& event);
+    void OnQueryEndSession(wxCloseEvent& event);

 
 

-  // called when a fatal exception occurs, this function should take care not
-  // to do anything which might provoke a nested exception!
-  virtual void OnFatalException() { }
+    // Send idle event to all top-level windows.
+    // Returns TRUE if more idle time is requested.
+    bool SendIdleEvents();

 
 

-  inline void SetPrintMode(int mode) { m_printMode = mode; }
-  inline int GetPrintMode() const { return m_printMode; }
+    // Send idle event to window and all subwindows
+    // Returns TRUE if more idle time is requested.
+    bool SendIdleEvents(wxWindow* win);

 
 

-  inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
-  inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }
+    void SetAuto3D(bool flag) { m_auto3D = flag; }
+    bool GetAuto3D() const { return m_auto3D; }

 
 

-  inline wxString GetAppName() const {
-      if (m_appName != "")
-        return m_appName;
-      else return m_className;
-    }
+protected:
+    bool   m_showOnInit;
+    int    m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
+    bool   m_auto3D ;   // Always use 3D controls, except where overriden

 
 

-  inline void SetAppName(const wxString& name) { m_appName = name; };
-  inline wxString GetClassName() const { return m_className; }
-  inline void SetClassName(const wxString& name) { m_className = name; }
+    /* Windows-specific wxApp definitions */

 
 

-  void SetVendorName(const wxString& vendorName) { m_vendorName = vendorName; }
-  const wxString& GetVendorName() const { return m_vendorName; }
+public:

 
 

-  wxWindow *GetTopWindow() const ;
-  inline void SetTopWindow(wxWindow *win) { m_topWindow = win; }
+    // Implementation
+    static bool Initialize();
+    static void CleanUp();

 
 

-  inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
-  inline bool GetWantDebugOutput() { return m_wantDebugOutput; }
+    static bool RegisterWindowClasses();
+    static bool UnregisterWindowClasses();

 
 

-  // Send idle event to all top-level windows.
-  // Returns TRUE if more idle time is requested.
-  bool SendIdleEvents();
+    // Convert Windows to argc, argv style
+    void ConvertToStandardCommandArgs(const char* p);

 
 

-  // Send idle event to window and all subwindows
-  // Returns TRUE if more idle time is requested.
-  bool SendIdleEvents(wxWindow* win);
+    // message processing
+    // ------------------

 
 

-  inline void SetAuto3D(bool flag) { m_auto3D = flag; }
-  inline bool GetAuto3D() const { return m_auto3D; }
+    // process the given message
+    virtual void DoMessage(WXMSG *pMsg);

 
 

-  // Creates a log object
-  virtual wxLog* CreateLogTarget();
+    // retrieve the next message from the queue and process it
+    virtual bool DoMessage();

 
 

-public:
-//  void (*work_proc)(wxApp*app); // work procedure;
-  int               argc;
-  char **           argv;
+    // preprocess the message
+    virtual bool ProcessMessage(WXMSG* pMsg);

 
 

-protected:
-  bool              m_wantDebugOutput ;
-  wxString          m_className;
-  wxString          m_appName,
-                    m_vendorName;
-  wxWindow *        m_topWindow;
-  bool              m_exitOnFrameDelete;
-  bool              m_showOnInit;
-  int               m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
-  bool              m_auto3D ;   // Always use 3D controls, except
-                                 // where overriden
-  static wxAppInitializerFunction      m_appInitFn;
-
-/* Windows-specific wxApp definitions */
+    // idle processing
+    // ---------------

 
 

-public:
+    void DeletePendingObjects();
+    bool ProcessIdle();

 
 

-  // Implementation
-  static bool Initialize();
-  static void CleanUp();
+#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

 
 

-  static bool RegisterWindowClasses();
-  // Convert Windows to argc, argv style
-  void ConvertToStandardCommandArgs(char* p);
-  virtual bool DoMessage();
-  virtual bool ProcessMessage(WXMSG* pMsg);
-  void DeletePendingObjects();
-  bool ProcessIdle();
-  int GetComCtl32Version() const;
+    // 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:
 
 public:

-  static long       sm_lastMessageTime;
-  int               m_nCmdShow;
+    int               m_nCmdShow;

 
 protected:
 
 protected:

-  bool              m_keepGoing ;
+    bool              m_keepGoing;

 
 

-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()

 };
 
 #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
 };
 
 #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
 #else
 int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance);
 #endif