Fixed VC++ compile error in mstream; formatted window.cpp.

[wxWidgets.git] / src / msw / app.cpp

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 4d1221e0a86bd5f603898ba2edf022a3c4794e42..0182dcc3a0338caff325dd5d15f03926dcd72ea0 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -36,7 +36,6 @@
 #endif
 
 #include "wx/msw/private.h"
-#include "wx/postscrp.h"
 #include "wx/log.h"
 #include "wx/module.h"
 
@@ -98,6 +97,8 @@ LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
 
   BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
       EVT_IDLE(wxApp::OnIdle)
+      EVT_END_SESSION(wxApp::OnEndSession)
+      EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
   END_EVENT_TABLE()
 #endif
 
@@ -149,13 +150,6 @@ bool wxApp::Initialize()
     wxInitializeResourceSystem();
   #endif
 
-  // For PostScript printing
-  #if wxUSE_POSTSCRIPT
-    wxInitializePrintSetupData();
-    wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-    wxThePrintPaperDatabase->CreateDatabase();
-  #endif
-
   wxBitmap::InitStandardHandlers();
 
   #if defined(__WIN95__)
@@ -350,82 +344,76 @@ bool wxApp::RegisterWindowClasses()
 
 //// Convert Windows to argc, argv style
 
-// FIXME this code should be rewritten (use wxArrayString instead...)
 void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
 {
-  // Split command line into tokens, as in usual main(argc, argv)
-  char **command = new char*[50]; // VZ: sure? why not 25 or 73 and a half??
+    wxStringList args;
 
-  int count = 0;
-  char *buf = new char[strlen(lpCmdLine) + 1];
-
-  /* Model independent strcpy */
-  int i;
-  for (i = 0; (buf[i] = lpCmdLine[i]) != 0; i++)
-  {
-    /* loop */;
-  }
+    wxString cmdLine(lpCmdLine);
+    int count = 0;
 
-  // Get application name
-  char name[260]; // 260 is MAX_PATH value from windef.h
-  ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
+    // Get application name
+    char name[500];
+    ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
 
-  // Is it only 16-bit Borland that already copies the program name
-  // to the first argv index?
+    // GNUWIN32 already fills in the first arg with the application name.
 #if !defined(__GNUWIN32__)
-// #if ! (defined(__BORLANDC__) && !defined(__WIN32__))
-  command[count++] = copystring(name);
-// #endif
+    args.Add(name);
+    count ++;
 #endif
 
-  strcpy(name, wxFileNameFromPath(name));
-  wxStripExtension(name);
-  wxTheApp->SetAppName(name);
+    strcpy(name, wxFileNameFromPath(name));
+    wxStripExtension(name);
+    wxTheApp->SetAppName(name);
 
-  /* Break up string */
-  // Treat strings enclosed in double-quotes as single arguments
-  char* str = buf;
-  while (*str)
-  {
-    if ( count == WXSIZEOF(command) )
+    // Break up string
+    // Treat strings enclosed in double-quotes as single arguments
+    int i = 0;
+    int len = cmdLine.Length();
+    while (i < len)
     {
-      wxFAIL_MSG("too many command line args.");
-      break;
-    }
-
-    while ( *str && isspace(*str) )  // skip whitespace
-      str++;
+        // Skip whitespace
+        while ((i < len) && isspace(cmdLine.GetChar(i)))
+            i ++;
 
-    if (*str == '"')
-    {
-      str++;
-      command[count++] = str;
-      while (*str && *str != '"')
-        str++;
+        if (i < len)
+        {
+            if (cmdLine.GetChar(i) == '"') // We found the start of a string
+            {
+                i ++;
+                int first = i;
+                while ((i < len) && (cmdLine.GetChar(i) != '"'))
+                    i ++;
+
+                wxString arg(cmdLine.Mid(first, (i - first)));
+
+                args.Add(arg);
+                count ++;
+
+                if (i < len)
+                    i ++; // Skip past 2nd quote
+            }
+            else // Unquoted argument
+            {
+                int first = i;
+                while ((i < len) && !isspace(cmdLine.GetChar(i)))
+                    i ++;
+
+                wxString arg(cmdLine.Mid(first, (i - first)));
+
+                args.Add(arg);
+                count ++;
+            }
+        }
     }
-    else if (*str)
+
+    wxTheApp->argv = new char*[count + 1];
+    for (i = 0; i < count; i++)
     {
-      command[count++] = str;
-      while (*str && !isspace(*str))
-        str++;
+        wxString arg(args[i]);
+        wxTheApp->argv[i] = copystring((const char*)arg);
     }
-    if (*str)
-      *str++ = '\0';
-  }
-
-  wxTheApp->argv = new char*[count + 1];
-  wxTheApp->argv[count] = NULL; /* argv[] is NULL terminated list! */
-  wxTheApp->argc = count;
-
-  for (i = 0; i < count; i++)
-  {
-    wxTheApp->argv[i] = copystring(command[i]);
-
-    delete [] command[i];
-  }
-
-  delete [] command;
-  delete [] buf;
+    wxTheApp->argv[count] = NULL; // argv[] is a NULL-terminated list
+    wxTheApp->argc = count;
 }
 
 //// Cleans up any wxWindows internal structures left lying around
@@ -456,12 +444,6 @@ void wxApp::CleanUp()
   delete wxTheColourDatabase;
   wxTheColourDatabase = NULL;
 
-#if wxUSE_POSTSCRIPT
-  wxInitializePrintSetupData(FALSE);
-  delete wxThePrintPaperDatabase;
-  wxThePrintPaperDatabase = NULL;
-#endif
-
   wxBitmap::CleanUpHandlers();
 
   delete[] wxBuffer;
@@ -525,7 +507,7 @@ int wxEntry(WXHINSTANCE hInstance,
             bool enterLoop)
 {
 #ifndef __WXDEBUG__ // take everything into a try-except block in release build
-  __try {
+  try {
 #endif
 
   wxhInstance = (HINSTANCE) hInstance;
@@ -606,7 +588,7 @@ int wxEntry(WXHINSTANCE hInstance,
   return retValue;
 #ifndef __WXDEBUG__ // catch exceptions only in release build
   }
-  __except ( EXCEPTION_EXECUTE_HANDLER ) {
+  except ( EXCEPTION_EXECUTE_HANDLER ) {
     /*
     if ( wxTheApp )
       wxTheApp->OnFatalException();
@@ -691,7 +673,7 @@ wxApp::~wxApp()
   {
     delete[] argv[i];
   }
-  delete argv;
+  delete[] argv;
 }
 
 bool wxApp::Initialized()
@@ -905,6 +887,23 @@ void wxApp::DeletePendingObjects()
   }
 }
 
+void wxApp::OnEndSession(wxCloseEvent& event)
+{
+    if (GetTopWindow())
+        GetTopWindow()->Close(TRUE);
+}
+
+// Default behaviour: close the application with prompts. The
+// user can veto the close, and therefore the end session.
+void wxApp::OnQueryEndSession(wxCloseEvent& event)
+{
+    if (GetTopWindow())
+    {
+        if (!GetTopWindow()->Close(!event.CanVeto()))
+            event.Veto(TRUE);
+    }
+}
+
 wxLog* wxApp::CreateLogTarget()
 {
     return new wxLogGui;