implemented menu drawing in the GTK theme

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 378dccbe3efc0014fa1dfd846af211da7146c228..e77f69dd6518234b5e776f3796d4e182753fd1eb 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -45,9 +45,11 @@
     #include "wx/dynarray.h"
     #include "wx/wxchar.h"
     #include "wx/icon.h"
     #include "wx/dynarray.h"
     #include "wx/wxchar.h"
     #include "wx/icon.h"

+    #include "wx/log.h"

 #endif
 
 #endif
 

-#include "wx/log.h"
+#include "wx/cmdline.h"
+#include "wx/filename.h"

 #include "wx/module.h"
 
 #include "wx/msw/private.h"
 #include "wx/module.h"
 
 #include "wx/msw/private.h"


@@ -124,7 +126,6 @@
 // ---------------------------------------------------------------------------
 
 extern wxChar *wxBuffer;
 // ---------------------------------------------------------------------------
 
 extern wxChar *wxBuffer;

-extern wxList *wxWinHandleList;

 extern wxList WXDLLEXPORT wxPendingDelete;
 #ifndef __WXMICROWIN__
 extern void wxSetKeyboardHook(bool doIt);
 extern wxList WXDLLEXPORT wxPendingDelete;
 #ifndef __WXMICROWIN__
 extern void wxSetKeyboardHook(bool doIt);


