Changed order of #ifdefs to get native version on OS/2, even if

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 0c339a6a797970b5e09382327266d6425c3e13c7..1be88f6a6eb0f08a7a33f50c0e58a02d78d00cf2 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -44,6 +44,7 @@
     #include "wx/intl.h"
     #include "wx/dynarray.h"
     #include "wx/wxchar.h"
     #include "wx/intl.h"
     #include "wx/dynarray.h"
     #include "wx/wxchar.h"

+    #include "wx/icon.h"

 #endif
 
 #include "wx/log.h"
 #endif
 
 #include "wx/log.h"


@@ -66,12 +67,18 @@
     #include "wx/resource.h"
 #endif
 
     #include "wx/resource.h"
 #endif
 

+#if wxUSE_TOOLTIPS
+    #include "wx/tooltip.h"
+#endif // wxUSE_TOOLTIPS
+

 // OLE is used for drag-and-drop, clipboard, OLE Automation...
 // OLE is used for drag-and-drop, clipboard, OLE Automation...

+#ifndef wxUSE_NORLANDER_HEADERS

 #if defined(__GNUWIN32__) || defined(__SC__) || defined(__SALFORDC__)
     #undef wxUSE_OLE
 
     #define  wxUSE_OLE 0
 #endif // broken compilers
 #if defined(__GNUWIN32__) || defined(__SC__) || defined(__SALFORDC__)
     #undef wxUSE_OLE
 
     #define  wxUSE_OLE 0
 #endif // broken compilers

+#endif

 
 #if wxUSE_OLE
     #include <ole2.h>
 
 #if wxUSE_OLE
     #include <ole2.h>


@@ -80,38 +87,61 @@
 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 

-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)

     #include <commctrl.h>
 #endif
 
 #include "wx/msw/msvcrt.h"
 
     #include <commctrl.h>
 #endif
 
 #include "wx/msw/msvcrt.h"
 

+// ----------------------------------------------------------------------------
+// conditional compilation
+// ----------------------------------------------------------------------------
+
+// The macro _WIN32_IE is defined by commctrl.h (unless it had already been
+// defined before) and shows us what common control features are available
+// during the compile time (it doesn't mean that they will be available during
+// the run-time, use GetComCtl32Version() to test for them!). The possible
+// values are:
+//
+// 0x0200     for comctl32.dll 4.00 shipped with Win95/NT 4.0
+// 0x0300                      4.70              IE 3.x
+// 0x0400                      4.71              IE 4.0
+// 0x0401                      4.72              IE 4.01 and Win98
+// 0x0500                      5.00              IE 5.x and NT 5.0 (Win2000)
+
+#ifndef _WIN32_IE
+    // minimal set of features by default
+    #define _WIN32_IE 0x0200
+#endif
+
+#if _WIN32_IE >= 0x0300
+    #include <shlwapi.h>
+#endif

 
 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------
 

-extern char *wxBuffer;
-extern char *wxOsVersion;
+extern wxChar *wxBuffer;
+extern wxChar *wxOsVersion;

 extern wxList *wxWinHandleList;
 extern wxList WXDLLEXPORT wxPendingDelete;
 extern wxList *wxWinHandleList;
 extern wxList WXDLLEXPORT wxPendingDelete;

-#if wxUSE_THREADS
-extern wxList *wxPendingEvents;
-extern wxCriticalSection *wxPendingEventsLocker;
-#endif

 extern void wxSetKeyboardHook(bool doIt);
 extern wxCursor *g_globalCursor;
 
 extern void wxSetKeyboardHook(bool doIt);
 extern wxCursor *g_globalCursor;
 

-HINSTANCE wxhInstance = 0;

 MSG s_currentMsg;
 wxApp *wxTheApp = NULL;
 
 MSG s_currentMsg;
 wxApp *wxTheApp = NULL;
 

