Motif compilation fixes (now ok)

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index 239e5888f3d65cf1e58c411d4e609cbbe650599d..c5cbcfcd066a5747e5829d7fc4c045c4907a0f7f 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __APPH__
-#define __APPH__
+#ifndef _WX_APP_H_
+#define _WX_APP_H_

 
 #ifdef __GNUG__
 #pragma interface "app.h"
 
 #ifdef __GNUG__
 #pragma interface "app.h"


@@ -18,6 +18,7 @@
 
 #include "wx/defs.h"
 #include "wx/object.h"
 
 #include "wx/defs.h"
 #include "wx/object.h"

+#include "wx/event.h"

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


@@ -25,104 +26,91 @@ class WXDLLEXPORT wxApp ;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 

-#if USE_WXCONFIG
-  class WXDLLEXPORT wxConfig;
-#endif //USE_WXCONFIG 
-

 #define wxPRINT_WINDOWS         1
 #define wxPRINT_POSTSCRIPT      2
 
 WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
 
 #define wxPRINT_WINDOWS         1
 #define wxPRINT_POSTSCRIPT      2
 
 WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
 

-void WXDLLEXPORT wxCleanUp(void);
-void WXDLLEXPORT wxCommonCleanUp(void); // Call this from the platform's wxCleanUp()
-void WXDLLEXPORT wxCommonInit(void);    // Call this from the platform's initialization
-

 // Force an exit from main loop
 // Force an exit from main loop

-void WXDLLEXPORT wxExit(void);
+void WXDLLEXPORT wxExit();

 
 // Yield to other apps/messages
 
 // Yield to other apps/messages

-bool WXDLLEXPORT wxYield(void);
+bool WXDLLEXPORT wxYield();

 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 class WXDLLEXPORT wxApp: public wxEvtHandler
 {
   DECLARE_DYNAMIC_CLASS(wxApp)
 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 class WXDLLEXPORT wxApp: public wxEvtHandler
 {
   DECLARE_DYNAMIC_CLASS(wxApp)

-  wxApp(void);
-  inline ~wxApp(void) {}
+  wxApp();
+  ~wxApp();

 
   static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
 
   static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }

-  static wxAppInitializerFunction GetInitializerFunction(void) { return m_appInitFn; }
+  static wxAppInitializerFunction GetInitializerFunction() { return m_appInitFn; }

 
 

-  virtual int MainLoop(void);
-  void ExitMainLoop(void);
-  bool Initialized(void);
-  virtual bool Pending(void) ;
-  virtual void Dispatch(void) ;
+  virtual int MainLoop();
+  void ExitMainLoop();
+  bool Initialized();
+  virtual bool Pending() ;
+  virtual void Dispatch() ;

 
 

-  virtual void OnIdle(wxIdleEvent& event);
-
-  // Windows specific. Intercept keyboard input.
-#if WXWIN_COMPATIBILITY == 2
-  virtual bool OldOnCharHook(wxKeyEvent& event);
-#endif
+  void OnIdle(wxIdleEvent& event);
+  void OnEndSession(wxCloseEvent& event);
+  void OnQueryEndSession(wxCloseEvent& event);

 
 

-// Generic
-  virtual bool OnInit(void) { return FALSE; };
+  // Generic
+  virtual bool OnInit() { return FALSE; };

 
   // No specific tasks to do here.
 
   // No specific tasks to do here.

-  virtual bool OnInitGui(void) { return TRUE; }
+  virtual bool OnInitGui() { return TRUE; }

 
   // Called to set off the main loop
 
   // Called to set off the main loop

-  virtual int OnRun(void) { return MainLoop(); };
-  virtual int OnExit(void) { return 0; };
+  virtual int OnRun() { return MainLoop(); };
+  virtual int OnExit() { return 0; }
+
+  // called when a fatal exception occurs, this function should take care not
+  // to do anything which might provoke a nested exception!
+  virtual void OnFatalException() { }
+

   inline void SetPrintMode(int mode) { m_printMode = mode; }
   inline void SetPrintMode(int mode) { m_printMode = mode; }

-  inline int GetPrintMode(void) const { return m_printMode; }
-  
-  inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
-  inline bool GetExitOnFrameDelete(void) const { return m_exitOnFrameDelete; }
+  inline int GetPrintMode() const { return m_printMode; }

 
 

-/*
-  inline void SetShowFrameOnInit(bool flag) { m_showOnInit = flag; }
-  inline bool GetShowFrameOnInit(void) const { return m_showOnInit; }
-*/
+  inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
+  inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }

 
 