@@ -192,9 +193,9 @@ END_EVENT_TABLE()
 bool wxApp::Initialize()
 {
     // the first thing to do is to check if we're trying to run an Unicode
 bool wxApp::Initialize()
 {
     // the first thing to do is to check if we're trying to run an Unicode

-    // program under Win9x - if so, abort right now as it has no chance to
-    // work
-#if wxUSE_UNICODE
+    // program under Win9x w/o MSLU emulation layer - if so, abort right now 
+    // as it has no chance to work
+#if wxUSE_UNICODE && !wxUSE_UNICODE_MSLU

     if ( wxGetOsVersion() != wxWINDOWS_NT )
     {
         // note that we can use MessageBoxW() as it's implemented even under
     if ( wxGetOsVersion() != wxWINDOWS_NT )
     {
         // note that we can use MessageBoxW() as it's implemented even under


@@ -203,20 +204,14 @@ bool wxApp::Initialize()
         ::MessageBox
         (
          NULL,
         ::MessageBox
         (
          NULL,

-         _T("This program uses Unicode and requires Windows NT/2000.\nProgram aborted."),
+         _T("This program uses Unicode and requires Windows NT/2000/XP.\nProgram aborted."),

          _T("wxWindows Fatal Error"),
          MB_ICONERROR | MB_OK
         );
 
         return FALSE;
     }
          _T("wxWindows Fatal Error"),
          MB_ICONERROR | MB_OK
         );
 
         return FALSE;
     }

-#endif // wxUSE_UNICODE
-
-    // Some people may wish to use this, but
-    // probably it shouldn't be here by default.
-#ifdef __WXDEBUG__
-    //    wxRedirectIOToConsole();
-#endif
+#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU

 
     wxBuffer = new wxChar[1500]; // FIXME
 
 
     wxBuffer = new wxChar[1500]; // FIXME
 


@@ -251,9 +246,11 @@ bool wxApp::Initialize()
         ;
 #endif // Win16
 
         ;
 #endif // Win16
 

+#if wxUSE_OLE

     // we need to initialize OLE library
     if ( FAILED(::OleInitialize(NULL)) )
         wxLogError(_("Cannot initialize OLE"));
     // we need to initialize OLE library
     if ( FAILED(::OleInitialize(NULL)) )
         wxLogError(_("Cannot initialize OLE"));

+#endif

 
 #endif // wxUSE_OLE
 
 
 #endif // wxUSE_OLE
 


@@ -282,6 +279,7 @@ bool wxApp::Initialize()
 
     LOGBRUSH lb;
     lb.lbStyle = BS_PATTERN;
 
     LOGBRUSH lb;
     lb.lbStyle = BS_PATTERN;

+    lb.lbColor = 0;

     lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") );
     if ( lb.lbHatch )
     {
     lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") );
     if ( lb.lbHatch )
     {


@@ -295,7 +293,7 @@ bool wxApp::Initialize()
     wxRegisterPenWin();
 #endif
 
     wxRegisterPenWin();
 #endif
 

-    wxWinHandleList = new wxList(wxKEY_INTEGER);
+    wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100);

 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     // PLEASE DO NOT ALTER THIS.
 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     // PLEASE DO NOT ALTER THIS.


@@ -462,6 +460,7 @@ bool wxApp::UnregisterWindowClasses()
 {
     bool retval = TRUE;
 
 {
     bool retval = TRUE;
 

+#ifndef __WXMICROWIN__

     // frame window class.
     if ( !UnregisterClass(wxFrameClassName, wxhInstance) )
     {
     // frame window class.
     if ( !UnregisterClass(wxFrameClassName, wxhInstance) )
     {


@@ -540,7 +539,8 @@ bool wxApp::UnregisterWindowClasses()
 
         retval = FALSE;
     }
 
         retval = FALSE;
     }

-
+#endif
+    // __WXMICROWIN__

     return retval;
 }
 
     return retval;
 }
 


@@ -548,73 +548,35 @@ bool wxApp::UnregisterWindowClasses()
 // Convert Windows to argc, argv style
 // ---------------------------------------------------------------------------
 
 // Convert Windows to argc, argv style
 // ---------------------------------------------------------------------------
 

-void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
+void wxApp::ConvertToStandardCommandArgs(const char* lpCmdLine)

 {
 {

-    wxStringList args;
+    // break the command line in words
+    wxArrayString args =
+        wxCmdLineParser::ConvertStringToArgs(wxConvertMB2WX(lpCmdLine));

 
 

-    wxString cmdLine(lpCmdLine);
-    int count = 0;
+    // +1 here for the program name
+    argc = args.GetCount() + 1;

 
 

-    // Get application name
-    wxChar name[260]; // 260 is MAX_PATH value from windef.h
-    ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
+    // and +1 here for the terminating NULL
+    argv = new wxChar *[argc + 1];

 
 

-    args.Add(name);
-    count++;
+    argv[0] = new wxChar[260]; // 260 is MAX_PATH value from windef.h
+    ::GetModuleFileName(wxhInstance, argv[0], 260);

 
 

-    wxStrcpy(name, wxFileNameFromPath(name));
-    wxStripExtension(name);
-    wxTheApp->SetAppName(name);
+    // also set the app name from argv[0]
+    wxString name;
+    wxFileName::SplitPath(argv[0], NULL, &name, NULL);

 
 

-    // Break up string
-    // Treat strings enclosed in double-quotes as single arguments
-    int i = 0;
-    int len = cmdLine.Length();
-    while (i < len)
-    {
-        // Skip whitespace
-        while ((i < len) && wxIsspace(cmdLine.GetChar(i)))
-            i ++;
-
-        if (i < len)
-        {
-            if (cmdLine.GetChar(i) == wxT('"')) // We found the start of a string
-            {
-                i ++;
-                int first = i;
-                while ((i < len) && (cmdLine.GetChar(i) != wxT('"')))
-                    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) && !wxIsspace(cmdLine.GetChar(i)))
-                    i ++;
-
-                wxString arg(cmdLine.Mid(first, (i - first)));
-
-                args.Add(arg);
-                count ++;
-            }
-        }
-    }
+    SetAppName(name);

 
 

-    wxTheApp->argv = new wxChar*[count + 1];
-    for (i = 0; i < count; i++)
+    // copy all the other arguments to wxApp::argv[]
+    for ( int i = 1; i < argc; i++ )

     {
     {

-        wxString arg(args[i]);
-        wxTheApp->argv[i] = copystring((const wxChar*)arg);
+        argv[i] = copystring(args[i - 1]);

     }
     }

-    wxTheApp->argv[count] = NULL; // argv[] is a NULL-terminated list
-    wxTheApp->argc = count;
+
+    // argv[] must be NULL-terminated
+    argv[argc] = NULL;

 }
 
 //// Cleans up any wxWindows internal structures left lying around
 }
 
 //// Cleans up any wxWindows internal structures left lying around


@@ -701,8 +663,7 @@ void wxApp::CleanUp()
     Ctl3dUnregister(wxhInstance);
 #endif
 
     Ctl3dUnregister(wxhInstance);
 #endif
 

-    if (wxWinHandleList)
-        delete wxWinHandleList;
+    delete wxWinHandleHash;

 
     // GL: I'm annoyed ... I don't know where to put this and I don't want to
     // create a module for that as it's part of the core.
 
     // GL: I'm annoyed ... I don't know where to put this and I don't want to
     // create a module for that as it's part of the core.


@@ -822,7 +783,8 @@ int wxEntry(WXHINSTANCE hInstance,
         wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
 
         // save the WinMain() parameters
         wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );
 
         // save the WinMain() parameters

-        wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);
+        if (lpCmdLine) // MicroWindows passes NULL
+            wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);

         wxTheApp->m_nCmdShow = nCmdShow;
 
         // We really don't want timestamps by default, because it means
         wxTheApp->m_nCmdShow = nCmdShow;
 
         // We really don't want timestamps by default, because it means