-// FIXME why not const? and not static?
-char wxFrameClassName[]         = "wxFrameClass";
-char wxMDIFrameClassName[]      = "wxMDIFrameClass";
-char wxMDIChildFrameClassName[] = "wxMDIChildFrameClass";
-char wxPanelClassName[]         = "wxPanelClass";
-char wxCanvasClassName[]        = "wxCanvasClass";
+// NB: all "NoRedraw" classes must have the same names as the "normal" classes
+//     with NR suffix - wxWindow::MSWCreate() supposes this
+const wxChar *wxFrameClassName         = wxT("wxFrameClass");
+const wxChar *wxFrameClassNameNoRedraw = wxT("wxFrameClassNR");
+const wxChar *wxMDIFrameClassName      = wxT("wxMDIFrameClass");
+const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR");
+const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass");
+const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR");
+const wxChar *wxPanelClassName         = wxT("wxPanelClass");
+const wxChar *wxCanvasClassName        = wxT("wxCanvasClass");

 
 HICON wxSTD_FRAME_ICON = (HICON) NULL;
 HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL;
 
 HICON wxSTD_FRAME_ICON = (HICON) NULL;
 HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL;


@@ -123,17 +153,7 @@ HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL;
 
 HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
 
 
 HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
 

-LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
-
-#if defined(__WIN95__) && !defined(__TWIN32__)
-    #define wxUSE_RICHEDIT 1
-#else
-    #define wxUSE_RICHEDIT 0
-#endif
-
-#if wxUSE_RICHEDIT
-    static HINSTANCE gs_hRichEdit = (HINSTANCE) NULL;
-#endif
+LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -143,7 +163,6 @@ LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
 // wxApp
 // ---------------------------------------------------------------------------
 
 // wxApp
 // ---------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
     BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
     IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
     BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)


@@ -151,7 +170,6 @@ LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
         EVT_END_SESSION(wxApp::OnEndSession)
         EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
     END_EVENT_TABLE()
         EVT_END_SESSION(wxApp::OnEndSession)
         EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession)
     END_EVENT_TABLE()

-#endif

 
 //// Initialize
 bool wxApp::Initialize()
 
 //// Initialize
 bool wxApp::Initialize()


@@ -162,19 +180,16 @@ bool wxApp::Initialize()
     //    wxRedirectIOToConsole();
 #endif
 
     //    wxRedirectIOToConsole();
 #endif
 

-    wxBuffer = new char[1500]; // FIXME
+    wxBuffer = new wxChar[1500]; // FIXME

 
     wxClassInfo::InitializeClasses();
 
 #if wxUSE_RESOURCES
 
     wxClassInfo::InitializeClasses();
 
 #if wxUSE_RESOURCES

-    wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
+    wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion);

 #endif
 
 #endif
 

-    // 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.

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    wxPendingEvents = new wxList();
-    wxPendingEventsLocker = new wxCriticalSection();
+    wxPendingEventsLocker = new wxCriticalSection;

 #endif
 
     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
 #endif
 
     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);


@@ -192,43 +207,40 @@ bool wxApp::Initialize()
 #if defined(__WIN95__)
     InitCommonControls();
 
 #if defined(__WIN95__)
     InitCommonControls();
 

-#if wxUSE_RICHEDIT
-    gs_hRichEdit = LoadLibrary("RICHED32.DLL");
-
-    if (gs_hRichEdit == (HINSTANCE) NULL)
-    {
-        wxLogError(_("Could not initialise Rich Edit DLL"));
-    }
-#endif // wxUSE_RICHEDIT
-

 #endif // __WIN95__
 
 #endif // __WIN95__
 

+#if wxUSE_OLE
+
+#ifdef __WIN16__

     // for OLE, enlarge message queue to be as large as possible
     int iMsg = 96;
     // for OLE, enlarge message queue to be as large as possible
     int iMsg = 96;

-    while (!SetMessageQueue(iMsg) && (iMsg -= 8));
-
-#if wxUSE_OLE
+    while (!SetMessageQueue(iMsg) && (iMsg -= 8))
+        ;
+#endif // Win16

     // 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

 
 #if wxUSE_CTL3D
     if (!Ctl3dRegister(wxhInstance))
 
 #if wxUSE_CTL3D
     if (!Ctl3dRegister(wxhInstance))