-  inline wxString GetAppName(void) const {
+  inline wxString GetAppName() const {

       if (m_appName != "")
         return m_appName;
       else return m_className;
     }
 
   inline void SetAppName(const wxString& name) { m_appName = name; };
       if (m_appName != "")
         return m_appName;
       else return m_className;
     }
 
   inline void SetAppName(const wxString& name) { m_appName = name; };

-  inline wxString GetClassName(void) const { return m_className; }
+  inline wxString GetClassName() const { return m_className; }

   inline void SetClassName(const wxString& name) { m_className = name; }
   inline void SetClassName(const wxString& name) { m_className = name; }

-  wxWindow *GetTopWindow(void) const ;
+
+  void SetVendorName(const wxString& vendorName) { m_vendorName = vendorName; }
+  const wxString& GetVendorName() const { return m_vendorName; }
+
+  wxWindow *GetTopWindow() const ;

   inline void SetTopWindow(wxWindow *win) { m_topWindow = win; }
 
   inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
   inline void SetTopWindow(wxWindow *win) { m_topWindow = win; }
 
   inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }

-  inline bool GetWantDebugOutput(void) { return m_wantDebugOutput; }
+  inline bool GetWantDebugOutput() { return m_wantDebugOutput; }

 
   // Send idle event to all top-level windows.
   // Returns TRUE if more idle time is requested.
 
   // Send idle event to all top-level windows.
   // Returns TRUE if more idle time is requested.

-  bool SendIdleEvents(void);
+  bool SendIdleEvents();

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

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

 
   // Creates a log object
   virtual wxLog* CreateLogTarget();
 
 
   // Creates a log object
   virtual wxLog* CreateLogTarget();
 

-#if USE_WXCONFIG
-  // override this function to create a global wxConfig object of different
-  // than default type (right now the default implementation returns NULL)
-  virtual wxConfig* CreateConfig() { return NULL; }
-#endif //USE_WXCONFIG 
-

 public:
 //  void (*work_proc)(wxApp*app); // work procedure;
   int               argc;
 public:
 //  void (*work_proc)(wxApp*app); // work procedure;
   int               argc;


@@ -131,7 +119,8 @@ public:
 protected:
   bool              m_wantDebugOutput ;
   wxString          m_className;
 protected:
   bool              m_wantDebugOutput ;
   wxString          m_className;

-  wxString          m_appName;
+  wxString          m_appName,
+                    m_vendorName;

   wxWindow *        m_topWindow;
   bool              m_exitOnFrameDelete;
   bool              m_showOnInit;
   wxWindow *        m_topWindow;
   bool              m_exitOnFrameDelete;
   bool              m_showOnInit;


@@ -145,25 +134,20 @@ protected:
 public:
 
   // Implementation
 public:
 
   // Implementation

-  static bool Initialize(WXHINSTANCE instance);
-  static void CommonInit(void);
-  static bool RegisterWindowClasses(void);
-  static void CleanUp(void);
-  static void CommonCleanUp(void);
-  virtual bool DoMessage(void);
-  virtual bool ProcessMessage(WXMSG* pMsg);
-  void DeletePendingObjects(void);
-  bool ProcessIdle(void);
+  static bool Initialize();
+  static void CleanUp();

 
 

-/*
-  inline void SetPendingCleanup(bool flag) { m_pendingCleanup = flag; }
-  inline bool GetPendingCleanup(void) { return m_pendingCleanup; }
-
-  bool DoResourceCleanup(void);
-  // Set resource collection scheme on or off.
-  inline void SetResourceCollection(bool flag) { m_resourceCollection = flag; }
-  inline bool GetResourceCollection(void) { return m_resourceCollection; }
-*/
+  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();
+#if wxUSE_THREADS
+  void ProcessPendingEvents();
+#endif
+  int GetComCtl32Version() const;

 
 public:
   static long       sm_lastMessageTime;
 
 public:
   static long       sm_lastMessageTime;


@@ -171,8 +155,6 @@ public:
 
 protected:
   bool              m_keepGoing ;
 
 protected:
   bool              m_keepGoing ;

-//  bool              m_resourceCollection;
-//  bool              m_pendingCleanup; // TRUE if we need to check the GDI object lists for cleanup

 
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };


@@ -185,5 +167,5 @@ int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance);
 #endif
 
 #endif
 #endif
 
 #endif

-    // __APPH__
+    // _WX_APP_H_