@@ -1435,20 +1397,26 @@ void wxExit()
 
 // Yield to incoming messages
 
 
 // Yield to incoming messages
 

-static bool gs_inYield = FALSE;
-
-bool wxYield()
+bool wxApp::Yield(bool onlyIfNeeded)

 {
 {

+    // MT-FIXME
+    static bool s_inYield = FALSE;
+

     // disable log flushing from here because a call to wxYield() shouldn't
     // normally result in message boxes popping up &c
     wxLog::Suspend();
 
     // disable log flushing from here because a call to wxYield() shouldn't
     // normally result in message boxes popping up &c
     wxLog::Suspend();
 

-#ifdef __WXDEBUG__
-    if (gs_inYield)
-        wxFAIL_MSG( wxT("wxYield called recursively" ) );
-#endif
+    if ( s_inYield )
+    {
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( wxT("wxYield called recursively" ) );
+        }

 
 

-    gs_inYield = TRUE;
+        return FALSE;
+    }
+
+    s_inYield = TRUE;

 
     // we don't want to process WM_QUIT from here - it should be processed in
     // the main event loop in order to stop it
 
     // we don't want to process WM_QUIT from here - it should be processed in
     // the main event loop in order to stop it


@@ -1464,27 +1432,17 @@ bool wxYield()
             break;
     }
 
             break;
     }
 

-    // If they are pending events, we must process them.
-    if (wxTheApp)
-        wxTheApp->ProcessPendingEvents();
+    // if there are pending events, we must process them.
+    ProcessPendingEvents();

 
     // let the logs be flashed again
     wxLog::Resume();
 
 
     // let the logs be flashed again
     wxLog::Resume();
 

-    gs_inYield = FALSE;
+    s_inYield = FALSE;

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

-// Yield to incoming messages; but fail silently if recursion is detected.
-bool wxYieldIfNeeded()
-{
-    if (gs_inYield)
-        return FALSE;
-
-    return wxYield();
-}
-

 bool wxHandleFatalExceptions(bool doit)
 {
 #if wxUSE_ON_FATAL_EXCEPTION
 bool wxHandleFatalExceptions(bool doit)
 {
 #if wxUSE_ON_FATAL_EXCEPTION


@@ -1493,9 +1451,9 @@ bool wxHandleFatalExceptions(bool doit)
 
     return TRUE;
 #else
 
     return TRUE;
 #else

-    wxFAIL_MSG(_T("set wxUSE_ON_FATAL_EXCEPTION to 1 to sue this function"));
-       
-       (void)doit;
+    wxFAIL_MSG(_T("set wxUSE_ON_FATAL_EXCEPTION to 1 to use this function"));
+
+    (void)doit;

     return FALSE;
 #endif
 }
     return FALSE;
 #endif
 }