-        wxLogError("Cannot register CTL3D");
+        wxLogError(wxT("Cannot register CTL3D"));

 
     Ctl3dAutoSubclass(wxhInstance);
 #endif
 
     g_globalCursor = new wxCursor;
 
 
     Ctl3dAutoSubclass(wxhInstance);
 #endif
 
     g_globalCursor = new wxCursor;
 

-    wxSTD_FRAME_ICON = LoadIcon(wxhInstance, "wxSTD_FRAME");
-    wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxSTD_MDIPARENTFRAME");
-    wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "wxSTD_MDICHILDFRAME");
+    // VZ: these icons are not in wx.rc anyhow (but should they?)!
+#if 0
+    wxSTD_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_FRAME"));
+    wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_MDIPARENTFRAME"));
+    wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_MDICHILDFRAME"));

 
 

-    wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_FRAME");
-    wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDIPARENTFRAME");
-    wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDICHILDFRAME");
+    wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_FRAME"));
+    wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_MDIPARENTFRAME"));
+    wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_MDICHILDFRAME"));
+#endif // 0

 
     RegisterWindowClasses();
 
 
     RegisterWindowClasses();
 


@@ -236,7 +248,7 @@ bool wxApp::Initialize()
 
     LOGBRUSH lb;
     lb.lbStyle = BS_PATTERN;
 
     LOGBRUSH lb;
     lb.lbStyle = BS_PATTERN;

-    lb.lbHatch = (int)LoadBitmap( wxhInstance, "wxDISABLE_BUTTON_BITMAP" );
+    lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") );

     if ( lb.lbHatch )
     {
         wxDisableButtonBrush = ::CreateBrushIndirect( & lb );
     if ( lb.lbHatch )
     {
         wxDisableButtonBrush = ::CreateBrushIndirect( & lb );


@@ -269,15 +281,22 @@ bool wxApp::Initialize()
 // RegisterWindowClasses
 // ---------------------------------------------------------------------------
 
 // RegisterWindowClasses
 // ---------------------------------------------------------------------------
 

+// TODO we should only register classes really used by the app. For this it
+//      would be enough to just delay the class registration until an attempt
+//      to create a window of this class is made.

 bool wxApp::RegisterWindowClasses()
 {
     WNDCLASS wndclass;
 
 bool wxApp::RegisterWindowClasses()
 {
     WNDCLASS wndclass;
 

+    // for each class we register one with CS_(V|H)REDRAW style and one
+    // without for windows created with wxNO_FULL_REDRAW_ON_REPAINT flag
+    static const long styleNormal = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
+    static const long styleNoRedraw = CS_DBLCLKS;
+

     // the fields which are common to all classes
     // the fields which are common to all classes

-    wndclass.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;

     wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
     wndclass.cbClsExtra    = 0;
     wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
     wndclass.cbClsExtra    = 0;

-    wndclass.cbWndExtra    = sizeof( DWORD ); // what is this DWORD used for?
+    wndclass.cbWndExtra    = sizeof( DWORD ); // VZ: what is this DWORD used for?

     wndclass.hInstance     = wxhInstance;
     wndclass.hIcon         = (HICON) NULL;
     wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
     wndclass.hInstance     = wxhInstance;
     wndclass.hIcon         = (HICON) NULL;
     wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);


@@ -285,10 +304,8 @@ bool wxApp::RegisterWindowClasses()
 
     // Register the frame window class.
     wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);
 
     // Register the frame window class.
     wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);

-#ifdef _MULTIPLE_INSTANCES
-    sprintf( wxFrameClassName,"wxFrameClass%d", wxhInstance );
-#endif

     wndclass.lpszClassName = wxFrameClassName;
     wndclass.lpszClassName = wxFrameClassName;

+    wndclass.style         = styleNormal;

 
     if ( !RegisterClass(&wndclass) )
     {
 
     if ( !RegisterClass(&wndclass) )
     {


@@ -297,9 +314,21 @@ bool wxApp::RegisterWindowClasses()
         return FALSE;
     }
 
         return FALSE;
     }
 

+    // "no redraw" frame
+    wndclass.lpszClassName = wxFrameClassNameNoRedraw;
+    wndclass.style         = styleNoRedraw;
+
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError("RegisterClass(no redraw frame)");
+
+        return FALSE;
+    }
+

     // Register the MDI frame window class.
     wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves
     wndclass.lpszClassName = wxMDIFrameClassName;
     // Register the MDI frame window class.
     wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves
     wndclass.lpszClassName = wxMDIFrameClassName;

