cleaning up problems after string changes

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

diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h
index 08708f877f0d98b47bbc38be208382942bdcde8b..d43d6a20cb15a78cd1739c54bfc4ea711d83bd3f 100644 (file)
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -5,180 +5,111 @@
 // 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"
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-
-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxApp ;
-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;
+#include "wx/event.h"
+#include "wx/icon.h"

 
 

-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
-void WXDLLEXPORT wxExit(void);
-
-// Yield to other apps/messages
-bool WXDLLEXPORT wxYield(void);
+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
 
 // 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(void);
-  inline ~wxApp(void) {}
-
-  static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
-  static wxAppInitializerFunction GetInitializerFunction(void) { return m_appInitFn; }
-
-  virtual int MainLoop(void);
-  void ExitMainLoop(void);
-  bool Initialized(void);
-  virtual bool Pending(void) ;
-  virtual void Dispatch(void) ;
-
-  virtual void OnIdle(wxIdleEvent& event);
-
-// Generic
-  virtual bool OnInit(void) { return FALSE; };
-
-  // No specific tasks to do here.
-  virtual bool OnInitGui(void) { return TRUE; }
-
-  // Called to set off the main loop
-  virtual int OnRun(void) { return MainLoop(); };
-  virtual int OnExit(void) { return 0; };
-  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 void SetShowFrameOnInit(bool flag) { m_showOnInit = flag; }
-  inline bool GetShowFrameOnInit(void) const { return m_showOnInit; }
-*/
-
-  inline wxString GetAppName(void) const {
-      if (m_appName != "")
-        return m_appName;
-      else return m_className;
-    }
+    DECLARE_DYNAMIC_CLASS(wxApp)

 
 

-  inline void SetAppName(const wxString& name) { m_appName = name; };
-  inline wxString GetClassName(void) const { return m_className; }
-  inline void SetClassName(const wxString& name) { m_className = name; }
-  wxWindow *GetTopWindow(void) const ;
-  inline void SetTopWindow(wxWindow *win) { m_topWindow = win; }
-
-  inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
-  inline bool GetWantDebugOutput(void) { return m_wantDebugOutput; }
+public:
+    wxApp();
+    virtual ~wxApp();

 
 

-  // Send idle event to all top-level windows.
-  // Returns TRUE if more idle time is requested.
-  bool SendIdleEvents(void);
+    // override base class (pure) virtuals
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();

 
 

-  // Send idle event to window and all subwindows
-  // Returns TRUE if more idle time is requested.
-  bool SendIdleEvents(wxWindow* win);
+    virtual bool Yield(bool onlyIfNeeded = false);
+    virtual void WakeUpIdle();

 
 

-  inline void SetAuto3D(bool flag) { m_auto3D = flag; }
-  inline bool GetAuto3D(void) const { return m_auto3D; }
+    virtual void SetPrintMode(int mode) { m_printMode = mode; }
+    virtual int GetPrintMode() const { return m_printMode; }

 
 

-  // Creates a log object
-  virtual wxLog* CreateLogTarget();
+    // implementation only
+    void OnIdle(wxIdleEvent& event);
+    void OnEndSession(wxCloseEvent& event);
+    void OnQueryEndSession(wxCloseEvent& event);

 
 

-#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;
-  char **           argv;
+#if wxUSE_EXCEPTIONS
+    virtual bool OnExceptionInMainLoop();
+#endif // wxUSE_EXCEPTIONS

 
 protected:
 
 protected:

-  bool              m_wantDebugOutput ;
-  wxString          m_className;
-  wxString          m_appName;
-  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 */
+    int    m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT

 
 public:
 
 public:

+    // Implementation
+    static bool RegisterWindowClasses();
+    static bool UnregisterWindowClasses();

 
 

-  // 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);
-
-/*
-  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; }
-*/
+#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

 
 

-public:
-  static long       sm_lastMessageTime;
-  int               m_nCmdShow;
+    // 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();

 
 

-protected:
-  bool              m_keepGoing ;
-//  bool              m_resourceCollection;
-//  bool              m_pendingCleanup; // TRUE if we need to check the GDI object lists for cleanup
+    // 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;

 
 

-DECLARE_EVENT_TABLE()
+protected:
+    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
 
 #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
 #endif

-    // __APPH__
+
+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_