+    wndclass.style         = styleNormal;

 
     if ( !RegisterClass(&wndclass) )
     {
 
     if ( !RegisterClass(&wndclass) )
     {


@@ -308,9 +337,21 @@ bool wxApp::RegisterWindowClasses()
         return FALSE;
     }
 
         return FALSE;
     }
 

+    // "no redraw" MDI frame
+    wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw;
+    wndclass.style         = styleNoRedraw;
+
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError("RegisterClass(no redraw MDI parent frame)");
+
+        return FALSE;
+    }
+

     // Register the MDI child frame window class.
     wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndclass.lpszClassName = wxMDIChildFrameClassName;
     // Register the MDI child frame window class.
     wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndclass.lpszClassName = wxMDIChildFrameClassName;

+    wndclass.style         = styleNormal;

 
     if ( !RegisterClass(&wndclass) )
     {
 
     if ( !RegisterClass(&wndclass) )
     {


@@ -319,9 +360,21 @@ bool wxApp::RegisterWindowClasses()
         return FALSE;
     }
 
         return FALSE;
     }
 

+    // "no redraw" MDI child frame
+    wndclass.lpszClassName = wxMDIChildFrameClassNameNoRedraw;
+    wndclass.style         = styleNoRedraw;
+
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError("RegisterClass(no redraw MDI child)");
+
+        return FALSE;
+    }
+

     // Register the panel window class.
     wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
     wndclass.lpszClassName = wxPanelClassName;
     // Register the panel window class.
     wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
     wndclass.lpszClassName = wxPanelClassName;

+    wndclass.style         = styleNormal;

 
     if ( !RegisterClass(&wndclass) )
     {
 
     if ( !RegisterClass(&wndclass) )
     {


@@ -356,13 +409,13 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
     int count = 0;
 
     // Get application name
     int count = 0;
 
     // Get application name

-    char name[260]; // 260 is MAX_PATH value from windef.h
+    wxChar name[260]; // 260 is MAX_PATH value from windef.h

     ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
 
     args.Add(name);
     count++;
 
     ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
 
     args.Add(name);
     count++;
 

-    strcpy(name, wxFileNameFromPath(name));
+    wxStrcpy(name, wxFileNameFromPath(name));

     wxStripExtension(name);
     wxTheApp->SetAppName(name);
 
     wxStripExtension(name);
     wxTheApp->SetAppName(name);
 


@@ -373,16 +426,16 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
     while (i < len)
     {
         // Skip whitespace
     while (i < len)
     {
         // Skip whitespace

-        while ((i < len) && isspace(cmdLine.GetChar(i)))
+        while ((i < len) && wxIsspace(cmdLine.GetChar(i)))

             i ++;
 
         if (i < len)
         {
             i ++;
 
         if (i < len)
         {

-            if (cmdLine.GetChar(i) == '"') // We found the start of a string
+            if (cmdLine.GetChar(i) == wxT('"')) // We found the start of a string

             {
                 i ++;
                 int first = i;
             {
                 i ++;
                 int first = i;

-                while ((i < len) && (cmdLine.GetChar(i) != '"'))
+                while ((i < len) && (cmdLine.GetChar(i) != wxT('"')))

                     i ++;
 
                 wxString arg(cmdLine.Mid(first, (i - first)));
                     i ++;
 
                 wxString arg(cmdLine.Mid(first, (i - first)));


@@ -396,7 +449,7 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
             else // Unquoted argument
             {
                 int first = i;
             else // Unquoted argument
             {
                 int first = i;

-                while ((i < len) && !isspace(cmdLine.GetChar(i)))
+                while ((i < len) && !wxIsspace(cmdLine.GetChar(i)))

                     i ++;
 
                 wxString arg(cmdLine.Mid(first, (i - first)));
                     i ++;
 
                 wxString arg(cmdLine.Mid(first, (i - first)));


@@ -407,11 +460,11 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
         }
     }
 
         }
     }
 

-    wxTheApp->argv = new char*[count + 1];
+    wxTheApp->argv = new wxChar*[count + 1];

     for (i = 0; i < count; i++)
     {
         wxString arg(args[i]);
     for (i = 0; i < count; i++)
     {
         wxString arg(args[i]);

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

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


@@ -469,15 +522,6 @@ void wxApp::CleanUp()
 
     wxSetKeyboardHook(FALSE);
 
 
     wxSetKeyboardHook(FALSE);
 

-#ifdef __WIN95__
-
-#if wxUSE_RICHEDIT
-    if (gs_hRichEdit != (HINSTANCE) NULL)
-        FreeLibrary(gs_hRichEdit);
-#endif
-
-#endif
-

 #if wxUSE_PENWINDOWS
     wxCleanUpPenWin();
 #endif
 #if wxUSE_PENWINDOWS
     wxCleanUpPenWin();
 #endif


@@ -510,10 +554,10 @@ void wxApp::CleanUp()
     if (wxWinHandleList)
         delete wxWinHandleList;
 
     if (wxWinHandleList)
         delete wxWinHandleList;
 

-    // GL: I'm annoyed ... I don't know where to put this and I don't want to 
+    // 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.
     // create a module for that as it's part of the core.

-#if wxUSE_THREADS

     delete wxPendingEvents;
     delete wxPendingEvents;

+#if wxUSE_THREADS

     delete wxPendingEventsLocker;
     // If we don't do the following, we get an apparent memory leak.
     ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
     delete wxPendingEventsLocker;
     // If we don't do the following, we get an apparent memory leak.
     ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();


@@ -531,7 +575,7 @@ void wxApp::CleanUp()
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {

-        wxLogDebug("There were memory leaks.");
+        wxLogDebug(wxT("There were memory leaks."));

         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }


@@ -563,7 +607,17 @@ int wxEntry(WXHINSTANCE hInstance,
     // (another useful flag is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free
     //  deallocated memory which may be used to simulate low-memory condition)
     wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
     // (another useful flag is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free
     //  deallocated memory which may be used to simulate low-memory condition)
     wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);

-
+#ifdef __MWERKS__
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
+    // This seems to be necessary since there are 'rogue'
+    // objects present at this point (perhaps global objects?)
+    // Setting a checkpoint will ignore them as far as the
+    // memory checking facility is concerned.
+    // Of course you may argue that memory allocated in globals should be
+    // checked, but this is a reasonable compromise.
+    wxDebugContext::SetCheckpoint();
+#endif
+#endif

     // take everything into a try-except block in release build
     // FIXME other compilers must support Win32 SEH (structured exception
     //       handling) too, just find the appropriate keyword in their docs!
     // take everything into a try-except block in release build
     // FIXME other compilers must support Win32 SEH (structured exception
     //       handling) too, just find the appropriate keyword in their docs!


@@ -575,7 +629,6 @@ int wxEntry(WXHINSTANCE hInstance,
 #else
     #undef  CATCH_PROGRAM_EXCEPTIONS
 #endif
 #else
     #undef  CATCH_PROGRAM_EXCEPTIONS
 #endif

-

         wxhInstance = (HINSTANCE) hInstance;
 
         if (!wxApp::Initialize())
         wxhInstance = (HINSTANCE) hInstance;
 
         if (!wxApp::Initialize())


@@ -588,12 +641,12 @@ int wxEntry(WXHINSTANCE hInstance,
             // the IMPLEMENT_APP macro is used instead, which sets an initializer
             // function for delayed, dynamic app object construction.
             wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
             // the IMPLEMENT_APP macro is used instead, which sets an initializer
             // function for delayed, dynamic app object construction.
             wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,

-                         "No initializer - use IMPLEMENT_APP macro." );
+                         wxT("No initializer - use IMPLEMENT_APP macro.") );

 
             wxTheApp = (*wxApp::GetInitializerFunction()) ();
         }
 
 
             wxTheApp = (*wxApp::GetInitializerFunction()) ();
         }
 

-        wxCHECK_MSG( wxTheApp, 0, "You have to define an instance of wxApp!" );
+        wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") );

 
         // save the WinMain() parameters
         wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);
 
         // save the WinMain() parameters
         wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);


@@ -603,6 +656,13 @@ int wxEntry(WXHINSTANCE hInstance,
         // but this call is provided for compatibility across platforms.
         wxTheApp->OnInitGui();
 
         // but this call is provided for compatibility across platforms.
         wxTheApp->OnInitGui();
 

+        // We really don't want timestamps by default, because it means
+        // we can't simply double-click on the error message and get to that
+        // line in the source. So VC++ at least, let's have a sensible default.
+#ifdef __VISUALC__
+        wxLog::SetTimestamp(NULL);
+#endif
+

         int retValue = 0;
 
         if ( wxTheApp->OnInit() )
         int retValue = 0;
 
         if ( wxTheApp->OnInit() )


@@ -708,7 +768,7 @@ int wxEntry(WXHINSTANCE hInstance)
 
 //// Static member initialization
 
 
 //// Static member initialization
 

-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;

 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {


@@ -771,7 +831,7 @@ bool wxApp::DoMessage()
     {
 #if wxUSE_THREADS
         wxASSERT_MSG( wxThread::IsMain(),
     {
 #if wxUSE_THREADS
         wxASSERT_MSG( wxThread::IsMain(),

-                      "only the main thread can process Windows messages" );
+                      wxT("only the main thread can process Windows messages") );

 
         static bool s_hadGuiLock = TRUE;
         static wxMsgArray s_aSavedMessages;
 
         static bool s_hadGuiLock = TRUE;
         static wxMsgArray s_aSavedMessages;


@@ -878,25 +938,6 @@ bool wxApp::ProcessIdle()
     return event.MoreRequested();
 }
 
     return event.MoreRequested();
 }
 

-#if wxUSE_THREADS
-void wxApp::ProcessPendingEvents()
-{
-    wxNode *node = wxPendingEvents->First();
-    wxCriticalSectionLocker locker(*wxPendingEventsLocker);
-
-    while (node)
-    {
-        wxEvtHandler *handler = (wxEvtHandler *)node->Data();
-
-        handler->ProcessPendingEvents();
-
-        delete node;
-        node = wxPendingEvents->First();
-    }
-}
-#endif
-
-

 void wxApp::ExitMainLoop()
 {
     m_keepGoing = FALSE;
 void wxApp::ExitMainLoop()
 {
     m_keepGoing = FALSE;


@@ -922,10 +963,24 @@ bool wxApp::ProcessMessage(WXMSG *wxmsg)
 {
     MSG *msg = (MSG *)wxmsg;
     HWND hWnd = msg->hwnd;
 {
     MSG *msg = (MSG *)wxmsg;
     HWND hWnd = msg->hwnd;

-    wxWindow *wndThis = wxFindWinFromHandle((WXHWND)hWnd), *wnd;
+    wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hWnd);
+
+#if wxUSE_TOOLTIPS
+    // we must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to
+    // popup the tooltip bubbles
+    if ( wndThis && (msg->message == WM_MOUSEMOVE) )
+    {
+        wxToolTip *tt = wndThis->GetToolTip();
+        if ( tt )
+        {
+            tt->RelayEvent(wxmsg);
+        }
+    }
+#endif // wxUSE_TOOLTIPS

 
     // Try translations first; find the youngest window with
     // a translation table.
 
     // Try translations first; find the youngest window with
     // a translation table.

+    wxWindow *wnd;

     for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
     {
         if ( wnd->MSWTranslateMessage(wxmsg) )
     for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
     {
         if ( wnd->MSWTranslateMessage(wxmsg) )


@@ -970,10 +1025,11 @@ void wxApp::OnIdle(wxIdleEvent& event)
         event.RequestMore(TRUE);
     }
 
         event.RequestMore(TRUE);
     }
 

-    // If they are pending events, we must process them.
-#if wxUSE_THREADS
+    // If they are pending events, we must process them: pending events are
+    // either events to the threads other than main or events posted with
+    // wxPostEvent() functions

     ProcessPendingEvents();
     ProcessPendingEvents();

-#endif
+

     s_inOnIdle = FALSE;
 }
 
     s_inOnIdle = FALSE;
 }
 


@@ -1053,62 +1109,99 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
     }
 }
 
     }
 }
 

-wxLog* wxApp::CreateLogTarget()
-{
-    return new wxLogGui;
-}
-
-wxWindow* wxApp::GetTopWindow() const
+/* static */
+int wxApp::GetComCtl32Version()

 {
 {

-    if (m_topWindow)
-        return m_topWindow;
-    else if (wxTopLevelWindows.GetCount() > 0)
-        return wxTopLevelWindows.GetFirst()->GetData();
-    else
-        return NULL;
-}
+    // cache the result
+    static int s_verComCtl32 = -1;

 
 

-int wxApp::GetComCtl32Version() const
-{
-    // have we loaded COMCTL32 yet?
-    HMODULE theModule = ::GetModuleHandle("COMCTL32");
-    int version = 0;
+    wxCRIT_SECT_DECLARE(csComCtl32);
+    wxCRIT_SECT_LOCKER(lock, csComCtl32);

 
 

-    // if so, then we can check for the version
-    if (theModule)
+    if ( s_verComCtl32 == -1 )

     {
     {

-        // InitCommonControlsEx is unique to 4.7 and later
-        FARPROC theProc = ::GetProcAddress(theModule, "InitCommonControlsEx");
+        // initally assume no comctl32.dll at all
+        s_verComCtl32 = 0;

 
 

-        if (! theProc)
-        {                    // not found, must be 4.00
-            version = 400;
-        }
-        else
+        // do we have it?
+        HMODULE hModuleComCtl32 = ::GetModuleHandle(wxT("COMCTL32"));
+
+        // if so, then we can check for the version
+        if ( hModuleComCtl32 )

         {
         {

-            // The following symbol are unique to 4.71
-            //   DllInstall
-            //   FlatSB_EnableScrollBar FlatSB_GetScrollInfo FlatSB_GetScrollPos
-            //   FlatSB_GetScrollProp FlatSB_GetScrollRange FlatSB_SetScrollInfo
-            //   FlatSB_SetScrollPos FlatSB_SetScrollProp FlatSB_SetScrollRange
-            //   FlatSB_ShowScrollBar
-            //   _DrawIndirectImageList _DuplicateImageList
-            //   InitializeFlatSB
-            //   UninitializeFlatSB
-            // we could check for any of these - I chose DllInstall
-            FARPROC theProc = ::GetProcAddress(theModule, "DllInstall");
-            if (! theProc)
-            {
-                // not found, must be 4.70
-                version = 470;
-            }
-            else
-            {                         // found, must be 4.71
-                version = 471;
-            }
+            // try to use DllGetVersion() if available in _headers_
+            #ifdef DLLVER_PLATFORM_WINDOWS // defined in shlwapi.h
+                DLLGETVERSIONPROC pfnDllGetVersion = (DLLGETVERSIONPROC)
+                    ::GetProcAddress(hModuleComCtl32, _T("DllGetVersion"));
+                if ( pfnDllGetVersion )
+                {
+                    DLLVERSIONINFO dvi;
+                    dvi.cbSize = sizeof(dvi);
+
+                    HRESULT hr = (*pfnDllGetVersion)(&dvi);
+                    if ( FAILED(hr) )
+                    {
+                        wxLogApiError(_T("DllGetVersion"), hr);
+                    }
+                    else
+                    {
+                        // this is incompatible with _WIN32_IE values, but
+                        // compatible with the other values returned by
+                        // GetComCtl32Version()
+                        s_verComCtl32 = 100*dvi.dwMajorVersion +
+                                            dvi.dwMinorVersion;
+                    }
+                }
+            #endif
+                // DllGetVersion() unavailable either during compile or
+                // run-time, try to guess the version otherwise
+                if ( !s_verComCtl32 )
+                {
+                    // InitCommonControlsEx is unique to 4.70 and later
+                    FARPROC theProc = ::GetProcAddress
+                                        (
+                                         hModuleComCtl32,
+#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x520)
+                                         "InitCommonControlsEx"
+#else
+                                         _T("InitCommonControlsEx")
+#endif
+                                        );
+
+                    if ( !theProc )
+                    {
+                        // not found, must be 4.00
+                        s_verComCtl32 = 400;
+                    }
+                    else
+                    {
+                        // many symbols appeared in comctl32 4.71, could use
+                        // any of them except may be DllInstall
+                        theProc = ::GetProcAddress
+                                    (
+                                     hModuleComCtl32,
+#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x520)
+                                     "InitializeFlatSB"
+#else
+                                     _T("InitializeFlatSB")
+#endif
+                                    );
+                        if ( !theProc )
+                        {
+                            // not found, must be 4.70
+                            s_verComCtl32 = 470;
+                        }
+                        else
+                        {
+                            // found, must be 4.71
+                            s_verComCtl32 = 471;
+                        }
+                    }
+                }

         }
     }
         }
     }

-    return version;
+
+    return s_verComCtl32;

 }
 
 void wxExit()
 }
 
 void wxExit()


@@ -1121,38 +1214,71 @@ void wxExit()
 // Yield to incoming messages
 bool wxYield()
 {
 // Yield to incoming messages
 bool wxYield()
 {

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

     MSG msg;
     MSG msg;

-    // We want to go back to the main message loop
-    // if we see a WM_QUIT. (?)
-#ifdef __WXWINE__
-    while (PeekMessage(&msg, (HWND)NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT)
-#else
-    while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT)
-#endif
+    while ( PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) &&
+            msg.message != WM_QUIT )

     {
         if ( !wxTheApp->DoMessage() )
             break;
     }
     {
         if ( !wxTheApp->DoMessage() )
             break;
     }

+

     // If they are pending events, we must process them.
     // If they are pending events, we must process them.

-#if wxUSE_THREADS

     wxTheApp->ProcessPendingEvents();
     wxTheApp->ProcessPendingEvents();

-#endif

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

-HINSTANCE wxGetInstance()
+//-----------------------------------------------------------------------------
+// wxWakeUpIdle
+//-----------------------------------------------------------------------------
+
+void wxWakeUpIdle()

 {
 {

-    return wxhInstance;
+    // Send the top window a dummy message so idle handler processing will
+    // start up again.  Doing it this way ensures that the idle handler
+    // wakes up in the right thread (see also wxWakeUpMainThread() which does
+    // the same for the main app thread only)
+    wxWindow *topWindow = wxTheApp->GetTopWindow();
+    if ( topWindow )
+    {
+        if ( !::PostMessage(GetHwndOf(topWindow), WM_NULL, 0, 0) )
+        {
+            // should never happen
+            wxLogLastError("PostMessage(WM_NULL)");
+        }
+    }

 }
 
 }
 

-void wxSetInstance(HINSTANCE hInst)
+//-----------------------------------------------------------------------------
+
+wxIcon
+wxApp::GetStdIcon(int which) const

 {
 {

-    wxhInstance = hInst;
+    switch(which)
+    {
+        case wxICON_INFORMATION:
+            return wxIcon("wxICON_INFO");
+
+        case wxICON_QUESTION:
+            return wxIcon("wxICON_QUESTION");
+
+        case wxICON_EXCLAMATION:
+            return wxIcon("wxICON_WARNING");
+
+        default:
+            wxFAIL_MSG(wxT("requested non existent standard icon"));
+            // still fall through
+
+        case wxICON_HAND:
+            return wxIcon("wxICON_ERROR");
+    }

 }
 
 // For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
 // if in a separate file. So include it here to ensure it's linked.
 }
 
 // For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
 // if in a separate file. So include it here to ensure it's linked.

-#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__))
+#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__) && !defined(WXMAKINGDLL))

 #include "main.cpp"
 #endif
 #include "main.cpp"
 #endif